Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code »

Commit 83108f22385e9f34761dc3a0c77bdc985a467e77

Authored by Ilija Hadzic
Committed by Greg Kroah-Hartman
1 parent 624ddd1be9

drm/radeon: fix the crash in test functions 

commit 92b712b739811e4aa7c0e1af339d0098989ea024 upstream.

radeon_copy_dma and radeon_copy_blit must be called with
a valid reservation object. Otherwise a crash will be provoked.
We borrow the object from vram BO.

bug:
https://bugs.freedesktop.org/show_bug.cgi?id=88464

Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Ilija Hadzic <ihadzic@research.bell-labs.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Showing 1 changed file with 4 additions and 4 deletions Side-by-side Diff

drivers/gpu/drm/radeon/radeon_test.c
Diff comments   View file @ 83108f2
... ... @@ -119,11 +119,11 @@
119 119 if (ring == R600_RING_TYPE_DMA_INDEX)
120 120 fence = radeon_copy_dma(rdev, gtt_addr, vram_addr,
121 121 size / RADEON_GPU_PAGE_SIZE,
122   - NULL);
  122 + vram_obj->tbo.resv);
123 123 else
124 124 fence = radeon_copy_blit(rdev, gtt_addr, vram_addr,
125 125 size / RADEON_GPU_PAGE_SIZE,
126   - NULL);
  126 + vram_obj->tbo.resv);
127 127 if (IS_ERR(fence)) {
128 128 DRM_ERROR("Failed GTT->VRAM copy %d\n", i);
129 129 r = PTR_ERR(fence);
130 130  
... ... @@ -170,11 +170,11 @@
170 170 if (ring == R600_RING_TYPE_DMA_INDEX)
171 171 fence = radeon_copy_dma(rdev, vram_addr, gtt_addr,
172 172 size / RADEON_GPU_PAGE_SIZE,
173   - NULL);
  173 + vram_obj->tbo.resv);
174 174 else
175 175 fence = radeon_copy_blit(rdev, vram_addr, gtt_addr,
176 176 size / RADEON_GPU_PAGE_SIZE,
177   - NULL);
  177 + vram_obj->tbo.resv);
178 178 if (IS_ERR(fence)) {
179 179 DRM_ERROR("Failed VRAM->GTT copy %d\n", i);
180 180 r = PTR_ERR(fence);