Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19;
Message-ID: <f0c7adf6-7417-3773-3780-4a273e9ffb1a@amd.com>
Date:   Wed, 30 Mar 2022 08:30:23 -0400
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
 Thunderbird/91.7.0
Subject: Re: [PATCH v2] drm/amd/display: don't ignore alpha property on
 pre-multiplied mode
Content-Language: en-US
To:     Melissa Wen <mwen@igalia.com>,
        Harry Wentland <harry.wentland@amd.com>,
        Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>,
        Zhan Liu <Zhan.Liu@amd.com>,
        Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>,
        Simon Ser <contact@emersion.fr>
Cc:     amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org,
        linux-kernel@vger.kernel.org,
        Agustin Gutierrez <agustin.gutierrez@amd.com>,
        Alex Deucher <alexander.deucher@amd.com>,
        markyacoub@google.com, sunpeng.li@amd.com, airlied@linux.ie,
        daniel@ffwll.ch, christian.koenig@amd.com, Xinhui.Pan@amd.com
References: <20220329201835.2393141-1-mwen@igalia.com>
From:   Rodrigo Siqueira Jordao <rjordrigo@amd.com>
In-Reply-To: <20220329201835.2393141-1-mwen@igalia.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 2
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?a3BOemFTeFlIK2FIbVM5TW5hNzlmQUV1RlY3bENnUVlnUUNvOEo4SWpBcXp0?=
 =?utf-8?B?TFlaUk00MHo1MVlRNlhvWXJPSHE1dTlNanVUeS8rbXc5R2JOcVNFb1BkSFU0?=
 =?utf-8?B?dUVzWjVVRm00Ky9mcjFucWJ4RzVOWS9abGZwTW0xWndIa0EwdGN4aUVjS1pO?=
 =?utf-8?B?bjVVVkJSTkdHN2pUcVJPTkppMnE5Mkg4WG9hMlc4TjdQOUNiUFcxYVNmRUU1?=
 =?utf-8?B?TTc3N1BGVlJRRUtoT1ZuSVBmanBqc1JzSWpqOW9BYWJFejhUMkFScEE0RExG?=
 =?utf-8?B?Y2xCQzNLWlFsc0VrQjlCdjBBRDVBbG5Kb2MvQ3pXZDZxUWpLbk0xall1TlQx?=
 =?utf-8?B?MXNuUHlMb3BabGdzd3FldEp6ekwyM1hVYzFJaFBWSkZ4VXVPQlMyMnAvdGNn?=
 =?utf-8?B?L2JKRWVXdmFnaWI0SHpKbjdTWW42aDl6azRRemxtWjBuU1J1anFadDlGRkN2?=
 =?utf-8?B?aGhMTTArOVFLeWF6WXFMbHZ3UWNYZWlPbWEyWE1WRG05VG9UUFNFbFJITXZP?=
 =?utf-8?B?ankvMmd2NGNnNnZnZnJaNy9BSGpzeCtmUDMxNXducEhSNDBVbjQ4M0o3bVFj?=
 =?utf-8?B?c2Y1bFVjUDIwUGFtU2lyRXZvOTh4OFY2ZFY4Tk1jK3NCN1dqbzd4MDVrcW1z?=
 =?utf-8?B?bWgvd3UyK3d1cWFJcGROalRjRXcxZGJKaUQ0MkxKYTRKdTdhSHlpUDkxSUcy?=
 =?utf-8?B?QzFiTzVTWG54K2dVZXRvclYzYlhxTnIwc21ETU80WXQvY0svOTkyWlg2eFcw?=
 =?utf-8?B?dHQwMDNFcEIwNE9yT3V6dmp5c08xOGNXSytuNXVYVUFEcWU1VlR1RFdlc3Ry?=
 =?utf-8?B?UTFYdGt0YjJwNWVNclFhbjdwTmxEd1JkWVA3MkNrSEIrNHVQb1FCVDRzQW5q?=
 =?utf-8?B?Z1JGRjRUVGFQNWc1TnNrdXoyWmlzZjBkN2NQVHNEblNnbU9ESm50OXhZOWtR?=
 =?utf-8?B?Y3R2K2s3am5ESDZIdC9EN09ER3lmT3ZCUGRjcUVDQjJXRkhWSnUyaWlmemxj?=
 =?utf-8?B?Vnc4MC9hS2Z2UWE0Tnh0V2p2eHY1UG5VMk4zZWt1elJ2akppcUVNeG83WGRa?=
 =?utf-8?B?MHpKZUdIemsrUnBTcFZvNGhBZGZMYkxaYXdIaEptMlk0bW5ZazgyenM5S0Yw?=
 =?utf-8?B?SEc5b0lRYm1qRkJmS1FScGppMzI5WC9sdlZheHdmcjNDTjFyTjNDY3lRc0lJ?=
 =?utf-8?B?OXFPbjY1R3JydFJ0MW5XNmdNaXFCekVudUE5TGI0dVNuYmhsNGRDY2RhZzRU?=
 =?utf-8?B?VWtTSDhUWWF3NzZ2NksrVVRhUVFrdGEvV0RjS21taWVEdHRpQjdNNEx5djFu?=
 =?utf-8?B?QS9NM1VManpsQ1Q3M3R2aXBOMnRXSXFjUmR5VXNpaFBuOHpPNmV1U3p1cTZy?=
 =?utf-8?B?dmRtYzZsTVVXTktCeXhtaHFQVGYzYmE2TUpYVnZSNVBGM0lFWjA4TXdFZTdV?=
 =?utf-8?B?d2xHb01JMmtNU202di9VRzBBUEhUQmtTUUI5WDRzRFhWN1NXOFIwVjN0a2Y2?=
 =?utf-8?B?ZDEwanV4UGE2TzE0c2M1ZWtENHJzczh3TjVXN09FZGc3bTl4RGFNZUkwQWVp?=
 =?utf-8?B?KzNwdVJrM3ZZQnQrVDNFQUpFRTJoRFBkN29qLzVKMHFxYm9pQWhLTU05ZlAy?=
 =?utf-8?B?QUpjUkdsell1VCtPUjJwa1dzdzcvd2dQZHptTTZtNllNYjFXRlZ4Q2FpS05Q?=
 =?utf-8?B?WDlQZ2FOQ0hESVV5a3dZMnpnOU9iSFJpZWdHUStELzEwSGhrMGNyWDRWY0NX?=
 =?utf-8?B?bU9BdllTWGx1NENiRHptbE1sSDRycCtTS29zckdZa1AvaEgrOHQ3TU5lSTh4?=
 =?utf-8?B?S2d3QXUzWWRuS0M5YzhpRDBqMTdYalJpZTVwOEkybHdsSnA0bnJyL25HL1Vl?=
 =?utf-8?B?TXlLcHVtdWNnMGd2UUdYUjZ3VkJ5SjF5VStsLzRlNUt1YjdCS0hBdTdBZFdx?=
 =?utf-8?B?SzFnVm9aQTlIWFJFakV1bW5xMWxvaHc3cXlpZnFXcy91RHBDUXI5djAzS2pC?=
 =?utf-8?B?b1dSdU1laFB3cVdieE5oWSthckttekdIZkhVWFdXMmM3dXRhRTREMlZyS0hm?=
 =?utf-8?B?K1RBOWdZYks1VU9ISzhyanpCWVdrZUlhOTh6SGp3d3pXWUpVcldPY0ppZVFJ?=
 =?utf-8?B?VDh2UnVaZFZwbE9kSjZkclh5Vi9DVFMydVk2YVhXWE1zMjF3QUc4M3Nrclhp?=
 =?utf-8?B?dXAwL051eVV1MDFSb00vdDlscHBnRkYwenVmRFJxTVRBSzlnbmd2N3hVVGJU?=
 =?utf-8?B?WDhhZklJaHcxYkorSDQwZW1jSlBJWWdrbTYrcytWU2tqbWNNdzQ4U0RydFls?=
 =?utf-8?B?NHUxcHRxODBUY1dOdU45Y3V5eVNrQkVMYjBkcmFyTVhlR3RyTkM0Yi95Yk5F?=
 =?utf-8?Q?T1XP0Lfok0VESF3m08YExhdNxTTkR99vGGeqdQ2mLoGKk?=
