Commit c0a76ae8 authored by David Tadokoro's avatar David Tadokoro Committed by Alex Deucher
Browse files

drm/amd/display: remove legacy fields of dc_plane_cap struct 



The fields blends_with_above and blends_with_below of struct
dc_plane_cap (defined in dc/dc.h) are boolean and set to true by
default. All instances of a dc_plane_cap maintain the default values of
both. Also, there is only one if statement that checks those fields and
there would be the same effect if it was deleted (assuming that those
fields are always going to be true).

For this reason, considering both fields as legacy ones, this commit
removes them and the aforementioned if statement.

Reviewed-by: default avatarRodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Signed-off-by: default avatarDavid Tadokoro <davidbtadokoro@usp.br>
Signed-off-by: default avatarRodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 83923cb2

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

+0 −3
Original line number Diff line number Diff line
@@ -4351,9 +4351,6 @@ static int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev) 
		if (plane->type != DC_PLANE_TYPE_DCN_UNIVERSAL)

			continue;



		if (!plane->blends_with_above || !plane->blends_with_below)

			continue;



		if (!plane->pixel_format_support.argb8888)

			continue;

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

+0 −2
Original line number Diff line number Diff line
@@ -82,8 +82,6 @@ enum det_size { 


struct dc_plane_cap {

	enum dc_plane_type type;

	uint32_t blends_with_above : 1;

	uint32_t blends_with_below : 1;

	uint32_t per_pixel_alpha : 1;

	struct {

		uint32_t argb8888 : 1;

drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c

+0 −3
Original line number Diff line number Diff line
@@ -401,8 +401,6 @@ static const struct resource_caps stoney_resource_cap = { 


static const struct dc_plane_cap plane_cap = {

		.type = DC_PLANE_TYPE_DCE_RGB,

		.blends_with_below = true,

		.blends_with_above = true,

		.per_pixel_alpha = 1,



		.pixel_format_support = {
@@ -428,7 +426,6 @@ static const struct dc_plane_cap plane_cap = { 


static const struct dc_plane_cap underlay_plane_cap = {

		.type = DC_PLANE_TYPE_DCE_UNDERLAY,

		.blends_with_above = true,

		.per_pixel_alpha = 1,



		.pixel_format_support = {

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

+0 −2
Original line number Diff line number Diff line
@@ -504,8 +504,6 @@ static const struct resource_caps rv2_res_cap = { 


static const struct dc_plane_cap plane_cap = {

	.type = DC_PLANE_TYPE_DCN_UNIVERSAL,

	.blends_with_above = true,

	.blends_with_below = true,

	.per_pixel_alpha = true,



	.pixel_format_support = {

drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c

+0 −2
Original line number Diff line number Diff line
@@ -670,8 +670,6 @@ static const struct resource_caps res_cap_nv10 = { 


static const struct dc_plane_cap plane_cap = {

	.type = DC_PLANE_TYPE_DCN_UNIVERSAL,

	.blends_with_above = true,

	.blends_with_below = true,

	.per_pixel_alpha = true,



	.pixel_format_support = {