Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <ea5d60cd-8d0b-7018-425e-b91e5750a830@amd.com>
Date:   Thu, 20 Oct 2022 08:35:23 -0400
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.3.2
Subject: Re: [PATCH] drm/amd/display: Revert logic for plane modifiers
Content-Language: en-US
To:     =?UTF-8?Q?Joaqu=c3=adn_Ignacio_Aramend=c3=ada?= 
        <samsagax@gmail.com>, harry.wentland@amd.com
Cc:     amd-gfx@lists.freedesktop.org, sunpeng.li@amd.com,
        alexander.deucher@amd.com, christian.koenig@amd.com,
        Xinhui.Pan@amd.com, airlied@gmail.com, daniel@ffwll.ch,
        dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org
References: <20221019151543.22753-1-samsagax@gmail.com>
From:   Rodrigo Siqueira Jordao <Rodrigo.Siqueira@amd.com>
In-Reply-To: <20221019151543.22753-1-samsagax@gmail.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?a2ZQSU1yTEw1VUNKOFpZZm95YVo2QzNIeTZ5SDdMK2lmN2IzOEpQeUlIOThk?=
 =?utf-8?B?SVRMQVU1a0gzNzY1RVhTd0tjbGF0UERESEF6cmJNSko5WFhRNktqRXZWNTB2?=
 =?utf-8?B?a1FGMGZ3NmliTHkwRHM1Tk0raUZOSDRPUXhia2lwWFNZS0RsU2NKZ3FwTG9X?=
 =?utf-8?B?SEs1cG9uQ0ZkbzViMzk5YytacGpsYnZta1BIVXVYQ2FjYmV4bldoMXRNb0hq?=
 =?utf-8?B?WEtZbklWb2MrMS9yOTcwNnB6MERJUVNtTTNxQU9MbkpkRytqaFBidnVRaGxT?=
 =?utf-8?B?cDhzNWlIUFg1ejMrOFhTYUFnaDVhRThaL0NranUxWlVTeXZvaklyWHB3TjVL?=
 =?utf-8?B?eU5ZNHY5cEFBM1ZnSW9qNjRPcTNEZG9wS3VPcWVLZWZGaE5FUXdjWCtZWWYy?=
 =?utf-8?B?aXNiVDRDZm9TMzFGT1REMDYzMU5QcmdlVWFvNm8rTDFqQWZwTGl4TEFkYlRj?=
 =?utf-8?B?V2ZOR3lUL0VOUW1OdTI3bWIwZU14WmE4bGptb3BSZklvMWlWUGl3OHR3Q3pZ?=
 =?utf-8?B?QTZwM3hUM0JhWlEyOEh6V0NNQ1MrK0k0VUF6RjAwVnI3M3Q0SU5rZGpZVWwz?=
 =?utf-8?B?ampYN0R0Y0JRR2dJUHNneDl1VkVrTnJVZjU2cmFnTFhsa1Z4V2FFS09qYWR0?=
 =?utf-8?B?SUVZcG5oM1JJenZkbEV3dFg1aC81NEZLMU1tc2F6Z1RvaDRDeDcxVUZ5K1Mv?=
 =?utf-8?B?SDhKTTFaS0k4MVhXeGttY01xQ2d2b0hpK1hadVlmanIvR28vZHdKY3pvU1dn?=
 =?utf-8?B?L2QvVGhQUm1LcWJlUU1ieG05SlBpVXFWS1dteElFdkwrOVZ2QnpZOC9uTHpx?=
 =?utf-8?B?aTFVU3YzTWFVaXN5T0VFUGtyNks1Z0EzQW9VOVpSQTl5dU1yNUNIdGd0cElS?=
 =?utf-8?B?VHdFUEZJUW1sd3M4a1hkQmVaYUZkTFBpZzY0NkVVT0c5OVhoOFExQmREdzlJ?=
 =?utf-8?B?OEhIWFF6NjdlTHVEcllXdnp6S1hleGFlOHd4VUgwMXdNNmtXMWcvbUx5eXlD?=
 =?utf-8?B?T0pSNk9LVytmRkNkK0Q5aWhodmNTb0xaMms3dk4rQTRpRFJQUm55SjJBU3A0?=
 =?utf-8?B?VDh0d3dVa1BQM2dCMmtlTHFhZUZDNnFYY0FrQUc1SHRHd1QrVVZvaVY2bnRn?=
 =?utf-8?B?dVFscWVoWXRWL1IwREwwYW5nRGVwWEhVT3ZjZ2w5cjZDY1hiYmhGSkRnZ3Nm?=
 =?utf-8?B?d1E5ZG9OZTIwV2VxeUhXWGlteDNoUXI4cUtQWG1OZGQ5Q1JwZHdkUEVITnhZ?=
 =?utf-8?B?ZHFOVENjd2g4d2VzNlY2cFMyeHZBQVROdVQ4S3MvSmI0SEhKcEsyRmlkNHZ0?=
 =?utf-8?B?OGp4K1JkSEtUWmlrMkJnSjdQb0t1bDVCZVpMZ0FIQ2JVTWNsanJ1RHVoTTl6?=
 =?utf-8?B?SVVhQkVsaVRIOU4wZUJBc3pyZ2FFcnMvZGI2YVNIejNhZUtNRURScEdVNy8w?=
 =?utf-8?B?RXhFTmEzaUw3NTNkRGVMNER4ZTdQMFhQQlB2bHJpYWxUNlI2Y1ZmZmptQVRL?=
 =?utf-8?B?RDBqS2RWZ0t2dmx4clk0SHVRR0piSFgxbmFWYWRUUU1HbE1NMVM3eVl1UVFt?=
 =?utf-8?B?NzZhTi9Rd3lYZFRJdHpkSnA4RnBqRjZCOXV5U05nZGhnYWd0dW9ZZUd2S1Ar?=
 =?utf-8?B?dDd2b0dmUEQwY1hTSkUxUmlyZFgwdlQzMzlhWmJ0VFhWU0Y5Z0lOejdrS2ZD?=
 =?utf-8?B?RTVSSExZNk1DeDJ6T25oNjlXdHZKcmVGTVFJMW1iMGRySDhXMGF5STgreitZ?=
 =?utf-8?B?em5VdWZ4SjhPYTFUaW8wTUtoaXJxSTZ2b2VVODhDQ1BOK2hMWm9yUGpwTCtk?=
 =?utf-8?B?U05oSXVNZWIzWlJNSGRVUUl1SXVMR3daTGMyTEYwekdiZmk2eEhMODkrSklT?=
 =?utf-8?B?WW5iTUNmZkF0NTZEcVBUckYvYnlCVUQvMmpnRGREd1plS0lQVzcwVTlpZ01t?=
 =?utf-8?B?cEcyeTFnUEFxWGhYanY0UXJndEVDaW5wMk5oeGZHY2lSMUtGQTJVQzdnUUl3?=
 =?utf-8?B?QUVyOVVNMDh5OFJ0Q2ZNYWtsZ0hKTjNPTGREbjVtWVFMakJ0aDlDQk5hMmRw?=
 =?utf-8?B?d2VXKzRvdHBKOGhMQjJSc0FiTnZFRUZOSkZrNWpWWXlRWVJ4RjdiOGJ3QUk4?=
 =?utf-8?Q?uFyMMOPs1qqHJ+tsaPLps6Rjx?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: ba5152b3-bd35-42c7-f4e6-08dab2978fbc
