From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EC742C433FE for ; Thu, 13 Jan 2022 17:56:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237347AbiAMR43 (ORCPT ); Thu, 13 Jan 2022 12:56:29 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55614 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233807AbiAMR42 (ORCPT ); Thu, 13 Jan 2022 12:56:28 -0500 Received: from mail-yb1-xb2d.google.com (mail-yb1-xb2d.google.com [IPv6:2607:f8b0:4864:20::b2d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3D394C061574 for ; Thu, 13 Jan 2022 09:56:27 -0800 (PST) Received: by mail-yb1-xb2d.google.com with SMTP id n68so17267982ybg.6 for ; Thu, 13 Jan 2022 09:56:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=basnieuwenhuizen.nl; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=NdER3tWel4lE2/IoeEHZfK62RzxAAdC/S8e3rQxeHZA=; b=QqKneNMQj4ZBTtbPRfxOzT7S0JJTSi1VXQyb1h0OwmrazhZmAY9eGs8Jdl48biORhS khpRxv8ZdQQXcw/97mnlQ5sYhTq0Z6rXlw8DolwUXAvENLMJOQPhKu457fArQpLQ6FSY lVpbLszp8ZE7myFULL7HPZYWWalDnTFXsObJdmXxt8f7C5GWond7c/SODUIIw8su+C2A e/sT9FfwJu37VzhLSbhFnfH7fS41HLQ0IdR1bhXhdReexQK0214ADbSSA/htnuG1ImE2 d1AEtMD0JGVtz34tpAJRc3rHDWemUsqXa/g6qy8YNa6WMaaeaiaqpS2D23UAkINVsAyZ 7lwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=NdER3tWel4lE2/IoeEHZfK62RzxAAdC/S8e3rQxeHZA=; b=PyJBSw1gHe0fvK8PTIh6GKISeUFKSReUhzuKLDZqrvn91wsyHTyFjICTzWkRvAG1p2 JozoOErY2+EmvILFvLxVP2A2qfLL6z3B36P7XOIRsTsPGZ7my0LAI8iOpRf713Nn7BZa ITF+eBzD0mfq3apBeSLO2xKATdofLiD8JWcHVYmzyZYCsEIfSYcguKir/O3rwMoCZINu cTyowqUFcIwRpN6vJUBzEGGyCVP8Amd1ZGEwn3wqF/u9ns0QL9zGu7PK6ls33mICSkWW hkNu9fHraQEz4UAxCicKfCZEUO/n9ugmAmCP1tPNoA9WHubAUbbOJ+GnEAJxPyyTF3RZ FDjg== X-Gm-Message-State: AOAM5337eXNdgWOQ+ehbrnh/SKPBTCuAV8zqc8zITgwefFoEiRPY+1pN 2fYWiyH8z3lke8fjPqO/eQqUL6h2+/Eu0ADX9QQdFA== X-Google-Smtp-Source: ABdhPJz0n/brLEOsHB+4ty1kzSaUXFZiYF0zQd6450hq8J/b6AU/fn8nOe1GrP4fr+eT/3DR8+r7QcZLTYifVj2lHPg= X-Received: by 2002:a25:50d8:: with SMTP id e207mr7592797ybb.150.1642096586381; Thu, 13 Jan 2022 09:56:26 -0800 (PST) MIME-Version: 1.0 References: <20220113094419.12433-1-etom@igel.co.jp> <20220113094419.12433-3-etom@igel.co.jp> In-Reply-To: <20220113094419.12433-3-etom@igel.co.jp> From: Bas Nieuwenhuizen Date: Thu, 13 Jan 2022 18:56:18 +0100 Message-ID: Subject: Re: [RFC PATCH v2 2/3] drm: set fb_modifiers_not_supported flag in legacy drivers To: Tomohito Esaki Cc: ML dri-devel , Alex Deucher , =?UTF-8?Q?Christian_K=C3=B6nig?= , "Pan, Xinhui" , David Airlie , Daniel Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Ben Skeggs , =?UTF-8?Q?Michel_D=C3=A4nzer?= , Simon Ser , Qingqing Zhuo , Mark Yacoub , Sean Paul , Evan Quan , Andy Shevchenko , Petr Mladek , Sakari Ailus , Lee Jones , Abhinav Kumar , Dmitry Baryshkov , Rob Clark , amd-gfx mailing list , LKML , nouveau@lists.freedesktop.org, Daniel Stone , Laurent Pinchart , Damian Hobson-Garcia , Takanari Hayama Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org I think we'll also want to do a conditional disable for DC (drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c) since it only enables modifiers on newer HW. Something like "if (modifiers == NULL) fb_modifiers_not_supported = true;" in amdgpu_dm_plane_init. On Thu, Jan 13, 2022 at 10:44 AM Tomohito Esaki wrote: > > Set fb_modifiers_not_supported flag in legacy drivers whose planes > support non-linear layouts but does not support modifiers, and replace > allow_fb_modifiers with fb_modifiers_not_supported. > > Signed-off-by: Tomohito Esaki > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 6 +++--- > drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 2 ++ > drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 2 ++ > drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 1 + > drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 2 ++ > drivers/gpu/drm/nouveau/nouveau_display.c | 6 ++++-- > drivers/gpu/drm/radeon/radeon_display.c | 2 ++ > 7 files changed, 16 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c > index dc50c05f23fc..cbaea9c6cfda 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c > @@ -958,7 +958,7 @@ static int amdgpu_display_verify_sizes(struct amdgpu_framebuffer *rfb) > int ret; > unsigned int i, block_width, block_height, block_size_log2; > > - if (!rfb->base.dev->mode_config.allow_fb_modifiers) > + if (rfb->base.dev->mode_config.fb_modifiers_not_supported) > return 0; > > for (i = 0; i < format_info->num_planes; ++i) { > @@ -1145,7 +1145,7 @@ int amdgpu_display_framebuffer_init(struct drm_device *dev, > if (ret) > return ret; > > - if (!dev->mode_config.allow_fb_modifiers) { > + if (dev->mode_config.fb_modifiers_not_supported) { > drm_WARN_ONCE(dev, adev->family >= AMDGPU_FAMILY_AI, > "GFX9+ requires FB check based on format modifier\n"); > ret = check_tiling_flags_gfx6(rfb); > @@ -1153,7 +1153,7 @@ int amdgpu_display_framebuffer_init(struct drm_device *dev, > return ret; > } > > - if (dev->mode_config.allow_fb_modifiers && > + if (!dev->mode_config.fb_modifiers_not_supported && > !(rfb->base.flags & DRM_MODE_FB_MODIFIERS)) { > ret = convert_tiling_flags_to_modifier(rfb); > if (ret) { > diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c > index d1570a462a51..fb61c0814115 100644 > --- a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c > +++ b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c > @@ -2798,6 +2798,8 @@ static int dce_v10_0_sw_init(void *handle) > adev_to_drm(adev)->mode_config.preferred_depth = 24; > adev_to_drm(adev)->mode_config.prefer_shadow = 1; > > + adev_to_drm(adev)->mode_config.fb_modifiers_not_supported = true; > + > adev_to_drm(adev)->mode_config.fb_base = adev->gmc.aper_base; > > r = amdgpu_display_modeset_create_props(adev); > diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c > index 18a7b3bd633b..17942a11366d 100644 > --- a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c > +++ b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c > @@ -2916,6 +2916,8 @@ static int dce_v11_0_sw_init(void *handle) > adev_to_drm(adev)->mode_config.preferred_depth = 24; > adev_to_drm(adev)->mode_config.prefer_shadow = 1; > > + adev_to_drm(adev)->mode_config.fb_modifiers_not_supported = true; > + > adev_to_drm(adev)->mode_config.fb_base = adev->gmc.aper_base; > > r = amdgpu_display_modeset_create_props(adev); > diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c > index c7803dc2b2d5..2ec99ec8e1a3 100644 > --- a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c > +++ b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c > @@ -2674,6 +2674,7 @@ static int dce_v6_0_sw_init(void *handle) > adev_to_drm(adev)->mode_config.max_height = 16384; > adev_to_drm(adev)->mode_config.preferred_depth = 24; > adev_to_drm(adev)->mode_config.prefer_shadow = 1; > + adev_to_drm(adev)->mode_config.fb_modifiers_not_supported = true; > adev_to_drm(adev)->mode_config.fb_base = adev->gmc.aper_base; > > r = amdgpu_display_modeset_create_props(adev); > diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c > index b200b9e722d9..8369336cec90 100644 > --- a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c > +++ b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c > @@ -2699,6 +2699,8 @@ static int dce_v8_0_sw_init(void *handle) > adev_to_drm(adev)->mode_config.preferred_depth = 24; > adev_to_drm(adev)->mode_config.prefer_shadow = 1; > > + adev_to_drm(adev)->mode_config.fb_modifiers_not_supported = true; > + > adev_to_drm(adev)->mode_config.fb_base = adev->gmc.aper_base; > > r = amdgpu_display_modeset_create_props(adev); > diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c b/drivers/gpu/drm/nouveau/nouveau_display.c > index 929de41c281f..1ecad7fa3e8a 100644 > --- a/drivers/gpu/drm/nouveau/nouveau_display.c > +++ b/drivers/gpu/drm/nouveau/nouveau_display.c > @@ -711,10 +711,12 @@ nouveau_display_create(struct drm_device *dev) > &disp->disp); > if (ret == 0) { > nouveau_display_create_properties(dev); > - if (disp->disp.object.oclass < NV50_DISP) > + if (disp->disp.object.oclass < NV50_DISP) { > + dev->mode_config.fb_modifiers_not_supported = true; > ret = nv04_display_create(dev); > - else > + } else { > ret = nv50_display_create(dev); > + } > } > } else { > ret = 0; > diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c > index 573154268d43..b9a07677a71e 100644 > --- a/drivers/gpu/drm/radeon/radeon_display.c > +++ b/drivers/gpu/drm/radeon/radeon_display.c > @@ -1596,6 +1596,8 @@ int radeon_modeset_init(struct radeon_device *rdev) > rdev->ddev->mode_config.preferred_depth = 24; > rdev->ddev->mode_config.prefer_shadow = 1; > > + rdev->ddev->mode_config.fb_modifiers_not_supported = true; > + > rdev->ddev->mode_config.fb_base = rdev->mc.aper_base; > > ret = radeon_modeset_create_props(rdev); > -- > 2.25.1 > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 97F9AC433EF for ; Thu, 13 Jan 2022 17:56:29 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5E40210E52B; Thu, 13 Jan 2022 17:56:28 +0000 (UTC) Received: from mail-yb1-xb2b.google.com (mail-yb1-xb2b.google.com [IPv6:2607:f8b0:4864:20::b2b]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7266510E4E3 for ; Thu, 13 Jan 2022 17:56:27 +0000 (UTC) Received: by mail-yb1-xb2b.google.com with SMTP id d7so17305810ybo.5 for ; Thu, 13 Jan 2022 09:56:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=basnieuwenhuizen.nl; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=NdER3tWel4lE2/IoeEHZfK62RzxAAdC/S8e3rQxeHZA=; b=QqKneNMQj4ZBTtbPRfxOzT7S0JJTSi1VXQyb1h0OwmrazhZmAY9eGs8Jdl48biORhS khpRxv8ZdQQXcw/97mnlQ5sYhTq0Z6rXlw8DolwUXAvENLMJOQPhKu457fArQpLQ6FSY lVpbLszp8ZE7myFULL7HPZYWWalDnTFXsObJdmXxt8f7C5GWond7c/SODUIIw8su+C2A e/sT9FfwJu37VzhLSbhFnfH7fS41HLQ0IdR1bhXhdReexQK0214ADbSSA/htnuG1ImE2 d1AEtMD0JGVtz34tpAJRc3rHDWemUsqXa/g6qy8YNa6WMaaeaiaqpS2D23UAkINVsAyZ 7lwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=NdER3tWel4lE2/IoeEHZfK62RzxAAdC/S8e3rQxeHZA=; b=BLdSyhMgQM0fNLmZCRop95Ixuwl7aR1NDPoc3eA/e0hfWuFB7EdrV2U3j9LGBXab0o RxsRYxHSCqcWsNrsKvCoNz45NiEovCKce0zxL6mGLvSLmimmHX58hIGsGcHEOCK+QMs1 aD4CKEH1aBeG0YTHayCa+z0tarMFL4TxoSiEZ5nqJ88Oo5oLAIqky0yqQM/0MXi1BvpJ 8+Vy1fyLuD2occ9ZjKN4nIzsm9PMey9xZKQdYGh2y6N+BmioE4dg5QpMAUKJqHPR5djQ rN1Nu9YhFbIUXEFz0aaaSXqXGllSBUOQbPJSymQgSRIYPSw1+MBWQcXeXZAYGGROZFRr KpfQ== X-Gm-Message-State: AOAM530vtw4HknN0PBZs5xNA0XNvZYJmt1iPd9SAfAxsPUMXEZ8LvVdy 3/UoxZHk9kTBCWdAbX40lqBK1Ck5Gpv3xgypa3Az9w== X-Google-Smtp-Source: ABdhPJz0n/brLEOsHB+4ty1kzSaUXFZiYF0zQd6450hq8J/b6AU/fn8nOe1GrP4fr+eT/3DR8+r7QcZLTYifVj2lHPg= X-Received: by 2002:a25:50d8:: with SMTP id e207mr7592797ybb.150.1642096586381; Thu, 13 Jan 2022 09:56:26 -0800 (PST) MIME-Version: 1.0 References: <20220113094419.12433-1-etom@igel.co.jp> <20220113094419.12433-3-etom@igel.co.jp> In-Reply-To: <20220113094419.12433-3-etom@igel.co.jp> From: Bas Nieuwenhuizen Date: Thu, 13 Jan 2022 18:56:18 +0100 Message-ID: Subject: Re: [RFC PATCH v2 2/3] drm: set fb_modifiers_not_supported flag in legacy drivers To: Tomohito Esaki Content-Type: text/plain; charset="UTF-8" X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , nouveau@lists.freedesktop.org, ML dri-devel , =?UTF-8?Q?Michel_D=C3=A4nzer?= , Lee Jones , Rob Clark , Evan Quan , amd-gfx mailing list , Ben Skeggs , Petr Mladek , Sakari Ailus , Abhinav Kumar , Alex Deucher , Takanari Hayama , Sean Paul , Andy Shevchenko , Qingqing Zhuo , "Pan, Xinhui" , LKML , Thomas Zimmermann , Mark Yacoub , Dmitry Baryshkov , Damian Hobson-Garcia , =?UTF-8?Q?Christian_K=C3=B6nig?= , Laurent Pinchart Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" I think we'll also want to do a conditional disable for DC (drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c) since it only enables modifiers on newer HW. Something like "if (modifiers == NULL) fb_modifiers_not_supported = true;" in amdgpu_dm_plane_init. On Thu, Jan 13, 2022 at 10:44 AM Tomohito Esaki wrote: > > Set fb_modifiers_not_supported flag in legacy drivers whose planes > support non-linear layouts but does not support modifiers, and replace > allow_fb_modifiers with fb_modifiers_not_supported. > > Signed-off-by: Tomohito Esaki > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 6 +++--- > drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 2 ++ > drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 2 ++ > drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 1 + > drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 2 ++ > drivers/gpu/drm/nouveau/nouveau_display.c | 6 ++++-- > drivers/gpu/drm/radeon/radeon_display.c | 2 ++ > 7 files changed, 16 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c > index dc50c05f23fc..cbaea9c6cfda 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c > @@ -958,7 +958,7 @@ static int amdgpu_display_verify_sizes(struct amdgpu_framebuffer *rfb) > int ret; > unsigned int i, block_width, block_height, block_size_log2; > > - if (!rfb->base.dev->mode_config.allow_fb_modifiers) > + if (rfb->base.dev->mode_config.fb_modifiers_not_supported) > return 0; > > for (i = 0; i < format_info->num_planes; ++i) { > @@ -1145,7 +1145,7 @@ int amdgpu_display_framebuffer_init(struct drm_device *dev, > if (ret) > return ret; > > - if (!dev->mode_config.allow_fb_modifiers) { > + if (dev->mode_config.fb_modifiers_not_supported) { > drm_WARN_ONCE(dev, adev->family >= AMDGPU_FAMILY_AI, > "GFX9+ requires FB check based on format modifier\n"); > ret = check_tiling_flags_gfx6(rfb); > @@ -1153,7 +1153,7 @@ int amdgpu_display_framebuffer_init(struct drm_device *dev, > return ret; > } > > - if (dev->mode_config.allow_fb_modifiers && > + if (!dev->mode_config.fb_modifiers_not_supported && > !(rfb->base.flags & DRM_MODE_FB_MODIFIERS)) { > ret = convert_tiling_flags_to_modifier(rfb); > if (ret) { > diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c > index d1570a462a51..fb61c0814115 100644 > --- a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c > +++ b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c > @@ -2798,6 +2798,8 @@ static int dce_v10_0_sw_init(void *handle) > adev_to_drm(adev)->mode_config.preferred_depth = 24; > adev_to_drm(adev)->mode_config.prefer_shadow = 1; > > + adev_to_drm(adev)->mode_config.fb_modifiers_not_supported = true; > + > adev_to_drm(adev)->mode_config.fb_base = adev->gmc.aper_base; > > r = amdgpu_display_modeset_create_props(adev); > diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c > index 18a7b3bd633b..17942a11366d 100644 > --- a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c > +++ b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c > @@ -2916,6 +2916,8 @@ static int dce_v11_0_sw_init(void *handle) > adev_to_drm(adev)->mode_config.preferred_depth = 24; > adev_to_drm(adev)->mode_config.prefer_shadow = 1; > > + adev_to_drm(adev)->mode_config.fb_modifiers_not_supported = true; > + > adev_to_drm(adev)->mode_config.fb_base = adev->gmc.aper_base; > > r = amdgpu_display_modeset_create_props(adev); > diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c > index c7803dc2b2d5..2ec99ec8e1a3 100644 > --- a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c > +++ b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c > @@ -2674,6 +2674,7 @@ static int dce_v6_0_sw_init(void *handle) > adev_to_drm(adev)->mode_config.max_height = 16384; > adev_to_drm(adev)->mode_config.preferred_depth = 24; > adev_to_drm(adev)->mode_config.prefer_shadow = 1; > + adev_to_drm(adev)->mode_config.fb_modifiers_not_supported = true; > adev_to_drm(adev)->mode_config.fb_base = adev->gmc.aper_base; > > r = amdgpu_display_modeset_create_props(adev); > diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c > index b200b9e722d9..8369336cec90 100644 > --- a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c > +++ b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c > @@ -2699,6 +2699,8 @@ static int dce_v8_0_sw_init(void *handle) > adev_to_drm(adev)->mode_config.preferred_depth = 24; > adev_to_drm(adev)->mode_config.prefer_shadow = 1; > > + adev_to_drm(adev)->mode_config.fb_modifiers_not_supported = true; > + > adev_to_drm(adev)->mode_config.fb_base = adev->gmc.aper_base; > > r = amdgpu_display_modeset_create_props(adev); > diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c b/drivers/gpu/drm/nouveau/nouveau_display.c > index 929de41c281f..1ecad7fa3e8a 100644 > --- a/drivers/gpu/drm/nouveau/nouveau_display.c > +++ b/drivers/gpu/drm/nouveau/nouveau_display.c > @@ -711,10 +711,12 @@ nouveau_display_create(struct drm_device *dev) > &disp->disp); > if (ret == 0) { > nouveau_display_create_properties(dev); > - if (disp->disp.object.oclass < NV50_DISP) > + if (disp->disp.object.oclass < NV50_DISP) { > + dev->mode_config.fb_modifiers_not_supported = true; > ret = nv04_display_create(dev); > - else > + } else { > ret = nv50_display_create(dev); > + } > } > } else { > ret = 0; > diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c > index 573154268d43..b9a07677a71e 100644 > --- a/drivers/gpu/drm/radeon/radeon_display.c > +++ b/drivers/gpu/drm/radeon/radeon_display.c > @@ -1596,6 +1596,8 @@ int radeon_modeset_init(struct radeon_device *rdev) > rdev->ddev->mode_config.preferred_depth = 24; > rdev->ddev->mode_config.prefer_shadow = 1; > > + rdev->ddev->mode_config.fb_modifiers_not_supported = true; > + > rdev->ddev->mode_config.fb_base = rdev->mc.aper_base; > > ret = radeon_modeset_create_props(rdev); > -- > 2.25.1 > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C486DC433F5 for ; Thu, 13 Jan 2022 17:56:28 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 436B610E528; Thu, 13 Jan 2022 17:56:28 +0000 (UTC) Received: from mail-yb1-xb30.google.com (mail-yb1-xb30.google.com [IPv6:2607:f8b0:4864:20::b30]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5A3D810E52B for ; Thu, 13 Jan 2022 17:56:27 +0000 (UTC) Received: by mail-yb1-xb30.google.com with SMTP id v186so17366893ybg.1 for ; Thu, 13 Jan 2022 09:56:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=basnieuwenhuizen.nl; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=NdER3tWel4lE2/IoeEHZfK62RzxAAdC/S8e3rQxeHZA=; b=QqKneNMQj4ZBTtbPRfxOzT7S0JJTSi1VXQyb1h0OwmrazhZmAY9eGs8Jdl48biORhS khpRxv8ZdQQXcw/97mnlQ5sYhTq0Z6rXlw8DolwUXAvENLMJOQPhKu457fArQpLQ6FSY lVpbLszp8ZE7myFULL7HPZYWWalDnTFXsObJdmXxt8f7C5GWond7c/SODUIIw8su+C2A e/sT9FfwJu37VzhLSbhFnfH7fS41HLQ0IdR1bhXhdReexQK0214ADbSSA/htnuG1ImE2 d1AEtMD0JGVtz34tpAJRc3rHDWemUsqXa/g6qy8YNa6WMaaeaiaqpS2D23UAkINVsAyZ 7lwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=NdER3tWel4lE2/IoeEHZfK62RzxAAdC/S8e3rQxeHZA=; b=uZqly/qiE8FsRVUD3kYV9j7BYiiHTmFs1WeBdVfXL6OkluvgHLw6U/5L7iWn7drRsW zdbzqMWsLcn+kP0ofr/8M7vIyoTi3LKoDzbtohZZnKjEaLX0vsHuuNrIqJ8LR180LLJJ sAkBFTTJpxMLP5+zQFzGKz2Wg9a29gdjxDatAngS5POHrKwNZkC1sWGUwocHNssDEebs ia0UALqprWTJP0UorTaoJtJkKmT2zOvCAr5mtspYPl4pKioJ9rvniKcUq0vZ1pluPdhi GGxQ13F3FvfA9KimstQHyJaKLGeqjF/3HI2z5brgwhe6hvLECkIRt5Y8b12Uvv/j9N3i gqQQ== X-Gm-Message-State: AOAM531KbbHI+GfiVG8+Ybblb1s8Ig9kuAITkUDZwl84UCJ1DkbrCqv7 LUbF0GZ8p2vEAJflwx0WmlxRPzVzdVuTHZz1cxlXrg== X-Google-Smtp-Source: ABdhPJz0n/brLEOsHB+4ty1kzSaUXFZiYF0zQd6450hq8J/b6AU/fn8nOe1GrP4fr+eT/3DR8+r7QcZLTYifVj2lHPg= X-Received: by 2002:a25:50d8:: with SMTP id e207mr7592797ybb.150.1642096586381; Thu, 13 Jan 2022 09:56:26 -0800 (PST) MIME-Version: 1.0 References: <20220113094419.12433-1-etom@igel.co.jp> <20220113094419.12433-3-etom@igel.co.jp> In-Reply-To: <20220113094419.12433-3-etom@igel.co.jp> From: Bas Nieuwenhuizen Date: Thu, 13 Jan 2022 18:56:18 +0100 Message-ID: Subject: Re: [RFC PATCH v2 2/3] drm: set fb_modifiers_not_supported flag in legacy drivers To: Tomohito Esaki Content-Type: text/plain; charset="UTF-8" X-BeenThere: amd-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , nouveau@lists.freedesktop.org, ML dri-devel , =?UTF-8?Q?Michel_D=C3=A4nzer?= , Daniel Stone , Lee Jones , Rob Clark , Evan Quan , amd-gfx mailing list , Ben Skeggs , Petr Mladek , Sakari Ailus , Maarten Lankhorst , Abhinav Kumar , Alex Deucher , Takanari Hayama , Sean Paul , Maxime Ripard , Daniel Vetter , Andy Shevchenko , Simon Ser , Qingqing Zhuo , "Pan, Xinhui" , LKML , Thomas Zimmermann , Mark Yacoub , Dmitry Baryshkov , Damian Hobson-Garcia , =?UTF-8?Q?Christian_K=C3=B6nig?= , Laurent Pinchart Errors-To: amd-gfx-bounces@lists.freedesktop.org Sender: "amd-gfx" I think we'll also want to do a conditional disable for DC (drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c) since it only enables modifiers on newer HW. Something like "if (modifiers == NULL) fb_modifiers_not_supported = true;" in amdgpu_dm_plane_init. On Thu, Jan 13, 2022 at 10:44 AM Tomohito Esaki wrote: > > Set fb_modifiers_not_supported flag in legacy drivers whose planes > support non-linear layouts but does not support modifiers, and replace > allow_fb_modifiers with fb_modifiers_not_supported. > > Signed-off-by: Tomohito Esaki > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 6 +++--- > drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 2 ++ > drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 2 ++ > drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 1 + > drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 2 ++ > drivers/gpu/drm/nouveau/nouveau_display.c | 6 ++++-- > drivers/gpu/drm/radeon/radeon_display.c | 2 ++ > 7 files changed, 16 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c > index dc50c05f23fc..cbaea9c6cfda 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c > @@ -958,7 +958,7 @@ static int amdgpu_display_verify_sizes(struct amdgpu_framebuffer *rfb) > int ret; > unsigned int i, block_width, block_height, block_size_log2; > > - if (!rfb->base.dev->mode_config.allow_fb_modifiers) > + if (rfb->base.dev->mode_config.fb_modifiers_not_supported) > return 0; > > for (i = 0; i < format_info->num_planes; ++i) { > @@ -1145,7 +1145,7 @@ int amdgpu_display_framebuffer_init(struct drm_device *dev, > if (ret) > return ret; > > - if (!dev->mode_config.allow_fb_modifiers) { > + if (dev->mode_config.fb_modifiers_not_supported) { > drm_WARN_ONCE(dev, adev->family >= AMDGPU_FAMILY_AI, > "GFX9+ requires FB check based on format modifier\n"); > ret = check_tiling_flags_gfx6(rfb); > @@ -1153,7 +1153,7 @@ int amdgpu_display_framebuffer_init(struct drm_device *dev, > return ret; > } > > - if (dev->mode_config.allow_fb_modifiers && > + if (!dev->mode_config.fb_modifiers_not_supported && > !(rfb->base.flags & DRM_MODE_FB_MODIFIERS)) { > ret = convert_tiling_flags_to_modifier(rfb); > if (ret) { > diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c > index d1570a462a51..fb61c0814115 100644 > --- a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c > +++ b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c > @@ -2798,6 +2798,8 @@ static int dce_v10_0_sw_init(void *handle) > adev_to_drm(adev)->mode_config.preferred_depth = 24; > adev_to_drm(adev)->mode_config.prefer_shadow = 1; > > + adev_to_drm(adev)->mode_config.fb_modifiers_not_supported = true; > + > adev_to_drm(adev)->mode_config.fb_base = adev->gmc.aper_base; > > r = amdgpu_display_modeset_create_props(adev); > diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c > index 18a7b3bd633b..17942a11366d 100644 > --- a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c > +++ b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c > @@ -2916,6 +2916,8 @@ static int dce_v11_0_sw_init(void *handle) > adev_to_drm(adev)->mode_config.preferred_depth = 24; > adev_to_drm(adev)->mode_config.prefer_shadow = 1; > > + adev_to_drm(adev)->mode_config.fb_modifiers_not_supported = true; > + > adev_to_drm(adev)->mode_config.fb_base = adev->gmc.aper_base; > > r = amdgpu_display_modeset_create_props(adev); > diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c > index c7803dc2b2d5..2ec99ec8e1a3 100644 > --- a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c > +++ b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c > @@ -2674,6 +2674,7 @@ static int dce_v6_0_sw_init(void *handle) > adev_to_drm(adev)->mode_config.max_height = 16384; > adev_to_drm(adev)->mode_config.preferred_depth = 24; > adev_to_drm(adev)->mode_config.prefer_shadow = 1; > + adev_to_drm(adev)->mode_config.fb_modifiers_not_supported = true; > adev_to_drm(adev)->mode_config.fb_base = adev->gmc.aper_base; > > r = amdgpu_display_modeset_create_props(adev); > diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c > index b200b9e722d9..8369336cec90 100644 > --- a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c > +++ b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c > @@ -2699,6 +2699,8 @@ static int dce_v8_0_sw_init(void *handle) > adev_to_drm(adev)->mode_config.preferred_depth = 24; > adev_to_drm(adev)->mode_config.prefer_shadow = 1; > > + adev_to_drm(adev)->mode_config.fb_modifiers_not_supported = true; > + > adev_to_drm(adev)->mode_config.fb_base = adev->gmc.aper_base; > > r = amdgpu_display_modeset_create_props(adev); > diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c b/drivers/gpu/drm/nouveau/nouveau_display.c > index 929de41c281f..1ecad7fa3e8a 100644 > --- a/drivers/gpu/drm/nouveau/nouveau_display.c > +++ b/drivers/gpu/drm/nouveau/nouveau_display.c > @@ -711,10 +711,12 @@ nouveau_display_create(struct drm_device *dev) > &disp->disp); > if (ret == 0) { > nouveau_display_create_properties(dev); > - if (disp->disp.object.oclass < NV50_DISP) > + if (disp->disp.object.oclass < NV50_DISP) { > + dev->mode_config.fb_modifiers_not_supported = true; > ret = nv04_display_create(dev); > - else > + } else { > ret = nv50_display_create(dev); > + } > } > } else { > ret = 0; > diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c > index 573154268d43..b9a07677a71e 100644 > --- a/drivers/gpu/drm/radeon/radeon_display.c > +++ b/drivers/gpu/drm/radeon/radeon_display.c > @@ -1596,6 +1596,8 @@ int radeon_modeset_init(struct radeon_device *rdev) > rdev->ddev->mode_config.preferred_depth = 24; > rdev->ddev->mode_config.prefer_shadow = 1; > > + rdev->ddev->mode_config.fb_modifiers_not_supported = true; > + > rdev->ddev->mode_config.fb_base = rdev->mc.aper_base; > > ret = radeon_modeset_create_props(rdev); > -- > 2.25.1 > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 06A52C433F5 for ; Fri, 14 Jan 2022 18:43:56 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7BB6D10E240; Fri, 14 Jan 2022 18:43:41 +0000 (UTC) Received: from mail-yb1-xb2a.google.com (mail-yb1-xb2a.google.com [IPv6:2607:f8b0:4864:20::b2a]) by gabe.freedesktop.org (Postfix) with ESMTPS id 595F310E528 for ; Thu, 13 Jan 2022 17:56:27 +0000 (UTC) Received: by mail-yb1-xb2a.google.com with SMTP id c6so17336593ybk.3 for ; Thu, 13 Jan 2022 09:56:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=basnieuwenhuizen.nl; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=NdER3tWel4lE2/IoeEHZfK62RzxAAdC/S8e3rQxeHZA=; b=QqKneNMQj4ZBTtbPRfxOzT7S0JJTSi1VXQyb1h0OwmrazhZmAY9eGs8Jdl48biORhS khpRxv8ZdQQXcw/97mnlQ5sYhTq0Z6rXlw8DolwUXAvENLMJOQPhKu457fArQpLQ6FSY lVpbLszp8ZE7myFULL7HPZYWWalDnTFXsObJdmXxt8f7C5GWond7c/SODUIIw8su+C2A e/sT9FfwJu37VzhLSbhFnfH7fS41HLQ0IdR1bhXhdReexQK0214ADbSSA/htnuG1ImE2 d1AEtMD0JGVtz34tpAJRc3rHDWemUsqXa/g6qy8YNa6WMaaeaiaqpS2D23UAkINVsAyZ 7lwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=NdER3tWel4lE2/IoeEHZfK62RzxAAdC/S8e3rQxeHZA=; b=Odn1xRdq1UspD33YrJQBeIu2BicykxJJ9Df174M/jxINdLSq6O8TDz9b0/CRXZx7bx hrfgUds+zPtQLOQJFp8JOiBRCp/Mw6DtR9+czALfm04eIAEZkj0MPhdrF/nToCSx5e2j uZVlHbRAgK0f8eMCHoILoD9wUpuLYvzA8m6qvvT+vYpewyGz8Jps53j/CyqVu+DP3oEi poNg/LNLlYnVgYLmSak6ZmRL5gudcfyU1vs1yKTnlzFgmNivPSS1+mmmBWshXXLGZm7/ HtRanBg8k2AIroftCVI152/erk2CSFgfyay7j6WW+bHGrcv7K+M6ZXbgF4ltL6G5jRk0 1ObQ== X-Gm-Message-State: AOAM532Z5+EwfODkINr93S74cDZq+Ek09NMaEJLGr3Tii1Zq00toukE0 fkLsUB08FKwPfXd5qrYSkypSwdP1gsIckp/jNtW3WQ== X-Google-Smtp-Source: ABdhPJz0n/brLEOsHB+4ty1kzSaUXFZiYF0zQd6450hq8J/b6AU/fn8nOe1GrP4fr+eT/3DR8+r7QcZLTYifVj2lHPg= X-Received: by 2002:a25:50d8:: with SMTP id e207mr7592797ybb.150.1642096586381; Thu, 13 Jan 2022 09:56:26 -0800 (PST) MIME-Version: 1.0 References: <20220113094419.12433-1-etom@igel.co.jp> <20220113094419.12433-3-etom@igel.co.jp> In-Reply-To: <20220113094419.12433-3-etom@igel.co.jp> From: Bas Nieuwenhuizen Date: Thu, 13 Jan 2022 18:56:18 +0100 Message-ID: To: Tomohito Esaki Content-Type: text/plain; charset="UTF-8" X-Mailman-Approved-At: Fri, 14 Jan 2022 18:43:39 +0000 Subject: Re: [Nouveau] [RFC PATCH v2 2/3] drm: set fb_modifiers_not_supported flag in legacy drivers X-BeenThere: nouveau@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Nouveau development list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , nouveau@lists.freedesktop.org, ML dri-devel , =?UTF-8?Q?Michel_D=C3=A4nzer?= , Daniel Stone , Lee Jones , Rob Clark , Evan Quan , amd-gfx mailing list , Ben Skeggs , Petr Mladek , Sakari Ailus , Maarten Lankhorst , Abhinav Kumar , Alex Deucher , Takanari Hayama , Sean Paul , Maxime Ripard , Daniel Vetter , Andy Shevchenko , Simon Ser , Qingqing Zhuo , "Pan, Xinhui" , LKML , Mark Yacoub , Dmitry Baryshkov , Damian Hobson-Garcia , =?UTF-8?Q?Christian_K=C3=B6nig?= , Laurent Pinchart Errors-To: nouveau-bounces@lists.freedesktop.org Sender: "Nouveau" I think we'll also want to do a conditional disable for DC (drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c) since it only enables modifiers on newer HW. Something like "if (modifiers == NULL) fb_modifiers_not_supported = true;" in amdgpu_dm_plane_init. On Thu, Jan 13, 2022 at 10:44 AM Tomohito Esaki wrote: > > Set fb_modifiers_not_supported flag in legacy drivers whose planes > support non-linear layouts but does not support modifiers, and replace > allow_fb_modifiers with fb_modifiers_not_supported. > > Signed-off-by: Tomohito Esaki > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 6 +++--- > drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 2 ++ > drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 2 ++ > drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 1 + > drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 2 ++ > drivers/gpu/drm/nouveau/nouveau_display.c | 6 ++++-- > drivers/gpu/drm/radeon/radeon_display.c | 2 ++ > 7 files changed, 16 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c > index dc50c05f23fc..cbaea9c6cfda 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c > @@ -958,7 +958,7 @@ static int amdgpu_display_verify_sizes(struct amdgpu_framebuffer *rfb) > int ret; > unsigned int i, block_width, block_height, block_size_log2; > > - if (!rfb->base.dev->mode_config.allow_fb_modifiers) > + if (rfb->base.dev->mode_config.fb_modifiers_not_supported) > return 0; > > for (i = 0; i < format_info->num_planes; ++i) { > @@ -1145,7 +1145,7 @@ int amdgpu_display_framebuffer_init(struct drm_device *dev, > if (ret) > return ret; > > - if (!dev->mode_config.allow_fb_modifiers) { > + if (dev->mode_config.fb_modifiers_not_supported) { > drm_WARN_ONCE(dev, adev->family >= AMDGPU_FAMILY_AI, > "GFX9+ requires FB check based on format modifier\n"); > ret = check_tiling_flags_gfx6(rfb); > @@ -1153,7 +1153,7 @@ int amdgpu_display_framebuffer_init(struct drm_device *dev, > return ret; > } > > - if (dev->mode_config.allow_fb_modifiers && > + if (!dev->mode_config.fb_modifiers_not_supported && > !(rfb->base.flags & DRM_MODE_FB_MODIFIERS)) { > ret = convert_tiling_flags_to_modifier(rfb); > if (ret) { > diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c > index d1570a462a51..fb61c0814115 100644 > --- a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c > +++ b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c > @@ -2798,6 +2798,8 @@ static int dce_v10_0_sw_init(void *handle) > adev_to_drm(adev)->mode_config.preferred_depth = 24; > adev_to_drm(adev)->mode_config.prefer_shadow = 1; > > + adev_to_drm(adev)->mode_config.fb_modifiers_not_supported = true; > + > adev_to_drm(adev)->mode_config.fb_base = adev->gmc.aper_base; > > r = amdgpu_display_modeset_create_props(adev); > diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c > index 18a7b3bd633b..17942a11366d 100644 > --- a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c > +++ b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c > @@ -2916,6 +2916,8 @@ static int dce_v11_0_sw_init(void *handle) > adev_to_drm(adev)->mode_config.preferred_depth = 24; > adev_to_drm(adev)->mode_config.prefer_shadow = 1; > > + adev_to_drm(adev)->mode_config.fb_modifiers_not_supported = true; > + > adev_to_drm(adev)->mode_config.fb_base = adev->gmc.aper_base; > > r = amdgpu_display_modeset_create_props(adev); > diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c > index c7803dc2b2d5..2ec99ec8e1a3 100644 > --- a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c > +++ b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c > @@ -2674,6 +2674,7 @@ static int dce_v6_0_sw_init(void *handle) > adev_to_drm(adev)->mode_config.max_height = 16384; > adev_to_drm(adev)->mode_config.preferred_depth = 24; > adev_to_drm(adev)->mode_config.prefer_shadow = 1; > + adev_to_drm(adev)->mode_config.fb_modifiers_not_supported = true; > adev_to_drm(adev)->mode_config.fb_base = adev->gmc.aper_base; > > r = amdgpu_display_modeset_create_props(adev); > diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c > index b200b9e722d9..8369336cec90 100644 > --- a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c > +++ b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c > @@ -2699,6 +2699,8 @@ static int dce_v8_0_sw_init(void *handle) > adev_to_drm(adev)->mode_config.preferred_depth = 24; > adev_to_drm(adev)->mode_config.prefer_shadow = 1; > > + adev_to_drm(adev)->mode_config.fb_modifiers_not_supported = true; > + > adev_to_drm(adev)->mode_config.fb_base = adev->gmc.aper_base; > > r = amdgpu_display_modeset_create_props(adev); > diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c b/drivers/gpu/drm/nouveau/nouveau_display.c > index 929de41c281f..1ecad7fa3e8a 100644 > --- a/drivers/gpu/drm/nouveau/nouveau_display.c > +++ b/drivers/gpu/drm/nouveau/nouveau_display.c > @@ -711,10 +711,12 @@ nouveau_display_create(struct drm_device *dev) > &disp->disp); > if (ret == 0) { > nouveau_display_create_properties(dev); > - if (disp->disp.object.oclass < NV50_DISP) > + if (disp->disp.object.oclass < NV50_DISP) { > + dev->mode_config.fb_modifiers_not_supported = true; > ret = nv04_display_create(dev); > - else > + } else { > ret = nv50_display_create(dev); > + } > } > } else { > ret = 0; > diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c > index 573154268d43..b9a07677a71e 100644 > --- a/drivers/gpu/drm/radeon/radeon_display.c > +++ b/drivers/gpu/drm/radeon/radeon_display.c > @@ -1596,6 +1596,8 @@ int radeon_modeset_init(struct radeon_device *rdev) > rdev->ddev->mode_config.preferred_depth = 24; > rdev->ddev->mode_config.prefer_shadow = 1; > > + rdev->ddev->mode_config.fb_modifiers_not_supported = true; > + > rdev->ddev->mode_config.fb_base = rdev->mc.aper_base; > > ret = radeon_modeset_create_props(rdev); > -- > 2.25.1 >