Commit 55611b50 authored by Jack Xiao's avatar Jack Xiao Committed by Alex Deucher
Browse files

drm/amdgpu: avoid dereferencing a NULL pointer 



Check if irq_src is NULL to avoid dereferencing a NULL pointer,
for MES ring is uneccessary to recieve an interrupt notification.

Signed-off-by: default avatarJack Xiao <Jack.Xiao@amd.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent cdca7979

drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c

+12 −7
Original line number Diff line number Diff line
@@ -416,6 +416,8 @@ int amdgpu_fence_driver_start_ring(struct amdgpu_ring *ring, 
		ring->fence_drv.gpu_addr = adev->uvd.inst[ring->me].gpu_addr + index;

	}

	amdgpu_fence_write(ring, atomic_read(&ring->fence_drv.last_seq));



	if (irq_src)

		amdgpu_irq_get(adev, irq_src, irq_type);



	ring->fence_drv.irq_src = irq_src;
@@ -537,6 +539,7 @@ void amdgpu_fence_driver_fini(struct amdgpu_device *adev) 
			/* no need to trigger GPU reset as we are unloading */

			amdgpu_fence_driver_force_completion(ring);

		}

		if (ring->fence_drv.irq_src)

			amdgpu_irq_put(adev, ring->fence_drv.irq_src,

				       ring->fence_drv.irq_type);

		drm_sched_fini(&ring->sched);
@@ -574,6 +577,7 @@ void amdgpu_fence_driver_suspend(struct amdgpu_device *adev) 
		}



		/* disable the interrupt */

		if (ring->fence_drv.irq_src)

			amdgpu_irq_put(adev, ring->fence_drv.irq_src,

				       ring->fence_drv.irq_type);

	}
@@ -601,6 +605,7 @@ void amdgpu_fence_driver_resume(struct amdgpu_device *adev) 
			continue;



		/* enable the interrupt */

		if (ring->fence_drv.irq_src)

			amdgpu_irq_get(adev, ring->fence_drv.irq_src,

				       ring->fence_drv.irq_type);

	}