Skip to contentSkip to conversation

drm/amd/display/dm: add KV, KB, ML (v2)

PATCH In review Alex Deucher 3 participants 9 messages Aug 10, 2017 – Aug 11, 2017 4 messages not in the archive

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/6 drm/amd/display/dm: add KV, KB, ML (v2)

Add DCE8 APUs to display manager.

v2: rebase changes

---
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +16 -0
index 378437a..3289e9a 100644
@@ -1355,6 +1355,9 @@ int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev)
 	switch (adev->asic_type) {
 	case CHIP_BONAIRE:
 	case CHIP_HAWAII:
+	case CHIP_KAVERI:
+	case CHIP_KABINI:
+	case CHIP_MULLINS:
 	case CHIP_TONGA:
 	case CHIP_FIJI:
 	case CHIP_CARRIZO:
@@ -1524,6 +1527,19 @@ static int dm_early_init(void *handle)
 		adev->mode_info.num_dig = 6;
 		adev->mode_info.plane_type = dm_plane_type_default;
 		break;
+	case CHIP_KAVERI:
+		adev->mode_info.num_crtc = 4;
+		adev->mode_info.num_hpd = 6;
+		adev->mode_info.num_dig = 7;
+		adev->mode_info.plane_type = dm_plane_type_default;
+		break;
+	case CHIP_KABINI:
+	case CHIP_MULLINS:
+		adev->mode_info.num_crtc = 2;
+		adev->mode_info.num_hpd = 6;
+		adev->mode_info.num_dig = 6;
+		adev->mode_info.plane_type = dm_plane_type_default;
+		break;
 	case CHIP_FIJI:
 	case CHIP_TONGA:
 		adev->mode_info.num_crtc = 6;
Signature · 6 lines
2.5.5

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): 1502390392-29146-1-git-send-email-alexander.deucher-5C7GfCeVMHo@public.gmane.org

#2 lore raw

PATCH 2/6 drm/amdgpu: add DCE8 APUs to dc_supported check

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +3 -0
index f455d9d..8a1092e 100644
@@ -1942,6 +1942,9 @@ bool amdgpu_device_asic_has_dc_support(enum amd_asic_type asic_type)
 #if defined(CONFIG_DRM_AMD_DC)
 	case CHIP_BONAIRE:
 	case CHIP_HAWAII:
+	case CHIP_KAVERI:
+	case CHIP_KABINI:
+	case CHIP_MULLINS:
 	case CHIP_CARRIZO:
 	case CHIP_STONEY:
 	case CHIP_POLARIS11:
Signature · 6 lines
2.5.5

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#3 lore raw

PATCH 3/6 drm/amd/display/dc: add DIGG for KV

In reply to a message not in the archive

KV has 7 possible DIG blocks.

---
 drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c | 6 ++++++
 drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c +6 -0
index 5bb2ac7..7e9afab8 100644
@@ -80,6 +80,7 @@
 #define DCE110_DIG_FE_SOURCE_SELECT_DIGD 0x08
 #define DCE110_DIG_FE_SOURCE_SELECT_DIGE 0x10
 #define DCE110_DIG_FE_SOURCE_SELECT_DIGF 0x20