X-MS-Exchange-CrossTenant-AuthSource: MN2PR12MB2941.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Oct 2022 12:35:25.1271
 (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: GQ9gA7s3u3NarQPem5JMnZnnNAU6T/GjNoyMkMlBxhrJ9tfcuXxogxJue4Hdo3RpCfQ95IQMoJ3jXoVMwwCQTg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR12MB7026
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,URIBL_BLOCKED autolearn=ham
        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-10-19 11:15, Joaquín Ignacio Aramendía wrote:
> This file was split in commit 5d945cbcd4b16a29d6470a80dfb19738f9a4319f
> ("drm/amd/display: Create a file dedicated to planes") the logic in
> dm_plane_format_mod_supported() function got changed by a switch logic.
> That change broke drm_plane modifiers setting on series 5000 APUs
> (tested on OXP mini AMD 5800U and HP Dev One 5850U PRO)
> leading to Gamescope not working as reproted on GitHub[1]
> 
> To reproduce the issue, enter a TTY and run:
> 
> $ gamescope -- vkcube
> 
> With said commit applied it will abort. This one restores the old logic,
> fixing the issue that affects Gamescope.
> 
> [1](https://github.com/Plagman/gamescope/issues/624>> 
> Signed-off-by: Joaquín Ignacio Aramendía <samsagax@gmail.com>
> ---
>   .../amd/display/amdgpu_dm/amdgpu_dm_plane.c   | 50 +++----------------
>   1 file changed, 8 insertions(+), 42 deletions(-)
> 
> diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c
> index dfd3be49eac8..81c1fc9468b8 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c
> @@ -1371,6 +1371,8 @@ static bool dm_plane_format_mod_supported(struct drm_plane *plane,
>   	const struct drm_format_info *info = drm_format_info(format);
>   	struct hw_asic_id asic_id = adev->dm.dc->ctx->asic_id;

Hi,

First of all, thanks a lot for this patch.

You can drop asic_id since it is not used anymore.

Thanks
Siqueira

>   
> +	int i;
> +
>   	enum dm_micro_swizzle microtile = modifier_gfx9_swizzle_mode(modifier) & 3;
>   
>   	if (!info)
> @@ -1386,49 +1388,13 @@ static bool dm_plane_format_mod_supported(struct drm_plane *plane,
>   		return true;
>   	}
>   
> -	/* check if swizzle mode is supported by this version of DCN */
> -	switch (asic_id.chip_family) {
> -	case FAMILY_SI:
> -	case FAMILY_CI:
> -	case FAMILY_KV:
> -	case FAMILY_CZ:
> -	case FAMILY_VI:
> -		/* asics before AI does not have modifier support */
> -		return false;
> -	case FAMILY_AI:
> -	case FAMILY_RV:
> -	case FAMILY_NV:
> -	case FAMILY_VGH:
> -	case FAMILY_YELLOW_CARP:
> -	case AMDGPU_FAMILY_GC_10_3_6:
> -	case AMDGPU_FAMILY_GC_10_3_7:
> -		switch (AMD_FMT_MOD_GET(TILE, modifier)) {
> -		case AMD_FMT_MOD_TILE_GFX9_64K_R_X:
> -		case AMD_FMT_MOD_TILE_GFX9_64K_D_X:
> -		case AMD_FMT_MOD_TILE_GFX9_64K_S_X:
> -		case AMD_FMT_MOD_TILE_GFX9_64K_D:
> -			return true;
> -		default:
> -			return false;
> -		}
> -		break;
> -	case AMDGPU_FAMILY_GC_11_0_0:
> -	case AMDGPU_FAMILY_GC_11_0_1:
> -		switch (AMD_FMT_MOD_GET(TILE, modifier)) {
> -		case AMD_FMT_MOD_TILE_GFX11_256K_R_X:
> -		case AMD_FMT_MOD_TILE_GFX9_64K_R_X:
> -		case AMD_FMT_MOD_TILE_GFX9_64K_D_X:
> -		case AMD_FMT_MOD_TILE_GFX9_64K_S_X:
> -		case AMD_FMT_MOD_TILE_GFX9_64K_D:
> -			return true;
> -		default:
> -			return false;
> -		}
> -		break;
> -	default:
> -		ASSERT(0); /* Unknown asic */
> -		break;
> +	/* Check that the modifier is on the list of the plane's supported modifiers. */
> +	for (i = 0; i < plane->modifier_count; i++) {
> +		if (modifier == plane->modifiers[i])
> +			break;
>   	}
> +	if (i == plane->modifier_count)
> +		return false;
>   
>   	/*
>   	 * For D swizzle the canonical modifier depends on the bpp, so check