From: Hawking Zhang Date: Tue, 6 May 2025 06:43:36 +0000 (+0800) Subject: drm/amdgpu: Init single mes instance if xcc_mask is unset X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f364fb3cb40364e0c91ddc83bac90cfd09a5602b;p=thirdparty%2Fkernel%2Flinux.git drm/amdgpu: Init single mes instance if xcc_mask is unset Configure a single mes instance if the xcc_mask remains uninitialized. Signed-off-by: Hawking Zhang Reviewed-by: Jack Xiao Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c index 895b841b9626d..59e6b6f5233f4 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c @@ -92,9 +92,9 @@ static void amdgpu_mes_doorbell_free(struct amdgpu_device *adev) int amdgpu_mes_init(struct amdgpu_device *adev) { int i, r, num_pipes; - int num_xcc = NUM_XCC(adev->gfx.xcc_mask); u32 total_vmid_mask, reserved_vmid_mask; u32 queue_mask, reserved_queue_mask; + int num_xcc = adev->gfx.xcc_mask ? NUM_XCC(adev->gfx.xcc_mask) : 1; adev->mes.adev = adev; @@ -245,7 +245,8 @@ error: void amdgpu_mes_fini(struct amdgpu_device *adev) { - int i, num_xcc = NUM_XCC(adev->gfx.xcc_mask); + int i; + int num_xcc = adev->gfx.xcc_mask ? NUM_XCC(adev->gfx.xcc_mask) : 1; amdgpu_bo_free_kernel(&adev->mes.event_log_gpu_obj, &adev->mes.event_log_gpu_addr,