+#define DCE110_DIG_FE_SOURCE_SELECT_DIGG 0x40
 
 /* all values are in milliseconds */
 /* For eDP, after power-up/power/down,
@@ -471,6 +472,8 @@ static uint8_t get_frontend_source(
 		return DCE110_DIG_FE_SOURCE_SELECT_DIGE;
 	case ENGINE_ID_DIGF:
 		return DCE110_DIG_FE_SOURCE_SELECT_DIGF;
+	case ENGINE_ID_DIGG:
+		return DCE110_DIG_FE_SOURCE_SELECT_DIGG;
 	default:
 		ASSERT_CRITICAL(false);
 		return DCE110_DIG_FE_SOURCE_SELECT_INVALID;
@@ -984,6 +987,9 @@ bool dce110_link_encoder_construct(
 	case TRANSMITTER_UNIPHY_F:
 		enc110->base.preferred_engine = ENGINE_ID_DIGF;
 	break;
+	case TRANSMITTER_UNIPHY_G:
+		enc110->base.preferred_engine = ENGINE_ID_DIGG;
+	break;
 	default:
 		ASSERT_CRITICAL(false);
 		enc110->base.preferred_engine = ENGINE_ID_UNKNOWN;
drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c +2 -1
index 7473f585..40a9591 100644
@@ -262,7 +262,8 @@ static const struct dce110_stream_enc_registers stream_enc_regs[] = {
 	stream_enc_regs(2),
 	stream_enc_regs(3),
 	stream_enc_regs(4),
-	stream_enc_regs(5)
+	stream_enc_regs(5),
+	stream_enc_regs(6)
 };
 
 static const struct dce_stream_encoder_shift se_shift = {
Signature · 6 lines
2.5.5

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#4 lore raw

PATCH 4/6 drm/amd/display/dc: add DCE_VERSION for DCE8 APUs

In reply to a message not in the archive

DCE 8.1 = Kaveri
DCE 8.3 = Kabini/Mullins

---
 drivers/gpu/drm/amd/display/dc/bios/command_table_helper.c  |  2 ++
 drivers/gpu/drm/amd/display/dc/bios/command_table_helper2.c |  2 ++
 drivers/gpu/drm/amd/display/dc/core/dc_resource.c           | 11 ++++++++++-
 drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c       |  6 ++++++
 drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c            |  2 ++
 drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c          |  2 ++
 drivers/gpu/drm/amd/display/dc/i2caux/i2caux.c              |  2 ++
 drivers/gpu/drm/amd/display/include/dal_types.h             |  2 ++
 8 files changed, 28 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/bios/command_table_helper.c +2 -0
index 40d9a99..2979358 100644
@@ -37,6 +37,8 @@ bool dal_bios_parser_init_cmd_tbl_helper(
 {
 	switch (dce) {
 	case DCE_VERSION_8_0:
+	case DCE_VERSION_8_1:
+	case DCE_VERSION_8_3:
 		*h = dal_cmd_tbl_helper_dce80_get_table();
 		return true;
 
drivers/gpu/drm/amd/display/dc/bios/command_table_helper2.c +2 -0
index 9084a32..35c3f3a 100644
@@ -39,6 +39,8 @@ bool dal_bios_parser_init_cmd_tbl_helper2(
 {
 	switch (dce) {
 	case DCE_VERSION_8_0:
+	case DCE_VERSION_8_1:
+	case DCE_VERSION_8_3:
 		*h = dal_cmd_tbl_helper_dce80_get_table();
 		return true;
 
drivers/gpu/drm/amd/display/dc/core/dc_resource.c +10 -1
index b2086be..e7d9045 100644
@@ -50,9 +50,16 @@ enum dce_version resource_parse_asic_id(struct hw_asic_id asic_id)
 	switch (asic_id.chip_family) {
 
 	case FAMILY_CI:
-	case FAMILY_KV:
 		dc_version = DCE_VERSION_8_0;
 		break;
+	case FAMILY_KV:
+		if (ASIC_REV_IS_KALINDI(asic_id.hw_internal_rev) ||
+		    ASIC_REV_IS_BHAVANI(asic_id.hw_internal_rev) ||
+		    ASIC_REV_IS_GODAVARI(asic_id.hw_internal_rev))
+			dc_version = DCE_VERSION_8_3;
+		else
+			dc_version = DCE_VERSION_8_1;
+		break;
 	case FAMILY_CZ:
 		dc_version = DCE_VERSION_11_0;
 		break;
@@ -94,6 +101,8 @@ struct resource_pool *dc_create_resource_pool(
 
 	switch (dc_version) {
 	case DCE_VERSION_8_0:
+	case DCE_VERSION_8_1:
+	case DCE_VERSION_8_3:
 		res_pool = dce80_create_resource_pool(
 			num_virtual_links, dc);
 		break;
drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c +6 -0
index dd7e1dd..88e266a 100644
@@ -578,6 +578,8 @@ static uint32_t dce110_get_pix_clk_dividers(
 
 	switch (cs->ctx->dce_version) {
 	case DCE_VERSION_8_0:
+	case DCE_VERSION_8_1:
+	case DCE_VERSION_8_3:
 	case DCE_VERSION_10_0:
 	case DCE_VERSION_11_0:
 		pll_calc_error =
@@ -862,6 +864,8 @@ static bool dce110_program_pix_clk(
 
 	switch (clock_source->ctx->dce_version) {
 	case DCE_VERSION_8_0:
+	case DCE_VERSION_8_1:
+	case DCE_VERSION_8_3:
 	case DCE_VERSION_10_0:
 	case DCE_VERSION_11_0:
 		bp_pc_params.reference_divider = pll_settings->reference_divider;
@@ -1209,6 +1213,8 @@ bool dce110_clk_src_construct(
 
 	switch (clk_src->base.ctx->dce_version) {
 	case DCE_VERSION_8_0:
+	case DCE_VERSION_8_1:
+	case DCE_VERSION_8_3:
 	case DCE_VERSION_10_0:
 	case DCE_VERSION_11_0:
 
drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c +2 -0
index 425f1c4..25f6f91 100644
@@ -66,6 +66,8 @@ bool dal_hw_factory_init(
 
 	switch (dce_version) {
 	case DCE_VERSION_8_0:
+	case DCE_VERSION_8_1:
+	case DCE_VERSION_8_3:
 		dal_hw_factory_dce80_init(factory);
 		return true;
 
drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c +2 -0
index 3b55d45..0ae8ace 100644
@@ -65,6 +65,8 @@ bool dal_hw_translate_init(
 
 	switch (dce_version) {
 	case DCE_VERSION_8_0:
+	case DCE_VERSION_8_1:
+	case DCE_VERSION_8_3:
 		dal_hw_translate_dce80_init(translate);
 		return true;
 	case DCE_VERSION_10_0:
drivers/gpu/drm/amd/display/dc/i2caux/i2caux.c +2 -0
index 4035caf..9b115e1 100644
@@ -79,6 +79,8 @@ struct i2caux *dal_i2caux_create(
 
 	switch (ctx->dce_version) {
 	case DCE_VERSION_8_0:
+	case DCE_VERSION_8_1:
+	case DCE_VERSION_8_3:
 		return dal_i2caux_dce80_create(ctx);
 	case DCE_VERSION_11_2:
 		return dal_i2caux_dce112_create(ctx);
drivers/gpu/drm/amd/display/include/dal_types.h +2 -0
index 1bfc191..fa54396 100644
@@ -35,6 +35,8 @@ struct dc_bios;
 enum dce_version {
 	DCE_VERSION_UNKNOWN = (-1),
 	DCE_VERSION_8_0,
+	DCE_VERSION_8_1,
+	DCE_VERSION_8_3,
 	DCE_VERSION_10_0,
 	DCE_VERSION_11_0,
 	DCE_VERSION_11_2,
Signature · 6 lines
2.5.5

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#5 lore raw

PATCH 5/6 drm/amd/disply/dc: add resource support for DCE8 APUs (v2)

In reply to a message not in the archive

Add the appropriate resources for APUs:

KV:    4 pipes, 7 dig, 3 PPLLs
KB/ML: 2 pipes, 6 dig, 2 PPLLs

v2: rebase changes

---
 drivers/gpu/drm/amd/display/dc/core/dc_resource.c  |   8 +-
 .../gpu/drm/amd/display/dc/dce80/dce80_resource.c  | 343 ++++++++++++++++++++-
 .../gpu/drm/amd/display/dc/dce80/dce80_resource.h  |   8 +
 3 files changed, 356 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc_resource.c +7 -1
index e7d9045..f010039 100644
@@ -101,9 +101,15 @@ struct resource_pool *dc_create_resource_pool(
 
 	switch (dc_version) {
 	case DCE_VERSION_8_0:
+		res_pool = dce80_create_resource_pool(
+			num_virtual_links, dc);
+		break;
 	case DCE_VERSION_8_1:
+		res_pool = dce81_create_resource_pool(
+			num_virtual_links, dc);
+		break;
 	case DCE_VERSION_8_3:
-		res_pool = dce80_create_resource_pool(
+		res_pool = dce83_create_resource_pool(
 			num_virtual_links, dc);
 		break;
 	case DCE_VERSION_10_0:
drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c +341 -2

364 lines not on this page · raw message

drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.h +8 -0
index 2a0cdcc..04f0cfe 100644
@@ -35,5 +35,13 @@ struct resource_pool *dce80_create_resource_pool(
 	uint8_t num_virtual_links,
 	struct core_dc *dc);
 
+struct resource_pool *dce81_create_resource_pool(
+	uint8_t num_virtual_links,
+	struct core_dc *dc);
+
+struct resource_pool *dce83_create_resource_pool(
+	uint8_t num_virtual_links,
+	struct core_dc *dc);
+
 #endif /* __DC_RESOURCE_DCE80_H__ */
 
