Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

drm/amdgpu: Remove duplicate struct member

Struct amdgpu_ctx contains two copies of the pointer to the context
manager. Remove one.

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@igalia.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Tvrtko Ursulin and committed by
Alex Deucher
90d51221 08e7d6c3

+2 -3
+2 -2
drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c
··· 231 231 } else { 232 232 struct amdgpu_fpriv *fpriv; 233 233 234 - fpriv = container_of(ctx->ctx_mgr, struct amdgpu_fpriv, ctx_mgr); 234 + /* TODO: Stop using fpriv here, we only need the xcp_id. */ 235 + fpriv = container_of(ctx->mgr, struct amdgpu_fpriv, ctx_mgr); 235 236 r = amdgpu_xcp_select_scheds(adev, hw_ip, hw_prio, fpriv, 236 237 &num_scheds, &scheds); 237 238 if (r) ··· 349 348 else 350 349 ctx->stable_pstate = current_stable_pstate; 351 350 352 - ctx->ctx_mgr = &(fpriv->ctx_mgr); 353 351 return 0; 354 352 } 355 353
-1
drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.h
··· 56 56 unsigned long ras_counter_ce; 57 57 unsigned long ras_counter_ue; 58 58 struct amdgpu_ctx_mgr *mgr; 59 - struct amdgpu_ctx_mgr *ctx_mgr; 60 59 struct amdgpu_ctx_entity *entities[AMDGPU_HW_IP_NUM][AMDGPU_MAX_ENTITY_NUM]; 61 60 }; 62 61