Skip to content

Commit 38a2509

Browse files
Tianci.Yinalexdeucher
authored andcommitted
drm/amdgpu: enable DCN for navi10 headless SKU
There is a NULL pointer crash when DCN disabled on headless SKU. On normal SKU, the variable adev->ddev.mode_config.funcs is initialized in dm_hw_init(), and it is fine to access it in amdgpu_device_resume(). But on headless SKU, DCN is disabled, the funcs variable is not initialized, then crash arises. Enable DCN to fix this issue. Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Reviewed-by: Guchun Chen <guchun.chen@amd.com> Signed-off-by: Tianci.Yin <tianci.yin@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
1 parent 2664219 commit 38a2509

1 file changed

Lines changed: 1 addition & 2 deletions

File tree

  • drivers/gpu/drm/amd/amdgpu

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -492,8 +492,7 @@ int nv_set_ip_blocks(struct amdgpu_device *adev)
492492
if (adev->enable_virtual_display || amdgpu_sriov_vf(adev))
493493
amdgpu_device_ip_block_add(adev, &dce_virtual_ip_block);
494494
#if defined(CONFIG_DRM_AMD_DC)
495-
else if (amdgpu_device_has_dc_support(adev) &&
496-
!nv_is_headless_sku(adev->pdev))
495+
else if (amdgpu_device_has_dc_support(adev))
497496
amdgpu_device_ip_block_add(adev, &dm_ip_block);
498497
#endif
499498
amdgpu_device_ip_block_add(adev, &gfx_v10_0_ip_block);

0 commit comments

Comments
 (0)