Signature · 6 lines
2.5.5

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#6 lore raw

PATCH 6/6 drm/amdgpu/cik: add IP modules for DC for APUs

In reply to a message not in the archive

Enable DC for DCE8 APUs.

---
 drivers/gpu/drm/amd/amdgpu/cik.c | 8 ++++++++
 1 file changed, 8 insertions(+)
drivers/gpu/drm/amd/amdgpu/cik.c +8 -0
index af3b66f..793b1470 100644
@@ -1937,6 +1937,10 @@ int cik_set_ip_blocks(struct amdgpu_device *adev)
 		amdgpu_ip_block_add(adev, &amdgpu_pp_ip_block);
 		if (adev->enable_virtual_display)
 			amdgpu_ip_block_add(adev, &dce_virtual_ip_block);
+#if defined(CONFIG_DRM_AMD_DC)
+		else if (amdgpu_device_has_dc_support(adev))
+			amdgpu_ip_block_add(adev, &dm_ip_block);
+#endif
 		else
 			amdgpu_ip_block_add(adev, &dce_v8_1_ip_block);
 		amdgpu_ip_block_add(adev, &gfx_v7_1_ip_block);
@@ -1952,6 +1956,10 @@ int cik_set_ip_blocks(struct amdgpu_device *adev)
 		amdgpu_ip_block_add(adev, &amdgpu_pp_ip_block);
 		if (adev->enable_virtual_display)
 			amdgpu_ip_block_add(adev, &dce_virtual_ip_block);
