Commit c8b73f7f authored by Nicholas Kazlauskas's avatar Nicholas Kazlauskas Committed by Alex Deucher
Browse files

drm/amdgpu: Add DC support and display block for Yellow Carp 



To enable output on real display instead of virtual.

Acked-by: default avatarHuang Rui <ray.huang@amd.com>
Signed-off-by: default avatarNicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 38ddc4ba

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

+1 −0
Original line number Diff line number Diff line
@@ -3154,6 +3154,7 @@ bool amdgpu_device_asic_has_dc_support(enum amd_asic_type asic_type) 
	case CHIP_DIMGREY_CAVEFISH:

	case CHIP_BEIGE_GOBY:

	case CHIP_VANGOGH:

	case CHIP_YELLOW_CARP:

#endif

		return amdgpu_dc != 0;

#endif

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

+6 −1
Original line number Diff line number Diff line
@@ -1001,7 +1001,12 @@ int nv_set_ip_blocks(struct amdgpu_device *adev) 
			amdgpu_device_ip_block_add(adev, &dce_virtual_ip_block);

		amdgpu_device_ip_block_add(adev, &gfx_v10_0_ip_block);

		amdgpu_device_ip_block_add(adev, &sdma_v5_2_ip_block);



		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))

			amdgpu_device_ip_block_add(adev, &dm_ip_block);

#endif

		amdgpu_device_ip_block_add(adev, &vcn_v3_0_ip_block);

		amdgpu_device_ip_block_add(adev, &jpeg_v3_0_ip_block);

		break;