X-MS-Exchange-AntiSpam-MessageData-1: 2ufLeIJ8o8E7hQ==
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 7058cf13-f149-4b14-e1d9-08da12491124
X-MS-Exchange-CrossTenant-AuthSource: MN2PR12MB2896.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Mar 2022 12:30:25.7763
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: j2aateFisorwhgTeUNskjBrvM+y/MRRIgydP/DquhJvGwEvaroLYi0x0IkNi2rkb9qACcJ7vqudfstbFgJd0Ew==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4295
X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,NICE_REPLY_A,RDNS_NONE,SPF_HELO_NONE,
	T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
	lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


On 2022-03-29 16:18, Melissa Wen wrote:
> "Pre-multiplied" is the default pixel blend mode for KMS/DRM, as
> documented in supported_modes of drm_plane_create_blend_mode_property():
> https://cgit.freedesktop.org/drm/drm-misc/tree/drivers/gpu/drm/drm_blend.c
> 
> In this mode, both 'pixel alpha' and 'plane alpha' participate in the
> calculation, as described by the pixel blend mode formula in KMS/DRM
> documentation:
> 
> out.rgb = plane_alpha * fg.rgb +
>            (1 - (plane_alpha * fg.alpha)) * bg.rgb
> 
> Considering the blend config mechanisms we have in the driver so far,
> the alpha mode that better fits this blend mode is the
> _PER_PIXEL_ALPHA_COMBINED_GLOBAL_GAIN, where the value for global_gain
> is the plane alpha (global_alpha).
> 
> With this change, alpha property stops to be ignored. It also addresses
> Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/1734
> 
> v2:
>   * keep the 8-bit value for global_alpha_value (Nicholas)
>   * correct the logical ordering for combined global gain (Nicholas)
>   * apply to dcn10 too (Nicholas)
> 
> Signed-off-by: Melissa Wen <mwen@igalia.com>
> ---
>   .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c  | 14 +++++++++-----
>   drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 14 +++++++++-----
>   2 files changed, 18 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c
> index ad757b59e00e..b1034e6258c8 100644
> --- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c
> +++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c
> @@ -2528,14 +2528,18 @@ void dcn10_update_mpcc(struct dc *dc, struct pipe_ctx *pipe_ctx)
>   	struct mpc *mpc = dc->res_pool->mpc;
>   	struct mpc_tree *mpc_tree_params = &(pipe_ctx->stream_res.opp->mpc_tree_params);
>   
> -	if (per_pixel_alpha)
> -		blnd_cfg.alpha_mode = MPCC_ALPHA_BLEND_MODE_PER_PIXEL_ALPHA;
> -	else
> -		blnd_cfg.alpha_mode = MPCC_ALPHA_BLEND_MODE_GLOBAL_ALPHA;
> -
>   	blnd_cfg.overlap_only = false;
>   	blnd_cfg.global_gain = 0xff;
>   
> +	if (per_pixel_alpha && pipe_ctx->plane_state->global_alpha) {
> +		blnd_cfg.alpha_mode = MPCC_ALPHA_BLEND_MODE_PER_PIXEL_ALPHA_COMBINED_GLOBAL_GAIN;
> +		blnd_cfg.global_gain = pipe_ctx->plane_state->global_alpha_value;
> +	} else if (per_pixel_alpha) {
> +		blnd_cfg.alpha_mode = MPCC_ALPHA_BLEND_MODE_PER_PIXEL_ALPHA;
> +	} else {
> +		blnd_cfg.alpha_mode = MPCC_ALPHA_BLEND_MODE_GLOBAL_ALPHA;
> +	}
> +
>   	if (pipe_ctx->plane_state->global_alpha)
>   		blnd_cfg.global_alpha = pipe_ctx->plane_state->global_alpha_value;
>   	else
> diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c
> index 4290eaf11a04..b627c41713cc 100644
> --- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c
> +++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c
> @@ -2344,14 +2344,18 @@ void dcn20_update_mpcc(struct dc *dc, struct pipe_ctx *pipe_ctx)
>   	struct mpc *mpc = dc->res_pool->mpc;
>   	struct mpc_tree *mpc_tree_params = &(pipe_ctx->stream_res.opp->mpc_tree_params);
>   
> -	if (per_pixel_alpha)
> -		blnd_cfg.alpha_mode = MPCC_ALPHA_BLEND_MODE_PER_PIXEL_ALPHA;
> -	else
> -		blnd_cfg.alpha_mode = MPCC_ALPHA_BLEND_MODE_GLOBAL_ALPHA;
> -
>   	blnd_cfg.overlap_only = false;
>   	blnd_cfg.global_gain = 0xff;
>   
> +	if (per_pixel_alpha && pipe_ctx->plane_state->global_alpha) {
> +		blnd_cfg.alpha_mode = MPCC_ALPHA_BLEND_MODE_PER_PIXEL_ALPHA_COMBINED_GLOBAL_GAIN;
> +		blnd_cfg.global_gain = pipe_ctx->plane_state->global_alpha_value;
> +	} else if (per_pixel_alpha) {
> +		blnd_cfg.alpha_mode = MPCC_ALPHA_BLEND_MODE_PER_PIXEL_ALPHA;
> +	} else {
> +		blnd_cfg.alpha_mode = MPCC_ALPHA_BLEND_MODE_GLOBAL_ALPHA;
> +	}
> +

Hi Melissa,

Thanks a lot for this patch. I run your patch in our CI, and everything 
looks good from the IGT test result.

In this sense:
Tested-by: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>

However, I think it is still necessary to have someone else review.

Harry, Nick, or Zhan, what do you think about this change?

Thanks
Siqueira

>   	if (pipe_ctx->plane_state->global_alpha)
>   		blnd_cfg.global_alpha = pipe_ctx->plane_state->global_alpha_value;
>   	else