+#if defined(CONFIG_DRM_AMD_DC)
+		else if (amdgpu_device_has_dc_support(adev))
+			amdgpu_ip_block_add(adev, &dm_ip_block);
+#endif
 		else
 			amdgpu_ip_block_add(adev, &dce_v8_3_ip_block);
 		amdgpu_ip_block_add(adev, &gfx_v7_2_ip_block);
Signature · 6 lines
2.5.5

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): 1502390392-29146-6-git-send-email-alexander.deucher-5C7GfCeVMHo@public.gmane.org

Reviewed-by
#8 lore raw

Re: [PATCH 6/6] drm/amdgpu/cik: add IP modules for DC for APUs

All patches are

Harry

Quoted 24 lines · Alex Deucher

Enable DC for DCE8 APUs.

---
 drivers/gpu/drm/amd/amdgpu/cik.c | 8 ++++++++
 1 file changed, 8 insertions(+)
drivers/gpu/drm/amd/amdgpu/cik.c +4 -0
index af3b66f..793b1470 100644
@@ -1937,6 +1937,10 @@ int cik_set_ip_blocks(struct amdgpu_device *adev)
 		amdgpu_ip_block_add(adev, &amdgpu_pp_ip_block);
 		if (adev->enable_virtual_display)
 			amdgpu_ip_block_add(adev, &dce_virtual_ip_block);
+#if defined(CONFIG_DRM_AMD_DC)
+		else if (amdgpu_device_has_dc_support(adev))
+			amdgpu_ip_block_add(adev, &dm_ip_block);
+#endif
 		else
 			amdgpu_ip_block_add(adev, &dce_v8_1_ip_block);
 		amdgpu_ip_block_add(adev, &gfx_v7_1_ip_block);

