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: <938ca191-074b-468c-d44d-0be795fb0700@amd.com>
Date:   Thu, 4 Aug 2022 09:27:27 -0400
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
 Thunderbird/91.11.0
Subject: Re: [PATCH] drm/amd/display: restore plane with no modifiers code.
Content-Language: en-US
To:     Dave Airlie <airlied@redhat.com>, torvalds@linux-foundation.org
Cc:     Rodrigo.Siqueira@amd.com, linux-kernel@vger.kernel.org,
        dri-devel@lists.freedesktop.org
References: <20220804055036.691670-1-airlied@redhat.com>
From:   Harry Wentland <harry.wentland@amd.com>
In-Reply-To: <20220804055036.691670-1-airlied@redhat.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?aklkUTV0Um1EZFd2R2dXaTNGUkN4ekdYNUNpaVhoZ2x0ZU4vUVRrU081WTBn?=
 =?utf-8?B?VEVsVEVqNzJ4bEZTSmhWOVYyZFdMejl3YXNKLzNlWXNnZndUTi9TRHBDZU9o?=
 =?utf-8?B?VUtxclFqV1B5UmFmNVdUNXBPNm1GeGgySU5sVllycnYyVW05RTVzc2taa0Nj?=
 =?utf-8?B?RjFuWlB2MzI4RElSTE1SekNLTE50OUdPMUxHK3liamRLUFRsWFRtVnpVRU9W?=
 =?utf-8?B?ZUdweTQ1QzQ1Z3NLWVZ1ZDQ4MmIvTzN3M0hrR2MyWkxhQmpjbWNqSmtXT0F1?=
 =?utf-8?B?aTY3YTZ5ekxBeEFWSlJsRDA0dUxXNVNkV201NDJyb3BwNUEyYkwxMW15WSs5?=
 =?utf-8?B?ZWhSdVJHZE96WHBMVTE3bDdTWldqdnlyVUl4M2hrYm4yQU91NVFMSk9SVVdT?=
 =?utf-8?B?V1hyWHA3bGJUcnRnbms1MC9aTi83REhyS3Y3RFA0eHpvQWlkdjhPcVpIRlZQ?=
 =?utf-8?B?dmVoY2dxZlVDZTNSQzhDQTVxWFZZT0FwOXVEVmNxUVRtcDlxTERxUjNWRXNR?=
 =?utf-8?B?NkJxR3EwYXRwNXlXNGJLTWp4dVQxK2dLbTZYbjZzRFJnOVQwallXZ3FYdGsy?=
 =?utf-8?B?K215TmxwcElIRmhvS3NWUW9QRWhPR0hlc3A5NWx5YnBBdW1vK1FCYkI3cVZL?=
 =?utf-8?B?RFJvSWtyK0xQNElkaUlRbEJnQlZTdjYveERiSFRieVBhbENpMGIvM2lWRFdH?=
 =?utf-8?B?U3UweE4vK2dBYzNSQm94M1dvN1N3eWRzTDRzZk1KMVZqM3h3RFd4WWNTNDV3?=
 =?utf-8?B?NWdCSzlJMFc1bUE2VWpnTHo3dzdvangwQ2RjdktuY2I1ejBuR3p2U0tud0xy?=
 =?utf-8?B?SlowQ0ZRbFhsLzNtNmI3Tjlnbm8rQkZGbzZrR1hiUFFGZWNab2t4d2UyZGJi?=
 =?utf-8?B?bllnNnk3SGVncklWTEh3NERmTTVaL1EvTVRFa0pyQzJHdVN0WU1qSG1Gbmoz?=
 =?utf-8?B?N3JzNUUzczA1NlhpL0lkMnNjaTQrRjlMclh5aUlpejI0UEZseUN3TjVCZjQ5?=
 =?utf-8?B?aXN6WjVtdHMzUnQvb3ZVcktsaE52NWJUd0V2OUQ3c25ESlFLYjhyVFpxNWwz?=
 =?utf-8?B?RHgyTTFuWmx6Mksxc0NOTzF0ZkpidUdEWnA5bUNBSFdMV0tiYW9kWWxqby8x?=
 =?utf-8?B?ckYzeTdScFAwUWtzNzRuZVpoWkNGMGxmY0RqZmFtdncwSGpOVHk5aFVKbUdF?=
 =?utf-8?B?Y0dzQmM5VG81VU1PL0pHQzdJcEpsOVByU2tLTis0c2w4NmRsaUtrQTh4by9r?=
 =?utf-8?B?M1B1NFhVTm1naDZPdnl3bFhLMytaQUU1dzdaNjVOUEtDcjhFL1RyTlREZE5T?=
 =?utf-8?B?dWE2VGRtSi9LaXZORmxQb3daN2xjRGNPbFhtZDVOMkhWT3A0MzY0dFpSWGpN?=
 =?utf-8?B?VGpzRlY3T2kvNi9iMWhoMHdvWklsbXhnV0lGeW4zMmdGYndjQnl4b3N1NWNw?=
 =?utf-8?B?Wk9KeitNM1FzVElJNk5jQTd4UmpOUUdyYTdtZ1FhWCtDQlQ2VTZvM2dsMnRP?=
 =?utf-8?B?dTV5NzNiRDFQM2R4c00yUlF0RHlDU1RDYVI3ekdKb0NubmNpMWNiUklWdXBE?=
 =?utf-8?B?MVIxaE50UzlYdmtlRm8rQkR4Q2FHZXM0Yjk4UmVibEljcFVuTTM5cWZjeHNu?=
 =?utf-8?B?YVF5c0lrUnhWZ2ZYNWEvU3J2Vko5K1V2WGJTS0NFemVieVQrMnVnRTljaEFM?=
 =?utf-8?B?aDJDUmY5Yzd0b1JTdk1mVEkwbzR1T3VHUXRuc1JoTnhXT21sOElONVVEK2pP?=
 =?utf-8?B?eGd5aDRQQXBwdlFMUzJXeUc2aFVDSFBuVzRmaTQ0b2R1WmxRU2luakVvWElh?=
 =?utf-8?B?RUd6ck5YWUJYdGhrSncxLzJweHp0QWkvcG50amVISjRQRkRsMWNVMUgvdHdo?=
 =?utf-8?B?cnppbWpmQzR0Y29PWUxMd0Ywd21wTkN2cVdjc1Q1aG4xMTJ6clBtNWVQYnpU?=
 =?utf-8?B?SjdEbm1wRFYybFlTVmhTZkpRbWVyU0RodUg4T2VqMkdrUU0wMkRPVG80eVZY?=
 =?utf-8?B?SXphb3Z5bVpsMzJoNVlhZUdwSWdDeTY5RmRtWHoyYlV5T1ZnWis4VGpRVmdC?=
 =?utf-8?B?Mkt0YnBTUXRvTWZIMHhEMnpmeXdaRkRJYWZkRFIydUJpRVhNTnVHanI1U1p6?=
 =?utf-8?Q?bMdkPJ5v4MhFw3NdBOGNuyIUj?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 68f3514f-4545-4b87-9d70-08da761d154f
