Commit d9673c92 authored by Harry Wentland's avatar Harry Wentland Committed by Alex Deucher
Browse files

drm/amd/display: Pass init_data into DCN resource creation 



[WHY]
The resource constructor currently needs num_virtual_links from
init_data but will need access to other items provided by DM.

[HOW]
Pass init_data into DCN create_resource_pool functions.

Signed-off-by: default avatarHarry Wentland <harry.wentland@amd.com>
Reviewed-by: default avatarNicholas Kazlauskas <Nicholas.Kazlauskas@amd.com>
Acked-by: default avatarBhawanpreet Lakha <Bhawanpreet.Lakha@amd.com>
Acked-by: default avatarHersen Wu <hersenxs.wu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent a504ad26

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

+1 −5
Original line number Diff line number Diff line
@@ -735,11 +735,7 @@ static bool construct(struct dc *dc, 
		goto fail;

	}



	dc->res_pool = dc_create_resource_pool(

			dc,

			init_params->num_virtual_links,

			dc_version,

			init_params->asic_id);

	dc->res_pool = dc_create_resource_pool(dc, init_params, dc_version);

	if (!dc->res_pool)

		goto fail;

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

+12 −14
Original line number Diff line number Diff line
@@ -106,44 +106,43 @@ enum dce_version resource_parse_asic_id(struct hw_asic_id asic_id) 
	return dc_version;

}



struct resource_pool *dc_create_resource_pool(

				struct dc  *dc,

				int num_virtual_links,

				enum dce_version dc_version,

				struct hw_asic_id asic_id)

struct resource_pool *dc_create_resource_pool(struct dc  *dc,

					      const struct dc_init_data *init_data,

					      enum dce_version dc_version)

{

	struct resource_pool *res_pool = NULL;



	switch (dc_version) {

	case DCE_VERSION_8_0:

		res_pool = dce80_create_resource_pool(

			num_virtual_links, dc);

				init_data->num_virtual_links, dc);

		break;

	case DCE_VERSION_8_1:

		res_pool = dce81_create_resource_pool(

			num_virtual_links, dc);

				init_data->num_virtual_links, dc);

		break;

	case DCE_VERSION_8_3:

		res_pool = dce83_create_resource_pool(

			num_virtual_links, dc);

				init_data->num_virtual_links, dc);

		break;

	case DCE_VERSION_10_0:

		res_pool = dce100_create_resource_pool(

				num_virtual_links, dc);

				init_data->num_virtual_links, dc);

		break;

	case DCE_VERSION_11_0:

		res_pool = dce110_create_resource_pool(

			num_virtual_links, dc, asic_id);

				init_data->num_virtual_links, dc,

				init_data->asic_id);

		break;

	case DCE_VERSION_11_2:

	case DCE_VERSION_11_22:

		res_pool = dce112_create_resource_pool(

			num_virtual_links, dc);

				init_data->num_virtual_links, dc);

		break;

	case DCE_VERSION_12_0:

	case DCE_VERSION_12_1:

		res_pool = dce120_create_resource_pool(

			num_virtual_links, dc);

				init_data->num_virtual_links, dc);

		break;



#if defined(CONFIG_DRM_AMD_DC_DCN1_0)
@@ -151,8 +150,7 @@ struct resource_pool *dc_create_resource_pool( 
#if defined(CONFIG_DRM_AMD_DC_DCN1_01)

	case DCN_VERSION_1_01:

#endif

		res_pool = dcn10_create_resource_pool(

				num_virtual_links, dc);

		res_pool = dcn10_create_resource_pool(init_data, dc);

		break;

#endif

drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c

+2 −2
Original line number Diff line number Diff line
@@ -1528,7 +1528,7 @@ fail: 
}



struct resource_pool *dcn10_create_resource_pool(

		uint8_t num_virtual_links,

		const struct dc_init_data *init_data,

		struct dc *dc)

{

	struct dcn10_resource_pool *pool =
@@ -1537,7 +1537,7 @@ struct resource_pool *dcn10_create_resource_pool( 
	if (!pool)

		return NULL;



	if (construct(num_virtual_links, dc, pool))

	if (construct(init_data->num_virtual_links, dc, pool))

		return &pool->base;



	BREAK_TO_DEBUGGER();

drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.h

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ struct dcn10_resource_pool { 
	struct resource_pool base;

};

struct resource_pool *dcn10_create_resource_pool(

		uint8_t num_virtual_links,

		const struct dc_init_data *init_data,

		struct dc *dc);

drivers/gpu/drm/amd/display/dc/inc/resource.h

+3 −5
Original line number Diff line number Diff line
@@ -70,11 +70,9 @@ bool resource_construct( 
	struct resource_pool *pool,

	const struct resource_create_funcs *create_funcs);



struct resource_pool *dc_create_resource_pool(

				struct dc *dc,

				int num_virtual_links,

				enum dce_version dc_version,

				struct hw_asic_id asic_id);

struct resource_pool *dc_create_resource_pool(struct dc  *dc,

					      const struct dc_init_data *init_data,

					      enum dce_version dc_version);



void dc_destroy_resource_pool(struct dc *dc);

CRA Git | Maintained and supported by SUSTech CRA and CCSE