drivers/gpu/drm/amd/amdgpu/cik.c int cik_set_ip_blocks(struct amdgpu_device *adev) · line 1965

Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/cik.c +4 -0
@@ -1952,6 +1956,10 @@ int cik_set_ip_blocks(struct amdgpu_device *adev)
 		amdgpu_ip_block_add(adev, &amdgpu_pp_ip_block);
 		if (adev->enable_virtual_display)
 			amdgpu_ip_block_add(adev, &dce_virtual_ip_block);
+#if defined(CONFIG_DRM_AMD_DC)
+		else if (amdgpu_device_has_dc_support(adev))
+			amdgpu_ip_block_add(adev, &dm_ip_block);
+#endif
 		else
 			amdgpu_ip_block_add(adev, &dce_v8_3_ip_block);
 		amdgpu_ip_block_add(adev, &gfx_v7_2_ip_block);

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): fc2e6ea3-47d6-0e63-d897-946775b3f207-5C7GfCeVMHo@public.gmane.org

#10 lore raw

RE: [PATCH 6/6] drm/amdgpu/cik: add IP modules for DC for APUs

Quoted 9 lines

-----Original Message-----
From: Wentland, Harry
Sent: Thursday, August 10, 2017 9:49 PM
To: Alex Deucher; [email protected]
Cc: Deucher, Alexander
Subject: Re: [PATCH 6/6] drm/amdgpu/cik: add IP modules for DC for APUs

All patches are

Do you want to take these through your tree?

Thanks!

Alex

Quoted 35 lines

Harry

Review

Quoted 8 lines · Alex Deucher

Enable DC for DCE8 APUs.

---
 drivers/gpu/drm/amd/amdgpu/cik.c | 8 ++++++++
 1 file changed, 8 insertions(+)
(quoted diff) +0 -0

b/drivers/gpu/drm/amd/amdgpu/cik.c

