Commit 683b5950 authored by Mauro Rossi's avatar Mauro Rossi Committed by Alex Deucher
Browse files

drm/amd/display: dc/core: add SI/DCE6 support (v2) 



[Why]
resource_parse_asic_id() and dc_create_resource_pool() are missing SI/DCE6 cases

[How]
SI/DCE6 cases support added using existing DCE8 implementation as a reference

(v2) updated due to following kernel 5.2 commit:
     d9673c92 ("drm/amd/display: Pass init_data into DCN resource creation")

Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarMauro Rossi <issor.oruam@gmail.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 7c15fd86

drivers/gpu/drm/amd/display/dc/core/dc_resource.c

+29 −0
Original line number Diff line number Diff line
@@ -42,6 +42,9 @@ 
#include "virtual/virtual_stream_encoder.h"

#include "dpcd_defs.h"



#if defined(CONFIG_DRM_AMD_DC_SI)

#include "dce60/dce60_resource.h"

#endif

#include "dce80/dce80_resource.h"

#include "dce100/dce100_resource.h"

#include "dce110/dce110_resource.h"
@@ -63,6 +66,18 @@ enum dce_version resource_parse_asic_id(struct hw_asic_id asic_id) 
	enum dce_version dc_version = DCE_VERSION_UNKNOWN;

	switch (asic_id.chip_family) {



#if defined(CONFIG_DRM_AMD_DC_SI)

	case FAMILY_SI:

		if (ASIC_REV_IS_TAHITI_P(asic_id.hw_internal_rev) ||

		    ASIC_REV_IS_PITCAIRN_PM(asic_id.hw_internal_rev) ||

		    ASIC_REV_IS_CAPEVERDE_M(asic_id.hw_internal_rev))

		dc_version = DCE_VERSION_6_0;

		else if (ASIC_REV_IS_OLAND_M(asic_id.hw_internal_rev))

			dc_version = DCE_VERSION_6_4;

		else

			dc_version = DCE_VERSION_6_1;

		break;

#endif

	case FAMILY_CI:

		dc_version = DCE_VERSION_8_0;

		break;
@@ -129,6 +144,20 @@ struct resource_pool *dc_create_resource_pool(struct dc *dc, 
	struct resource_pool *res_pool = NULL;



	switch (dc_version) {

#if defined(CONFIG_DRM_AMD_DC_SI)

	case DCE_VERSION_6_0:

		res_pool = dce60_create_resource_pool(

			init_data->num_virtual_links, dc);

		break;

	case DCE_VERSION_6_1:

		res_pool = dce61_create_resource_pool(

			init_data->num_virtual_links, dc);

		break;

	case DCE_VERSION_6_4:

		res_pool = dce64_create_resource_pool(

			init_data->num_virtual_links, dc);

		break;

#endif

	case DCE_VERSION_8_0:

		res_pool = dce80_create_resource_pool(

				init_data->num_virtual_links, dc);

CRA Git | Maintained and supported by SUSTech CRA and CCSE