From nobody Wed Jul 1 18:55:48 2026 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 B882BC433F5 for ; Tue, 18 Jan 2022 08:37:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344529AbiARIh0 (ORCPT ); Tue, 18 Jan 2022 03:37:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59686 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344515AbiARIhR (ORCPT ); Tue, 18 Jan 2022 03:37:17 -0500 Received: from mail-pf1-x432.google.com (mail-pf1-x432.google.com [IPv6:2607:f8b0:4864:20::432]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D25ACC061574 for ; Tue, 18 Jan 2022 00:37:16 -0800 (PST) Received: by mail-pf1-x432.google.com with SMTP id i129so12432576pfe.13 for ; Tue, 18 Jan 2022 00:37:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=igel-co-jp.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1m4kFgH6652R1lZQ4Zc1MR0lzqI4ggpb+GNI68K62OE=; b=TeBSd0tjlFoC64i8PGLXXbqTHRdJXqKEiSA/aa8qHEleLvgy9NlDOGAX9OxnyqxfxG z/YWEfiM5jZjyHzxnSz+8t1Ccb8LQBDnZzZIFhx2YYKokjlUQWRe6Z7WSd6uPrm8yuPq +VJi3QXVXyCA9Sd/lDo0MwkKKdtemgQXFeH+XAbxMZu5xuyHG7WL83isF31bbd0m/1My IaCRi+TJILfeID01U80dOKG38SwRYDFR/SRVHJO453AcIKKnjVASqmY1hs8mClZu5xuG YMZ2azHue7ln2jsWYfCmClj26LnoDNeDf+Qz3fW/affbRvzgwgBKMs4UmHrXmiyYHf/a aV3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1m4kFgH6652R1lZQ4Zc1MR0lzqI4ggpb+GNI68K62OE=; b=DQjBG9FQzUcZM4/SDVMKKuYedGsJakRd8xZYf83VHv2acAj/aTiaCZgcw51RPA0nCf owJ9k0D8RByNP6PHtKqojnFPog02wk3WW4NM8ClXU88wDgl3wFbFZWpt5tIO1TbbKfZ9 EUP/aJcyWL6U/CxuIK8qDR1bU2uPUrv7ln0JqkYG0bhzW5Zmn7DpJnF7nV2+BRmQlSfL zbqE7AtRx66DkaZmD30YMzCPj0bM9jGGDH3FvTeNRMXpuEXClxkMDbGlPxbIuJPaSjH3 R084gQAfhqWJMkBKmCLT6ffAiKuV0JEEKmWRlDldgQmeqaxZQZaJT++lEKOWUeyuGmPk /rtQ== X-Gm-Message-State: AOAM530H7GF1QB1f+16LP0F0mfrHhBiSuHmGrKfULMTzcKyMQ+HK6zSB hBC0g+eLoI/qjMFnVfHOEmYUtg== X-Google-Smtp-Source: ABdhPJxB+U2fnjTc0PCTdTHo8G5msbvf0djaj5jDFV7g4JQvt3GBjnJev67wXJOK/bsHCTgE/Mm/OA== X-Received: by 2002:a63:3e81:: with SMTP id l123mr22568393pga.41.1642495036334; Tue, 18 Jan 2022 00:37:16 -0800 (PST) Received: from aqua.hq.igel.co.jp (napt.igel.co.jp. [219.106.231.132]) by smtp.gmail.com with ESMTPSA id c6sm1775615pjo.39.2022.01.18.00.37.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Jan 2022 00:37:15 -0800 (PST) From: Tomohito Esaki To: dri-devel@lists.freedesktop.org Cc: Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , "Pan, Xinhui" , David Airlie , Daniel Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Ben Skeggs , =?UTF-8?q?Michel=20D=C3=A4nzer?= , Simon Ser , Qingqing Zhuo , Bas Nieuwenhuizen , Mark Yacoub , Sean Paul , Evan Quan , Andy Shevchenko , Petr Mladek , Sakari Ailus , Lee Jones , Abhinav Kumar , Dmitry Baryshkov , Rob Clark , amd-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, nouveau@lists.freedesktop.org, Daniel Stone , Laurent Pinchart , Tomohito Esaki , Damian Hobson-Garcia , Takanari Hayama Subject: [RFC PATCH v4 1/3] drm: introduce fb_modifiers_not_supported flag in mode_config Date: Tue, 18 Jan 2022 17:36:50 +0900 Message-Id: <20220118083652.16335-2-etom@igel.co.jp> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220118083652.16335-1-etom@igel.co.jp> References: <20220118083652.16335-1-etom@igel.co.jp> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" If only linear modifier is advertised, since there are many drivers that only linear supported, the DRM core should handle this rather than open-coding in every driver. However, there are legacy drivers such as radeon that do not support modifiers but infer the actual layout of the underlying buffer. Therefore, a new flag fb_modifiers_not_supported is introduced for these legacy drivers, and allow_fb_modifiers is replaced with this new flag. 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/amd/display/amdgpu_dm/amdgpu_dm.c | 3 +++ drivers/gpu/drm/drm_framebuffer.c | 6 +++--- drivers/gpu/drm/drm_ioctl.c | 2 +- drivers/gpu/drm/nouveau/nouveau_display.c | 6 ++++-- drivers/gpu/drm/radeon/radeon_display.c | 2 ++ include/drm/drm_mode_config.h | 10 ++++++++++ 11 files changed, 33 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c b/drivers/gpu/drm/= amd/amdgpu/amdgpu_display.c index 82011e75ed85..edbb30d47b8c 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c @@ -954,7 +954,7 @@ static int amdgpu_display_verify_sizes(struct amdgpu_fr= amebuffer *rfb) int ret; unsigned int i, block_width, block_height, block_size_log2; =20 - if (!rfb->base.dev->mode_config.allow_fb_modifiers) + if (rfb->base.dev->mode_config.fb_modifiers_not_supported) return 0; =20 for (i =3D 0; i < format_info->num_planes; ++i) { @@ -1141,7 +1141,7 @@ int amdgpu_display_framebuffer_init(struct drm_device= *dev, if (ret) return ret; =20 - if (!dev->mode_config.allow_fb_modifiers) { + if (dev->mode_config.fb_modifiers_not_supported) { drm_WARN_ONCE(dev, adev->family >=3D AMDGPU_FAMILY_AI, "GFX9+ requires FB check based on format modifier\n"); ret =3D check_tiling_flags_gfx6(rfb); @@ -1149,7 +1149,7 @@ int amdgpu_display_framebuffer_init(struct drm_device= *dev, return ret; } =20 - if (dev->mode_config.allow_fb_modifiers && + if (!dev->mode_config.fb_modifiers_not_supported && !(rfb->base.flags & DRM_MODE_FB_MODIFIERS)) { ret =3D 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/a= mdgpu/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 =3D 24; adev_to_drm(adev)->mode_config.prefer_shadow =3D 1; =20 + adev_to_drm(adev)->mode_config.fb_modifiers_not_supported =3D true; + adev_to_drm(adev)->mode_config.fb_base =3D adev->gmc.aper_base; =20 r =3D amdgpu_display_modeset_create_props(adev); diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c b/drivers/gpu/drm/amd/a= mdgpu/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 =3D 24; adev_to_drm(adev)->mode_config.prefer_shadow =3D 1; =20 + adev_to_drm(adev)->mode_config.fb_modifiers_not_supported =3D true; + adev_to_drm(adev)->mode_config.fb_base =3D adev->gmc.aper_base; =20 r =3D amdgpu_display_modeset_create_props(adev); diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c b/drivers/gpu/drm/amd/am= dgpu/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 =3D 16384; adev_to_drm(adev)->mode_config.preferred_depth =3D 24; adev_to_drm(adev)->mode_config.prefer_shadow =3D 1; + adev_to_drm(adev)->mode_config.fb_modifiers_not_supported =3D true; adev_to_drm(adev)->mode_config.fb_base =3D adev->gmc.aper_base; =20 r =3D amdgpu_display_modeset_create_props(adev); diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c b/drivers/gpu/drm/amd/am= dgpu/dce_v8_0.c index 8318ee8339f1..de11fbe5aba2 100644 --- a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c +++ b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c @@ -2695,6 +2695,8 @@ static int dce_v8_0_sw_init(void *handle) adev_to_drm(adev)->mode_config.preferred_depth =3D 24; adev_to_drm(adev)->mode_config.prefer_shadow =3D 1; =20 + adev_to_drm(adev)->mode_config.fb_modifiers_not_supported =3D true; + adev_to_drm(adev)->mode_config.fb_base =3D adev->gmc.aper_base; =20 r =3D amdgpu_display_modeset_create_props(adev); diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gp= u/drm/amd/display/amdgpu_dm/amdgpu_dm.c index 2f0b14f8f833..61cb41766fae 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -7868,6 +7868,9 @@ static int amdgpu_dm_plane_init(struct amdgpu_display= _manager *dm, if (res) return res; =20 + if (modifiers =3D=3D NULL) + adev_to_drm(dm->adev)->mode_config.fb_modifiers_not_supported =3D true; + res =3D drm_universal_plane_init(adev_to_drm(dm->adev), plane, possible_c= rtcs, &dm_plane_funcs, formats, num_formats, modifiers, plane->type, NULL); diff --git a/drivers/gpu/drm/drm_framebuffer.c b/drivers/gpu/drm/drm_frameb= uffer.c index 07f5abc875e9..4562a8b86579 100644 --- a/drivers/gpu/drm/drm_framebuffer.c +++ b/drivers/gpu/drm/drm_framebuffer.c @@ -309,7 +309,7 @@ drm_internal_framebuffer_create(struct drm_device *dev, } =20 if (r->flags & DRM_MODE_FB_MODIFIERS && - !dev->mode_config.allow_fb_modifiers) { + dev->mode_config.fb_modifiers_not_supported) { DRM_DEBUG_KMS("driver does not support fb modifiers\n"); return ERR_PTR(-EINVAL); } @@ -594,7 +594,7 @@ int drm_mode_getfb2_ioctl(struct drm_device *dev, r->pixel_format =3D fb->format->format; =20 r->flags =3D 0; - if (dev->mode_config.allow_fb_modifiers) + if (!dev->mode_config.fb_modifiers_not_supported) r->flags |=3D DRM_MODE_FB_MODIFIERS; =20 for (i =3D 0; i < ARRAY_SIZE(r->handles); i++) { @@ -607,7 +607,7 @@ int drm_mode_getfb2_ioctl(struct drm_device *dev, for (i =3D 0; i < fb->format->num_planes; i++) { r->pitches[i] =3D fb->pitches[i]; r->offsets[i] =3D fb->offsets[i]; - if (dev->mode_config.allow_fb_modifiers) + if (!dev->mode_config.fb_modifiers_not_supported) r->modifier[i] =3D fb->modifier; } =20 diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c index 8b8744dcf691..51fcf1298023 100644 --- a/drivers/gpu/drm/drm_ioctl.c +++ b/drivers/gpu/drm/drm_ioctl.c @@ -297,7 +297,7 @@ static int drm_getcap(struct drm_device *dev, void *dat= a, struct drm_file *file_ req->value =3D 64; break; case DRM_CAP_ADDFB2_MODIFIERS: - req->value =3D dev->mode_config.allow_fb_modifiers; + req->value =3D !dev->mode_config.fb_modifiers_not_supported; break; case DRM_CAP_CRTC_IN_VBLANK_EVENT: req->value =3D 1; diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c b/drivers/gpu/drm/no= uveau/nouveau_display.c index 2b460835a438..2cd0932b3d68 100644 --- a/drivers/gpu/drm/nouveau/nouveau_display.c +++ b/drivers/gpu/drm/nouveau/nouveau_display.c @@ -708,10 +708,12 @@ nouveau_display_create(struct drm_device *dev) &disp->disp); if (ret =3D=3D 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 =3D true; ret =3D nv04_display_create(dev); - else + } else { ret =3D nv50_display_create(dev); + } } } else { ret =3D 0; diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/rade= on/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 =3D 24; rdev->ddev->mode_config.prefer_shadow =3D 1; =20 + rdev->ddev->mode_config.fb_modifiers_not_supported =3D true; + rdev->ddev->mode_config.fb_base =3D rdev->mc.aper_base; =20 ret =3D radeon_modeset_create_props(rdev); diff --git a/include/drm/drm_mode_config.h b/include/drm/drm_mode_config.h index 91ca575a78de..b73af96e2c96 100644 --- a/include/drm/drm_mode_config.h +++ b/include/drm/drm_mode_config.h @@ -933,6 +933,16 @@ struct drm_mode_config { */ bool allow_fb_modifiers; =20 + /** + * @fb_modifiers_not_supported: + * + * This flag is for legacy drivers that doesn't support modifiers but + * infer the actual layout of the underlying buffer. + * Generally, each driver must support modifires, newly added drivers + * should never set this flag. + */ + bool fb_modifiers_not_supported; + /** * @normalize_zpos: * --=20 2.25.1 From nobody Wed Jul 1 18:55:48 2026 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 C0336C4332F for ; Tue, 18 Jan 2022 08:37:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344666AbiARIhd (ORCPT ); Tue, 18 Jan 2022 03:37:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59720 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344501AbiARIhY (ORCPT ); Tue, 18 Jan 2022 03:37:24 -0500 Received: from mail-pf1-x42e.google.com (mail-pf1-x42e.google.com [IPv6:2607:f8b0:4864:20::42e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ABFB7C061574 for ; Tue, 18 Jan 2022 00:37:24 -0800 (PST) Received: by mail-pf1-x42e.google.com with SMTP id 78so12450037pfu.10 for ; Tue, 18 Jan 2022 00:37:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=igel-co-jp.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Z7DU13bl/Kr7bejWSCxzgyPXSQzgiVvowF1ijJEKZSA=; b=YLSxu/tIwj92oYZwW7XT/H9srKLMjIQQT+1nn/oOFcZLB4PgCo3+UDGGZcffN6xDLN fiY8zn+trt9sov1CskL0+pT6MAvoPHgB7Z/nRy20Y57dKLRXOoZplUdqd/cUnbQaoO+P ur+SOLXf5+Tr+gfMMMvxQcG8FdHMzW+kJrXJdaA+Tb94t4eapVv5nADD2uJIavifzmvC aq4MMGAdZg5Q2IgIfOFOuvCy29XWqKuBktEFwlABvPZa+bDCLWUJDX+ueDSzGYUGzHE1 Ay2XO98YiVEGcPqsk0Z/ElsxPO4L+GAPzZQ/yrDFRsxojzPV1q5C9HVd+KyQpo3TQ5Vl 4F/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Z7DU13bl/Kr7bejWSCxzgyPXSQzgiVvowF1ijJEKZSA=; b=GCej4VXP8sUVxFSXEcw8o7jFXp1C6XWzmbNJPwi6g5w5E35idKKWKTR1QAwpCsnH6r +4Hdtq+QEcFTKtr02lJ79ZN9aOGYKI/38SZrYUsM8qR2kNW9iwhVDWeR+T5R6Nqwk8ko EuFil9Nuz9d9Hvk/rnX+iJlaZgkoLdNP2BuVBFkItm8WDGYCIq1cEcw/Jnb3lvsx/7A5 kvIArYljIyZIP9wkkny1jMdCRQIFWtqnAFnNhdkvIEAP4l6qITDvprcvDTZBoBFx6zuD 9bH1lHvtnIGn4Wp9j2LXRtTEBLCyuvkko13v6221ij31cZZnh8MPAK1UPkrvUVFBAOWj UajQ== X-Gm-Message-State: AOAM532q9L50je/QIQKMJMrZCeEJDfVIilhojfBUqSyCMGB/IeFoFbc0 tFZv7/lVcQ+IlErayoiulr/1+w== X-Google-Smtp-Source: ABdhPJxUXPnlq3fnqBxNwq+VU2c6cdmBk++xs+hnu+nnviQYYFI6uuFUKT5La/Jt+m2gv1zoVNQ6+w== X-Received: by 2002:a05:6a00:1a55:b0:4c4:394:8a22 with SMTP id h21-20020a056a001a5500b004c403948a22mr10068904pfv.63.1642495044202; Tue, 18 Jan 2022 00:37:24 -0800 (PST) Received: from aqua.hq.igel.co.jp (napt.igel.co.jp. [219.106.231.132]) by smtp.gmail.com with ESMTPSA id c6sm1775615pjo.39.2022.01.18.00.37.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Jan 2022 00:37:23 -0800 (PST) From: Tomohito Esaki To: dri-devel@lists.freedesktop.org Cc: Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , "Pan, Xinhui" , David Airlie , Daniel Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Ben Skeggs , =?UTF-8?q?Michel=20D=C3=A4nzer?= , Simon Ser , Qingqing Zhuo , Bas Nieuwenhuizen , Mark Yacoub , Sean Paul , Evan Quan , Andy Shevchenko , Petr Mladek , Sakari Ailus , Lee Jones , Abhinav Kumar , Dmitry Baryshkov , Rob Clark , amd-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, nouveau@lists.freedesktop.org, Daniel Stone , Laurent Pinchart , Tomohito Esaki , Damian Hobson-Garcia , Takanari Hayama Subject: [RFC PATCH v4 2/3] drm: add support modifiers for drivers whose planes only support linear layout Date: Tue, 18 Jan 2022 17:36:51 +0900 Message-Id: <20220118083652.16335-3-etom@igel.co.jp> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220118083652.16335-1-etom@igel.co.jp> References: <20220118083652.16335-1-etom@igel.co.jp> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The LINEAR modifier is advertised as default if a driver doesn't specify modifiers. Signed-off-by: Tomohito Esaki --- drivers/gpu/drm/drm_plane.c | 15 ++++++++++++--- include/drm/drm_plane.h | 3 +++ 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/drm_plane.c b/drivers/gpu/drm/drm_plane.c index deeec60a3315..5aa7e241971e 100644 --- a/drivers/gpu/drm/drm_plane.c +++ b/drivers/gpu/drm/drm_plane.c @@ -237,6 +237,10 @@ static int __drm_universal_plane_init(struct drm_devic= e *dev, const char *name, va_list ap) { struct drm_mode_config *config =3D &dev->mode_config; + const uint64_t default_modifiers[] =3D { + DRM_FORMAT_MOD_LINEAR, + DRM_FORMAT_MOD_INVALID + }; unsigned int format_modifier_count =3D 0; int ret; =20 @@ -277,6 +281,11 @@ static int __drm_universal_plane_init(struct drm_devic= e *dev, =20 while (*temp_modifiers++ !=3D DRM_FORMAT_MOD_INVALID) format_modifier_count++; + } else { + if (!dev->mode_config.fb_modifiers_not_supported) { + format_modifiers =3D default_modifiers; + format_modifier_count =3D 1; + } } =20 /* autoset the cap and check for consistency across all planes */ @@ -341,7 +350,7 @@ static int __drm_universal_plane_init(struct drm_device= *dev, drm_object_attach_property(&plane->base, config->prop_src_h, 0); } =20 - if (config->allow_fb_modifiers) + if (format_modifier_count) create_in_format_blob(dev, plane); =20 return 0; @@ -368,8 +377,8 @@ static int __drm_universal_plane_init(struct drm_device= *dev, * drm_universal_plane_init() to let the DRM managed resource infrastructu= re * take care of cleanup and deallocation. * - * Drivers supporting modifiers must set @format_modifiers on all their pl= anes, - * even those that only support DRM_FORMAT_MOD_LINEAR. + * For drivers supporting modifiers, all planes will advertise + * DRM_FORMAT_MOD_LINEAR support, if @format_modifiers is not set. * * Returns: * Zero on success, error code on failure. diff --git a/include/drm/drm_plane.h b/include/drm/drm_plane.h index 0c1102dc4d88..cad641b1f797 100644 --- a/include/drm/drm_plane.h +++ b/include/drm/drm_plane.h @@ -803,6 +803,9 @@ void *__drmm_universal_plane_alloc(struct drm_device *d= ev, * * The @drm_plane_funcs.destroy hook must be NULL. * + * For drivers supporting modifiers, all planes will advertise + * DRM_FORMAT_MOD_LINEAR support, if @format_modifiers is not set. + * * Returns: * Pointer to new plane, or ERR_PTR on failure. */ --=20 2.25.1 From nobody Wed Jul 1 18:55:48 2026 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 06EAEC433EF for ; Tue, 18 Jan 2022 08:37:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344628AbiARIhr (ORCPT ); Tue, 18 Jan 2022 03:37:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59764 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344674AbiARIhd (ORCPT ); Tue, 18 Jan 2022 03:37:33 -0500 Received: from mail-pj1-x1035.google.com (mail-pj1-x1035.google.com [IPv6:2607:f8b0:4864:20::1035]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 427F8C061748 for ; Tue, 18 Jan 2022 00:37:32 -0800 (PST) Received: by mail-pj1-x1035.google.com with SMTP id ie23-20020a17090b401700b001b38a5318easo2139680pjb.2 for ; Tue, 18 Jan 2022 00:37:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=igel-co-jp.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=nHubPpVUFbRzFLg8T8kDPGraTUFZHSM+yB+IayI7i+s=; b=BNVQLfmQk6md7zj5f5A2JZMLlkVY3nsW+rWNMcDQFQSSESG1iJa90hai3eZwmBFsKn IrVMI1n4eyrPuICVT8b+BX/szy3mZ/xRbWkq9V6tQ8FhTSadk5weQSMhQvA7y+4Ve78T Jq9eRUhJyvV8+eBPuLyvaGXkpEBYcxGDqtObjkINyRsC5Rpeh+jrPgikvbbOodrLWtW9 9KBVPKwK7PPvNHOKARO3F6N9clDzEP/XvdHUGp/UyT7ZCemmm8AonZIvKt2vqjIcULbN boomgfHUy5Y968l+0He/v51djOdv4spkhmPe2t6R6dEtt2mTLdDXz8+XqXKKriiZl9Eo ZCww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=nHubPpVUFbRzFLg8T8kDPGraTUFZHSM+yB+IayI7i+s=; b=DoEu3qEBdkUF+MwvDDdYcvnDHl/qw495iulvL5ulM9nAGbvpuJqpamZ+jE5Qfd/Y+1 KBV7VNSvBm5HMfwJeqkuOLRmwTxAcSSZ7Hrisp65v9qzEP9qugv9ZMFUx+VcOsvKTnd0 AWRQhDOSYdRRiLCPhbPPDlBHF/+z1Q2fvsOJqk7v5r1TJ4JUBko98EfZ8MczRnYiPTGb jVKRk9/k+taTc+yDbN5pIh6XUYPBnK0bnhBlWoWRn9YCC4FQEQ8PeQJu0o92UG8mGtyZ kpYr6gxM4Ez7N49+ZghHeAZzbxzbOQD7W2g3j8bU1onTb7ZNkrHJfutGg9s05RugU93b O/cg== X-Gm-Message-State: AOAM530f9CKGOdMWvzN704Ty4w8TKzV/ceQhhgd9Ajzkuuq2T4d9iXiN GOCOzXuSfsdXP/cyM0zEw6j5Bg== X-Google-Smtp-Source: ABdhPJzZ58k/3S62+PArMC81nnoj8/jh7NTLeCglvPNuoMj1t8UJHrK1+E/kF7kQg0Ovz0GW78kTbQ== X-Received: by 2002:a17:90b:1b50:: with SMTP id nv16mr17412800pjb.93.1642495051777; Tue, 18 Jan 2022 00:37:31 -0800 (PST) Received: from aqua.hq.igel.co.jp (napt.igel.co.jp. [219.106.231.132]) by smtp.gmail.com with ESMTPSA id c6sm1775615pjo.39.2022.01.18.00.37.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Jan 2022 00:37:31 -0800 (PST) From: Tomohito Esaki To: dri-devel@lists.freedesktop.org Cc: Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , "Pan, Xinhui" , David Airlie , Daniel Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Ben Skeggs , =?UTF-8?q?Michel=20D=C3=A4nzer?= , Simon Ser , Qingqing Zhuo , Bas Nieuwenhuizen , Mark Yacoub , Sean Paul , Evan Quan , Andy Shevchenko , Petr Mladek , Sakari Ailus , Lee Jones , Abhinav Kumar , Dmitry Baryshkov , Rob Clark , amd-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, nouveau@lists.freedesktop.org, Daniel Stone , Laurent Pinchart , Tomohito Esaki , Damian Hobson-Garcia , Takanari Hayama Subject: [RFC PATCH v4 3/3] drm: remove allow_fb_modifiers Date: Tue, 18 Jan 2022 17:36:52 +0900 Message-Id: <20220118083652.16335-4-etom@igel.co.jp> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220118083652.16335-1-etom@igel.co.jp> References: <20220118083652.16335-1-etom@igel.co.jp> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The allow_fb_modifiers flag is unnecessary since it has been replaced with cannot_support_modifiers flag. Signed-off-by: Tomohito Esaki --- drivers/gpu/drm/drm_plane.c | 9 --------- drivers/gpu/drm/selftests/test-drm_framebuffer.c | 1 - include/drm/drm_mode_config.h | 16 ---------------- 3 files changed, 26 deletions(-) diff --git a/drivers/gpu/drm/drm_plane.c b/drivers/gpu/drm/drm_plane.c index 5aa7e241971e..89a3d044ab59 100644 --- a/drivers/gpu/drm/drm_plane.c +++ b/drivers/gpu/drm/drm_plane.c @@ -288,15 +288,6 @@ static int __drm_universal_plane_init(struct drm_devic= e *dev, } } =20 - /* autoset the cap and check for consistency across all planes */ - if (format_modifier_count) { - drm_WARN_ON(dev, !config->allow_fb_modifiers && - !list_empty(&config->plane_list)); - config->allow_fb_modifiers =3D true; - } else { - drm_WARN_ON(dev, config->allow_fb_modifiers); - } - plane->modifier_count =3D format_modifier_count; plane->modifiers =3D kmalloc_array(format_modifier_count, sizeof(format_modifiers[0]), diff --git a/drivers/gpu/drm/selftests/test-drm_framebuffer.c b/drivers/gpu= /drm/selftests/test-drm_framebuffer.c index 61b44d3a6a61..f6d66285c5fc 100644 --- a/drivers/gpu/drm/selftests/test-drm_framebuffer.c +++ b/drivers/gpu/drm/selftests/test-drm_framebuffer.c @@ -323,7 +323,6 @@ static struct drm_device mock_drm_device =3D { .max_width =3D MAX_WIDTH, .min_height =3D MIN_HEIGHT, .max_height =3D MAX_HEIGHT, - .allow_fb_modifiers =3D true, .funcs =3D &mock_config_funcs, }, }; diff --git a/include/drm/drm_mode_config.h b/include/drm/drm_mode_config.h index b73af96e2c96..c41df5932a6b 100644 --- a/include/drm/drm_mode_config.h +++ b/include/drm/drm_mode_config.h @@ -917,22 +917,6 @@ struct drm_mode_config { */ bool async_page_flip; =20 - /** - * @allow_fb_modifiers: - * - * Whether the driver supports fb modifiers in the ADDFB2.1 ioctl call. - * Note that drivers should not set this directly, it is automatically - * set in drm_universal_plane_init(). - * - * IMPORTANT: - * - * If this is set the driver must fill out the full implicit modifier - * information in their &drm_mode_config_funcs.fb_create hook for legacy - * userspace which does not set modifiers. Otherwise the GETFB2 ioctl is - * broken for modifier aware userspace. - */ - bool allow_fb_modifiers; - /** * @fb_modifiers_not_supported: * --=20 2.25.1