drivers/gpu/drm/amd/amdgpu/cik.c int cik_set_ip_blocks(struct amdgpu_device

Quoted 4 lines

index af3b66f..793b1470 100644

drivers/gpu/drm/amd/amdgpu/cik.c +0 -0
@@ -1937,6 +1937,10 @@ int cik_set_ip_blocks(struct amdgpu_device

*adev)

drivers/gpu/drm/amd/amdgpu/cik.c int cik_set_ip_blocks(struct amdgpu_device *adev)

Quoted 3 lines
drivers/gpu/drm/amd/amdgpu/cik.c +0 -0
 		amdgpu_ip_block_add(adev, &amdgpu_pp_ip_block);
 		if (adev->enable_virtual_display)
 			amdgpu_ip_block_add(adev,

&dce_virtual_ip_block);

drivers/gpu/drm/amd/amdgpu/cik.c int cik_set_ip_blocks(struct amdgpu_device

Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/cik.c +4 -0
+#if defined(CONFIG_DRM_AMD_DC)
+		else if (amdgpu_device_has_dc_support(adev))
+			amdgpu_ip_block_add(adev, &dm_ip_block);
+#endif
 		else
 			amdgpu_ip_block_add(adev, &dce_v8_1_ip_block);
 		amdgpu_ip_block_add(adev, &gfx_v7_1_ip_block);
@@ -1952,6 +1956,10 @@ int cik_set_ip_blocks(struct amdgpu_device

*adev)

drivers/gpu/drm/amd/amdgpu/cik.c int cik_set_ip_blocks(struct amdgpu_device *adev)

Quoted 3 lines
drivers/gpu/drm/amd/amdgpu/cik.c +0 -0
 		amdgpu_ip_block_add(adev, &amdgpu_pp_ip_block);
 		if (adev->enable_virtual_display)
 			amdgpu_ip_block_add(adev,

&dce_virtual_ip_block);

Quoted 8 lines

drivers/gpu/drm/amd/amdgpu/cik.c int cik_set_ip_blocks(struct amdgpu_device *adev) · line 1965

Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/cik.c +4 -0
+#if defined(CONFIG_DRM_AMD_DC)
+		else if (amdgpu_device_has_dc_support(adev))
+			amdgpu_ip_block_add(adev, &dm_ip_block);
+#endif
 		else
 			amdgpu_ip_block_add(adev, &dce_v8_3_ip_block);
 		amdgpu_ip_block_add(adev, &gfx_v7_2_ip_block);

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): BN6PR12MB16521FF665E1EE63CFD6DEA3F7890-/b2+HYfkarQqUD6E6FAiowdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org

#12 lore raw

Re: [PATCH 6/6] drm/amdgpu/cik: add IP modules for DC for APUs

Quoted 7 lines · Alexander
Quoted 7 lines

-----Original Message-----
From: Wentland, Harry
Sent: Thursday, August 10, 2017 9:49 PM
To: Alex Deucher; [email protected]
Cc: Deucher, Alexander
Subject: Re: [PATCH 6/6] drm/amdgpu/cik: add IP modules for DC for APUs

Quoted 5 lines
Quoted 2 lines

All patches are

Do you want to take these through your tree?

Yes.

Quoted 1 line

Thanks!

no problem

Harry

Quoted 38 lines

Alex

Quoted 35 lines

Harry

Review

Quoted 8 lines · Alex Deucher

Enable DC for DCE8 APUs.

---
 drivers/gpu/drm/amd/amdgpu/cik.c | 8 ++++++++
 1 file changed, 8 insertions(+)
(quoted diff) +0 -0

b/drivers/gpu/drm/amd/amdgpu/cik.c

drivers/gpu/drm/amd/amdgpu/cik.c int cik_set_ip_blocks(struct amdgpu_device

Quoted 4 lines

index af3b66f..793b1470 100644

drivers/gpu/drm/amd/amdgpu/cik.c +0 -0
@@ -1937,6 +1937,10 @@ int cik_set_ip_blocks(struct amdgpu_device

*adev)

drivers/gpu/drm/amd/amdgpu/cik.c int cik_set_ip_blocks(struct amdgpu_device *adev)

Quoted 3 lines
drivers/gpu/drm/amd/amdgpu/cik.c +0 -0
 		amdgpu_ip_block_add(adev, &amdgpu_pp_ip_block);
 		if (adev->enable_virtual_display)
 			amdgpu_ip_block_add(adev,

&dce_virtual_ip_block);

drivers/gpu/drm/amd/amdgpu/cik.c int cik_set_ip_blocks(struct amdgpu_device

Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/cik.c +4 -0
+#if defined(CONFIG_DRM_AMD_DC)
+		else if (amdgpu_device_has_dc_support(adev))
+			amdgpu_ip_block_add(adev, &dm_ip_block);
+#endif
 		else
 			amdgpu_ip_block_add(adev, &dce_v8_1_ip_block);
 		amdgpu_ip_block_add(adev, &gfx_v7_1_ip_block);
@@ -1952,6 +1956,10 @@ int cik_set_ip_blocks(struct amdgpu_device

*adev)

drivers/gpu/drm/amd/amdgpu/cik.c int cik_set_ip_blocks(struct amdgpu_device *adev)

Quoted 3 lines
drivers/gpu/drm/amd/amdgpu/cik.c +0 -0
 		amdgpu_ip_block_add(adev, &amdgpu_pp_ip_block);
 		if (adev->enable_virtual_display)
 			amdgpu_ip_block_add(adev,

&dce_virtual_ip_block);

Quoted 8 lines
Quoted 8 lines

drivers/gpu/drm/amd/amdgpu/cik.c int cik_set_ip_blocks(struct amdgpu_device *adev) · line 1965

Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/cik.c +4 -0
+#if defined(CONFIG_DRM_AMD_DC)
+		else if (amdgpu_device_has_dc_support(adev))
+			amdgpu_ip_block_add(adev, &dm_ip_block);
+#endif
 		else
 			amdgpu_ip_block_add(adev, &dce_v8_3_ip_block);
 		amdgpu_ip_block_add(adev, &gfx_v7_2_ip_block);

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx