summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <tpearson@raptorengineering.com>2018-06-23 19:00:58 -0500
committerroot <root@rcs-power9-talos>2018-10-27 02:51:26 -0400
commitd5a61e65d3cdc763e136bb9ebe44bba1508fe72d (patch)
tree8ff9df731cc950bcd5eb21eb6661fe29b8544049
parent1f0e220a0875e611e426a6b55f546254714a8ca4 (diff)
downloadop-kernel-dev-raptor-dma-dev-current.zip
op-kernel-dev-raptor-dma-dev-current.tar.gz
Increase AMDGPU_MAX_UVD_INSTANCES to 3raptor-dma-dev-current
amdgpu_fence_driver_start_ring() attempts to access UVD instance 2 during setup, while the existing UVD instance count only allows instances 0 and 1. Increase AMDGPU_MAX_UVD_INSTANCES by one to avoid the invalid array access. Caught by UBSAN. Signed-off-by: Timothy Pearson <tpearson@raptorengineering.com>
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h
index a3ab1a4..c1230e9 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h
@@ -31,7 +31,7 @@
#define AMDGPU_UVD_SESSION_SIZE (50*1024)
#define AMDGPU_UVD_FIRMWARE_OFFSET 256
-#define AMDGPU_MAX_UVD_INSTANCES 2
+#define AMDGPU_MAX_UVD_INSTANCES 3
#define AMDGPU_UVD_FIRMWARE_SIZE(adev) \
(AMDGPU_GPU_PAGE_ALIGN(le32_to_cpu(((const struct common_firmware_header *)(adev)->uvd.fw->data)->ucode_size_bytes) + \
OpenPOWER on IntegriCloud