From: Christian König <christian.koenig@amd.com>
Date: Mon, 11 May 2015 12:32:17 +0000 (+0200)
Subject: drm/amdgpu: fix dereference before check
X-Git-Tag: Ubuntu-snapdragon-4.4.0-1029.32~6297^2~25^2~45
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=d919ad49ac04e1e417ea511d61455786a0f0fdb7;p=mirror_ubuntu-zesty-kernel.git

drm/amdgpu: fix dereference before check

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Jammy Zhou <Jammy.Zhou@amd.com>
Reviewed-by: Monk Liu <monk.liu@amd.com>
---

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
index 66c66f83b407..74ed94ee7102 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
@@ -138,9 +138,9 @@ void amdgpu_ib_free(struct amdgpu_device *adev, struct amdgpu_ib *ib)
 int amdgpu_ib_schedule(struct amdgpu_device *adev, unsigned num_ibs,
 		       struct amdgpu_ib *ibs, void *owner)
 {
-	struct amdgpu_ring *ring;
-	struct amdgpu_vm *vm = ibs->vm;
 	struct amdgpu_ib *ib = &ibs[0];
+	struct amdgpu_ring *ring;
+	struct amdgpu_vm *vm;
 	unsigned i;
 	int r = 0;
 
@@ -148,6 +148,8 @@ int amdgpu_ib_schedule(struct amdgpu_device *adev, unsigned num_ibs,
 		return -EINVAL;
 
 	ring = ibs->ring;
+	vm = ibs->vm;
+
 	if (!ring->ready) {
 		dev_err(adev->dev, "couldn't schedule ib\n");
 		return -EINVAL;