Commit 10740e47 authored by Hamza Mahfooz's avatar Hamza Mahfooz Committed by Alex Deucher
Browse files

drm/amd/display: add amdgpu_dm support for DCN351 



Add Display Manager specific changes for DCN3.5.1.

Signed-off-by: default avatarHamza Mahfooz <hamza.mahfooz@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 2728e9c7

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

+9 −0
Original line number Diff line number Diff line
@@ -1219,6 +1219,7 @@ static int dm_dmub_hw_init(struct amdgpu_device *adev) 
	case IP_VERSION(3, 1, 3):

	case IP_VERSION(3, 1, 4):

	case IP_VERSION(3, 5, 0):

	case IP_VERSION(3, 5, 1):

		hw_params.dpia_supported = true;

		hw_params.disable_dpia = adev->dm.dc->debug.dpia_debug.bits.disable_dpia;

		break;
@@ -2040,6 +2041,7 @@ static int load_dmcu_fw(struct amdgpu_device *adev) 
		case IP_VERSION(3, 2, 0):

		case IP_VERSION(3, 2, 1):

		case IP_VERSION(3, 5, 0):

		case IP_VERSION(3, 5, 1):

			return 0;

		default:

			break;
@@ -2160,6 +2162,7 @@ static int dm_dmub_sw_init(struct amdgpu_device *adev) 
		dmub_asic = DMUB_ASIC_DCN321;

		break;

	case IP_VERSION(3, 5, 0):

	case IP_VERSION(3, 5, 1):

		dmub_asic = DMUB_ASIC_DCN35;

		break;

	default:
@@ -4489,6 +4492,7 @@ static int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev) 
	case IP_VERSION(3, 2, 1):

	case IP_VERSION(2, 1, 0):

	case IP_VERSION(3, 5, 0):

	case IP_VERSION(3, 5, 1):

		if (register_outbox_irq_handlers(dm->adev)) {

			DRM_ERROR("DM: Failed to initialize IRQ\n");

			goto fail;
@@ -4510,6 +4514,7 @@ static int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev) 
		case IP_VERSION(3, 2, 0):

		case IP_VERSION(3, 2, 1):

		case IP_VERSION(3, 5, 0):

		case IP_VERSION(3, 5, 1):

			psr_feature_enabled = true;

			break;

		default:
@@ -4527,6 +4532,7 @@ static int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev) 
		case IP_VERSION(3, 2, 0):

		case IP_VERSION(3, 2, 1):

		case IP_VERSION(3, 5, 0):

		case IP_VERSION(3, 5, 1):

			replay_feature_enabled = true;

			break;

		default:
@@ -4679,6 +4685,7 @@ static int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev) 
		case IP_VERSION(3, 2, 0):

		case IP_VERSION(3, 2, 1):

		case IP_VERSION(3, 5, 0):

		case IP_VERSION(3, 5, 1):

			if (dcn10_register_irq_handlers(dm->adev)) {

				DRM_ERROR("DM: Failed to initialize IRQ\n");

				goto fail;
@@ -4810,6 +4817,7 @@ static int dm_init_microcode(struct amdgpu_device *adev) 
		fw_name_dmub = FIRMWARE_DCN_V3_2_1_DMCUB;

		break;

	case IP_VERSION(3, 5, 0):

	case IP_VERSION(3, 5, 1):

		fw_name_dmub = FIRMWARE_DCN_35_DMUB;

		break;

	default:
@@ -4935,6 +4943,7 @@ static int dm_early_init(void *handle) 
		case IP_VERSION(3, 2, 0):

		case IP_VERSION(3, 2, 1):

		case IP_VERSION(3, 5, 0):

		case IP_VERSION(3, 5, 1):

			adev->mode_info.num_crtc = 4;

			adev->mode_info.num_hpd = 4;

			adev->mode_info.num_dig = 4;

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c

+1 −0
Original line number Diff line number Diff line
@@ -741,6 +741,7 @@ struct hdcp_workqueue *hdcp_create_workqueue(struct amdgpu_device *adev, 
		    dc->ctx->dce_version == DCN_VERSION_3_14 ||

		    dc->ctx->dce_version == DCN_VERSION_3_15 ||

		    dc->ctx->dce_version == DCN_VERSION_3_5 ||

		    dc->ctx->dce_version == DCN_VERSION_3_51 ||

		    dc->ctx->dce_version == DCN_VERSION_3_16)

			hdcp_work[i].hdcp.config.psp.caps.dtm_v3_supported = 1;

		hdcp_work[i].hdcp.config.ddc.handle = dc_get_link_at_index(dc, i);