X-MS-Exchange-CrossTenant-AuthSource: CO6PR12MB5427.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Aug 2022 13:27:31.2045
 (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: NFmjfJSTsyAe/YirrfYxgCRUpEv6amalmUnlHh1WuSNZmytWaiOnP79iy6EuyT2SXfcdOPRoZ5wn7VQ2DHcbRQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4938
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 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-08-04 01:50, Dave Airlie wrote:
> When this file was split in
> 
> 5d945cbcd4b16a29d6470a80dfb19738f9a4319f
> Author: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
> Date:   Wed Jul 20 15:31:42 2022 -0400
> 
> drm/amd/display: Create a file dedicated to planes
> 
> This chunk seemed to get dropped. Linus noticed on this
> rx580 and I've reproduced on FIJI which makes sense as these
> are pre-modifier GPUs.
> 
> With this applied, I get gdm back.
> 
> Fixes: 5d945cbcd4b1 ("drm/amd/display: Create a file dedicated to planes")
> Signed-off-by: Dave Airlie <airlied@redhat.com>

Reviewed-by: Harry Wentland <harry.wentland@amd.com>

Harry

> ---
>  drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> 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 8cd25b2ea0dc..b841b8b0a9d8 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
> @@ -1591,6 +1591,9 @@ int amdgpu_dm_plane_init(struct amdgpu_display_manager *dm,
>  	if (res)
>  		return res;
>  
> +	if (modifiers == NULL)
> +		adev_to_drm(dm->adev)->mode_config.fb_modifiers_not_supported = true;
> +
>  	res = drm_universal_plane_init(adev_to_drm(dm->adev), plane, possible_crtcs,
>  				       &dm_plane_funcs, formats, num_formats,
>  				       modifiers, plane->type, NULL);