queue-5.0/drm-amdgpu-fix-invalid-use-of-change_bit.patch

   1 From 72464382fc2d3673eb51f21a57f2c0a320c1552f Mon Sep 17 00:00:00 2001
   2 From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com>
   3 Date: Mon, 18 Mar 2019 11:09:54 +0100
   4 Subject: drm/amdgpu: fix invalid use of change_bit
   5 MIME-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8
   9 From: Christian König <christian.koenig@amd.com>
  10
  11 commit 72464382fc2d3673eb51f21a57f2c0a320c1552f upstream.
  12
  13 We only need to clear the bit in a 32bit integer.
  14
  15 This fixes a crah on ARM64 and PPC64LE caused by
  16 "drm/amdgpu: update the vm invalidation engine layout V2"
  17
  18 Signed-off-by: Christian König <christian.koenig@amd.com>
  19 Acked-by: Alex Deucher <alexander.deucher@amd.com>
  20 Cc: stable@vger.kernel.org
  21 Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
  22 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  23
  24 ---
  25  drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c |    2 +-
  26  1 file changed, 1 insertion(+), 1 deletion(-)
  27
  28 --- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
  29 +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
  30 @@ -738,7 +738,7 @@ static int gmc_v9_0_allocate_vm_inv_eng(
  31                 }
  32
  33                 ring->vm_inv_eng = inv_eng - 1;
  34 -               change_bit(inv_eng - 1, (unsigned long *)(&vm_inv_engs[vmhub]));
  35 +               vm_inv_engs[vmhub] &= ~(1 << ring->vm_inv_eng);
  36
  37                 dev_info(adev->dev, "ring %s uses VM inv eng %u on hub %u\n",
  38                          ring->name, ring->vm_inv_eng, ring->funcs->vmhub);