Commit 38a25091 authored Nov 06, 2020 by Tianci.Yin Committed by Alex Deucher Nov 13, 2020

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>

parent 26642192

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

+1 −2

Original line number	Diff line number	Diff line
		@@ -492,8 +492,7 @@ int nv_set_ip_blocks(struct amdgpu_device *adev)
		if (adev->enable_virtual_display \|\| amdgpu_sriov_vf(adev))
		amdgpu_device_ip_block_add(adev, &dce_virtual_ip_block);
		#if defined(CONFIG_DRM_AMD_DC)
		else if (amdgpu_device_has_dc_support(adev) &&
		!nv_is_headless_sku(adev->pdev))
		else if (amdgpu_device_has_dc_support(adev))
		amdgpu_device_ip_block_add(adev, &dm_ip_block);
		#endif
		amdgpu_device_ip_block_add(adev, &gfx_v10_0_ip_block);

Admin message