Commit fa7c7939 authored by Michel Dänzer's avatar Michel Dänzer Committed by Alex Deucher
Browse files

drm/amdgpu: Use unsigned ring indices in amdgpu_queue_mgr_map 



This matches the corresponding UAPI fields. Treating the ring index as
signed could result in accessing random unrelated memory if the MSB was
set.

Fixes: effd924d ("drm/amdgpu: untie user ring ids from kernel ring
                      ids v6")
Cc: stable@vger.kernel.org
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarMichel Dänzer <michel.daenzer@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 89ce6e0a

drivers/gpu/drm/amd/amdgpu/amdgpu.h

+1 −1
Original line number Diff line number Diff line
@@ -717,7 +717,7 @@ int amdgpu_queue_mgr_fini(struct amdgpu_device *adev, 
			  struct amdgpu_queue_mgr *mgr);

int amdgpu_queue_mgr_map(struct amdgpu_device *adev,

			 struct amdgpu_queue_mgr *mgr,

			 int hw_ip, int instance, int ring,

			 u32 hw_ip, u32 instance, u32 ring,

			 struct amdgpu_ring **out_ring);



/*

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

+3 −3
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ static int amdgpu_update_cached_map(struct amdgpu_queue_mapper *mapper, 


static int amdgpu_identity_map(struct amdgpu_device *adev,

			       struct amdgpu_queue_mapper *mapper,

			       int ring,

			       u32 ring,

			       struct amdgpu_ring **out_ring)

{

	switch (mapper->hw_ip) {
@@ -121,7 +121,7 @@ static enum amdgpu_ring_type amdgpu_hw_ip_to_ring_type(int hw_ip) 


static int amdgpu_lru_map(struct amdgpu_device *adev,

			  struct amdgpu_queue_mapper *mapper,

			  int user_ring, bool lru_pipe_order,

			  u32 user_ring, bool lru_pipe_order,

			  struct amdgpu_ring **out_ring)

{

	int r, i, j;
@@ -208,7 +208,7 @@ int amdgpu_queue_mgr_fini(struct amdgpu_device *adev, 
 */

int amdgpu_queue_mgr_map(struct amdgpu_device *adev,

			 struct amdgpu_queue_mgr *mgr,

			 int hw_ip, int instance, int ring,

			 u32 hw_ip, u32 instance, u32 ring,

			 struct amdgpu_ring **out_ring)

{

	int r, ip_num_rings;

CRA Git | Maintained and supported by SUSTech CRA and CCSE