[PATCH] drm/amd/display: remove legacy fields of dc_plane_cap struct
Rodrigo Siqueira Jordao
Rodrigo.Siqueira at amd.com
Wed Mar 8 00:13:29 UTC 2023
On 3/7/23 15:53, David Tadokoro wrote:
> 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.
>
> Signed-off-by: David Tadokoro <davidbtadokoro at usp.br>
> ---
> drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 ---
> drivers/gpu/drm/amd/display/dc/dc.h | 2 --
> drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c | 3 ---
> drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 2 --
> drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 2 --
> drivers/gpu/drm/amd/display/dc/dcn201/dcn201_resource.c | 2 --
> drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 2 --
> drivers/gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 2 --
> drivers/gpu/drm/amd/display/dc/dcn301/dcn301_resource.c | 2 --
> drivers/gpu/drm/amd/display/dc/dcn302/dcn302_resource.c | 2 --
> drivers/gpu/drm/amd/display/dc/dcn303/dcn303_resource.c | 2 --
> drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c | 2 --
> drivers/gpu/drm/amd/display/dc/dcn314/dcn314_resource.c | 2 --
> drivers/gpu/drm/amd/display/dc/dcn315/dcn315_resource.c | 2 --
> drivers/gpu/drm/amd/display/dc/dcn316/dcn316_resource.c | 2 --
> drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource.c | 2 --
> drivers/gpu/drm/amd/display/dc/dcn321/dcn321_resource.c | 2 --
> 17 files changed, 36 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> index b472931cb7ca..fdcb375e908a 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> @@ -4354,9 +4354,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;
>
> diff --git a/drivers/gpu/drm/amd/display/dc/dc.h b/drivers/gpu/drm/amd/display/dc/dc.h
> index f0a1934ebf8c..ccc27d482640 100644
> --- a/drivers/gpu/drm/amd/display/dc/dc.h
> +++ b/drivers/gpu/drm/amd/display/dc/dc.h
> @@ -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;
> diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c b/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c
> index f808315b2835..a4a45a6ce61e 100644
> --- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c
> +++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c
> @@ -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 = {
> diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c
> index 6bfac8088ab0..2bb8e11f26e0 100644
> --- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c
> +++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c
> @@ -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 = {
> diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
> index 3af24ef9cb2d..00668df0938e 100644
> --- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
> +++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
> @@ -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 = {
> diff --git a/drivers/gpu/drm/amd/display/dc/dcn201/dcn201_resource.c b/drivers/gpu/drm/amd/display/dc/dcn201/dcn201_resource.c
> index cd46701398d9..6ea70da28aaa 100644
> --- a/drivers/gpu/drm/amd/display/dc/dcn201/dcn201_resource.c
> +++ b/drivers/gpu/drm/amd/display/dc/dcn201/dcn201_resource.c
> @@ -571,8 +571,6 @@ static const struct resource_caps res_cap_dnc201 = {
>
> 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 = {
> diff --git a/drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c b/drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c
> index 8f9244fe5c86..3ac8c0282589 100644
> --- a/drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c
> +++ b/drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c
> @@ -609,8 +609,6 @@ static const struct resource_caps res_cap_rn_FPGA_2pipe_dsc = {
>
> 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 = {
> diff --git a/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_resource.c b/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_resource.c
> index b5b5320c7bef..d60c17d5a0d8 100644
> --- a/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_resource.c
> +++ b/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_resource.c
> @@ -680,8 +680,6 @@ static const struct resource_caps res_cap_dcn3 = {
>
> 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 = {
> diff --git a/drivers/gpu/drm/amd/display/dc/dcn301/dcn301_resource.c b/drivers/gpu/drm/amd/display/dc/dcn301/dcn301_resource.c
> index ee62ae3eb98f..b93b4498dba4 100644
> --- a/drivers/gpu/drm/amd/display/dc/dcn301/dcn301_resource.c
> +++ b/drivers/gpu/drm/amd/display/dc/dcn301/dcn301_resource.c
> @@ -651,8 +651,6 @@ static struct resource_caps res_cap_dcn301 = {
>
> 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 = {
> diff --git a/drivers/gpu/drm/amd/display/dc/dcn302/dcn302_resource.c b/drivers/gpu/drm/amd/display/dc/dcn302/dcn302_resource.c
> index 03ddf4f5f065..6ccad53f1e49 100644
> --- a/drivers/gpu/drm/amd/display/dc/dcn302/dcn302_resource.c
> +++ b/drivers/gpu/drm/amd/display/dc/dcn302/dcn302_resource.c
> @@ -147,8 +147,6 @@ static const struct resource_caps res_cap_dcn302 = {
>
> 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 = {
> .argb8888 = true,
> diff --git a/drivers/gpu/drm/amd/display/dc/dcn303/dcn303_resource.c b/drivers/gpu/drm/amd/display/dc/dcn303/dcn303_resource.c
> index 727f458f6ee9..5c28f7151d13 100644
> --- a/drivers/gpu/drm/amd/display/dc/dcn303/dcn303_resource.c
> +++ b/drivers/gpu/drm/amd/display/dc/dcn303/dcn303_resource.c
> @@ -126,8 +126,6 @@ static const struct resource_caps res_cap_dcn303 = {
>
> 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 = {
> .argb8888 = true,
> diff --git a/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c b/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c
> index d3918a10773a..eaaa2e01f6d0 100644
> --- a/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c
> +++ b/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c
> @@ -827,8 +827,6 @@ static const struct resource_caps res_cap_dcn31 = {
>
> 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 = {
> diff --git a/drivers/gpu/drm/amd/display/dc/dcn314/dcn314_resource.c b/drivers/gpu/drm/amd/display/dc/dcn314/dcn314_resource.c
> index f9dfbc7407ee..50ed7e09d5ba 100644
> --- a/drivers/gpu/drm/amd/display/dc/dcn314/dcn314_resource.c
> +++ b/drivers/gpu/drm/amd/display/dc/dcn314/dcn314_resource.c
> @@ -855,8 +855,6 @@ static const struct resource_caps res_cap_dcn314 = {
>
> 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 = {
> diff --git a/drivers/gpu/drm/amd/display/dc/dcn315/dcn315_resource.c b/drivers/gpu/drm/amd/display/dc/dcn315/dcn315_resource.c
> index 7887078c5f64..41c972c8eb19 100644
> --- a/drivers/gpu/drm/amd/display/dc/dcn315/dcn315_resource.c
> +++ b/drivers/gpu/drm/amd/display/dc/dcn315/dcn315_resource.c
> @@ -824,8 +824,6 @@ static const struct resource_caps res_cap_dcn31 = {
>
> 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 = {
> diff --git a/drivers/gpu/drm/amd/display/dc/dcn316/dcn316_resource.c b/drivers/gpu/drm/amd/display/dc/dcn316/dcn316_resource.c
> index dc0b49506275..9ead347a33e9 100644
> --- a/drivers/gpu/drm/amd/display/dc/dcn316/dcn316_resource.c
> +++ b/drivers/gpu/drm/amd/display/dc/dcn316/dcn316_resource.c
> @@ -824,8 +824,6 @@ static const struct resource_caps res_cap_dcn31 = {
>
> 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 = {
> diff --git a/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource.c b/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource.c
> index 87f7669e81d7..100b6df33b33 100644
> --- a/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource.c
> +++ b/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource.c
> @@ -657,8 +657,6 @@ static const struct resource_caps res_cap_dcn32 = {
>
> 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 = {
> diff --git a/drivers/gpu/drm/amd/display/dc/dcn321/dcn321_resource.c b/drivers/gpu/drm/amd/display/dc/dcn321/dcn321_resource.c
> index deaa4769be10..0f477d50e935 100644
> --- a/drivers/gpu/drm/amd/display/dc/dcn321/dcn321_resource.c
> +++ b/drivers/gpu/drm/amd/display/dc/dcn321/dcn321_resource.c
> @@ -655,8 +655,6 @@ static const struct resource_caps res_cap_dcn321 = {
>
> 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 = {
Reviewed-by: Rodrigo Siqueira <Rodrigo.Siqueira at amd.com>
I also applied your change to amd-staging-drm-next.
Thanks!
Siqueira
More information about the dri-devel
mailing list