From nobody Tue Jun 30 02:40:28 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 2E766C433F5 for ; Thu, 27 Jan 2022 03:26:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230042AbiA0D0C (ORCPT ); Wed, 26 Jan 2022 22:26:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41004 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235557AbiA0D0B (ORCPT ); Wed, 26 Jan 2022 22:26:01 -0500 Received: from mail-pj1-x1032.google.com (mail-pj1-x1032.google.com [IPv6:2607:f8b0:4864:20::1032]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E071EC061747 for ; Wed, 26 Jan 2022 19:26:00 -0800 (PST) Received: by mail-pj1-x1032.google.com with SMTP id d5so1538975pjk.5 for ; Wed, 26 Jan 2022 19:26:00 -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=1aG0CkjQkXiaFHGnTRZvnyYznLC/oEhKppW4MkJPacE=; b=t30Q4kM2TOpItthseA3qGETMD46lDSYIE7h2JrA7FF3hHE9Si4lU8QYpv/rKAVcNal hwvc8+ddfHW2thJIl1asz951QldgUKqG6bgUeXDhYeQ3cK+kGfBmXsUxw92MwzgNQA0W PR/y1DPeGI39MkCFnN+9MkSuGJvVeqj6UhfCcW68aNEhWxamGf5PCEqt7vnmPSGtJvve sQNth5LF6fPGUP80BatI9GoIpGpgeDTw/CaJc5Vgfkqudz70sAwBBp4+boVsb8hSXIPp e2rDgsnVo9WFuGFif8OdOvREQaFvMHp08RU8TrLFRcMuFa83+WBGYvYtmcnIE/1+14zN b9Pw== 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=1aG0CkjQkXiaFHGnTRZvnyYznLC/oEhKppW4MkJPacE=; b=QZ7OH7fYX6FMummPZZlsr8Oohq86PV97AmfMa+qWjY7cEFQ1rkZuvyQL8J4NMaAzH5 6ruHwSfglutAWburjxArBAoL0yMa3F7F8lIoQr8WLV4PvHfaXDZc1hVUzssiiK1bXIVY D8QMH3K7rxbex0/Qf3AdX3+l76JmbJpDXZoXg5GVBHrHw9j0vUMbegeypY49yLt0/C4j uovZSXBzSxwAqug0e7Q8LxKjOlKji667YaIUZBv/zEBUuCBmR9HNXRQhx4fopLC4vamg HchQ0ERtEqeKIRk6hCnxOCs3bNcVOwIP1XxcjrXtYTgN8UsiqmyhezjuOtG5Un2Q5YFW mDKQ== X-Gm-Message-State: AOAM5302WK3VPj2zOfUS7mXUp5J374DdslxBgruAJqgLKCAbLq9Fd8Ol skAWfzUZRLmZ3CXO0OSwAdLesw== X-Google-Smtp-Source: ABdhPJzJI3g7hxKOK4Vfon3V8gj4BqxBjPY8qkbRIf8B/vQb8xRvhrdnBDNDjwQ8UwPV7l4FT1JGTQ== X-Received: by 2002:a17:90b:3b46:: with SMTP id ot6mr6070811pjb.179.1643253960278; Wed, 26 Jan 2022 19:26:00 -0800 (PST) Received: from aqua.hq.igel.co.jp (napt.igel.co.jp. [219.106.231.132]) by smtp.gmail.com with ESMTPSA id t15sm4203111pjy.17.2022.01.26.19.25.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Jan 2022 19:25:59 -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 v5 1/3] drm: introduce fb_modifiers_not_supported flag in mode_config Date: Thu, 27 Jan 2022 12:25:37 +0900 Message-Id: <20220127032539.9929-2-etom@igel.co.jp> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220127032539.9929-1-etom@igel.co.jp> References: <20220127032539.9929-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 7f9773f8dab6..0fbcd19489f6 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -7894,6 +7894,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..4a93dac91cf9 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: + * + * When this flag is set, the DRM device will not expose modifier + * support to userspace. This is only used by legacy drivers that infer + * the buffer layout through heuristics without using modifiers. New + * drivers shall not set fhis flag. + */ + bool fb_modifiers_not_supported; + /** * @normalize_zpos: * --=20 2.25.1 From nobody Tue Jun 30 02:40:28 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 C4606C4332F for ; Thu, 27 Jan 2022 03:26:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235721AbiA0D0K (ORCPT ); Wed, 26 Jan 2022 22:26:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41040 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235585AbiA0D0I (ORCPT ); Wed, 26 Jan 2022 22:26:08 -0500 Received: from mail-pl1-x62c.google.com (mail-pl1-x62c.google.com [IPv6:2607:f8b0:4864:20::62c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6C913C06161C for ; Wed, 26 Jan 2022 19:26:08 -0800 (PST) Received: by mail-pl1-x62c.google.com with SMTP id k17so1423637plk.0 for ; Wed, 26 Jan 2022 19:26:08 -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=emJGgAZKsXHfbFDFmzqJm+vf0jLHKtmm1jh15gidIuc=; b=INAvcROfrUBBxfcEHa4GOL58R5CqSKk73+AcncbMRxk6vIdER/muBwmOVz7Alh2zrF ksmuPXiHJrfYC9BysjY+IkOsMUcYkIm8gieWJdNzilKRXVhqt3QTVdS0R53qNkI5X8n/ BbKUCzXl8L0SzZFt1BPtyCApK2ce2YuK7Rm7BGMlo1+x/+HEdMr8kE4rPkZaRG7kvuqN VlP6h6/XKx/4vqmDRLjexXzIJpSvaHahMizDzj0kfS5PLkLYWQOtZeFpry+NXcgOO4BC fcyFxirEDPEI1r5wqb93sm6NP/6Fs72qaeSBdNTP06tykOEkj1mCLrnfjkT/qAW9nOOo mDZw== 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=emJGgAZKsXHfbFDFmzqJm+vf0jLHKtmm1jh15gidIuc=; b=4p8DxisHc4VCTb8bmkX9CpV0rJwSWbXUaerB5lYKqD4ir0pWnbwb/FfLZFXiH9s6kF VK+QQscziDrEeKWgPHQgoNNA9spC2qdu5aA5KUryJfMb5SdtcHNuIX7D+b4o8B3qGi81 aCpCgL5v16eN4qfH88r49LtJnn9bIAnBC1sCJ7z9YRhixS6TPwkX29t1Y6RQeb1zmmjr HrZELwTYmeXIg5Z1YBrcmVvmD3RI97Wel6AiRxw4APOU/o/P6fGru77l54NcnNx6mjA3 b6avCxuvUKAvHeyR/mcG7OGu/k/MiOP9RNB/JYMxzDQ+DeMILCPcfNzEYuWMpLXcMLPi bjvQ== X-Gm-Message-State: AOAM531LnSJt80Aj2aZD+jeIWhu4DZBTg3XBOlfZ92YreXjebytycvRu 42knlfrePW+N9PDrJsX3fGmcKg== X-Google-Smtp-Source: ABdhPJw8vOgqPrHYaIFjHOHDtzomHyPlMOKBVVvXUrYiedbQLuzFiihIHlxPcejPdgoW7kbcn7Huvg== X-Received: by 2002:a17:90b:354f:: with SMTP id lt15mr11999702pjb.83.1643253967894; Wed, 26 Jan 2022 19:26:07 -0800 (PST) Received: from aqua.hq.igel.co.jp (napt.igel.co.jp. [219.106.231.132]) by smtp.gmail.com with ESMTPSA id t15sm4203111pjy.17.2022.01.26.19.26.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Jan 2022 19:26:07 -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 v5 2/3] drm: add support modifiers for drivers whose planes only support linear layout Date: Thu, 27 Jan 2022 12:25:38 +0900 Message-Id: <20220127032539.9929-3-etom@igel.co.jp> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220127032539.9929-1-etom@igel.co.jp> References: <20220127032539.9929-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 | 23 +++++++++++++---------- include/drm/drm_plane.h | 3 +++ 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/drm_plane.c b/drivers/gpu/drm/drm_plane.c index deeec60a3315..bf0daa8d9bbd 100644 --- a/drivers/gpu/drm/drm_plane.c +++ b/drivers/gpu/drm/drm_plane.c @@ -237,6 +237,9 @@ static int __drm_universal_plane_init(struct drm_device= *dev, const char *name, va_list ap) { struct drm_mode_config *config =3D &dev->mode_config; + static const uint64_t default_modifiers[] =3D { + DRM_FORMAT_MOD_LINEAR, + }; unsigned int format_modifier_count =3D 0; int ret; =20 @@ -277,16 +280,16 @@ static int __drm_universal_plane_init(struct drm_devi= ce *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 ARRAY_SIZE(default_modifiers); + } } =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); - } + drm_WARN_ON(dev, config->fb_modifiers_not_supported && + format_modifier_count); =20 plane->modifier_count =3D format_modifier_count; plane->modifiers =3D kmalloc_array(format_modifier_count, @@ -341,7 +344,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 +371,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. + * Drivers that only support the DRM_FORMAT_MOD_LINEAR modifier support ma= y set + * @format_modifiers to NULL. The plane will advertise the linear modifier. * * Returns: * Zero on success, error code on failure. diff --git a/include/drm/drm_plane.h b/include/drm/drm_plane.h index 0c1102dc4d88..a0390b6ad3b4 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. * + * Drivers that only support the DRM_FORMAT_MOD_LINEAR modifier support ma= y set + * @format_modifiers to NULL. The plane will advertise the linear modifier. + * * Returns: * Pointer to new plane, or ERR_PTR on failure. */ --=20 2.25.1 From nobody Tue Jun 30 02:40:28 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 76A72C4332F for ; Thu, 27 Jan 2022 03:26:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235738AbiA0D0T (ORCPT ); Wed, 26 Jan 2022 22:26:19 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41074 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235734AbiA0D0Q (ORCPT ); Wed, 26 Jan 2022 22:26:16 -0500 Received: from mail-pg1-x535.google.com (mail-pg1-x535.google.com [IPv6:2607:f8b0:4864:20::535]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6ECE5C06173B for ; Wed, 26 Jan 2022 19:26:16 -0800 (PST) Received: by mail-pg1-x535.google.com with SMTP id v3so1121191pgc.1 for ; Wed, 26 Jan 2022 19:26: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=UXgGm9s9WWnJocR1csEpEoFP0RYkPEhnyAgndhDwtjc=; b=O4KjoPSuQDZNGBWdQmitA/kZxO0YlbnND4cNyWdlyu4NQbK+BjberWp7inGyjYEFJK V6JfMoxtuIZkIBnyKTfo0YDRqThLerNVvqa+K1pSkgZZvEcRMTgu3/Fla5GeW5IktNNn Bijtm9oz/pYUb5wZ8jBAPSSs4k9N9koKFTfDDcGFPBvT1f6aT69SbDPqjCIOCXPuxmTu 3zWG6DCftxpuLhT0mrnB7Ni8jRvM2RLA+4slw5oHeDn0lLA7Qm21MGiq0iFX+UpbBapn fzZcajgCC/wg3/Mw4zbuNAa0nNAWO80t/e4VHG2oUY2aJnDbWbkuoV/5ZDfxq5gVqZdt hdmg== 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=UXgGm9s9WWnJocR1csEpEoFP0RYkPEhnyAgndhDwtjc=; b=yJMyuIQZXWQX+6N+SqRwP6mvp96GBP9nWlBiNFbo3w5mj9Ek9lLLGv6MXGHOixUkJA YdRCcaYnliYZOqlbi1OswZWzMpABpVdwcBLWkWdaDDMwZDnJO/uz2Kihr7xBngYRPM4t pKUb43SkbEJvJYyGgta47Mk8Q+YjcFh0zasJREYeivySyHxHtsg+50bSwJ4dzX3mHWLp 5/htD5N/4Mrq0EJLshucfKN6nU55ZHWTzcR9xsPcd32bUzV2t81cUAZ0/Tk58STO5Fe5 QzinZweYhBLMZ0KZH/BVSVwd1kT/T2RR9w3HZDer4rfr9v2hUOrHFlzGFuNB6QlLSVP7 t4Hg== X-Gm-Message-State: AOAM532wr2UkfqxvHejYa9eeJ2Lk7fnAN2JOZLvVHvXml78RAWtfTGk+ tpVAMqfZZqTAK/vptH2LRlE7wg== X-Google-Smtp-Source: ABdhPJysmgOujAl45WjONf68QQ5jRzvfCobqxGtGJ8Z511kMtGA4DmksGOLMeNbJRLJFDxAUzyr1Nw== X-Received: by 2002:a63:2c07:: with SMTP id s7mr1356397pgs.181.1643253975979; Wed, 26 Jan 2022 19:26:15 -0800 (PST) Received: from aqua.hq.igel.co.jp (napt.igel.co.jp. [219.106.231.132]) by smtp.gmail.com with ESMTPSA id t15sm4203111pjy.17.2022.01.26.19.26.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Jan 2022 19:26: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 v5 3/3] drm: remove allow_fb_modifiers Date: Thu, 27 Jan 2022 12:25:39 +0900 Message-Id: <20220127032539.9929-4-etom@igel.co.jp> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220127032539.9929-1-etom@igel.co.jp> References: <20220127032539.9929-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 fb_modifiers_not_supported flag. Signed-off-by: Tomohito Esaki --- drivers/gpu/drm/selftests/test-drm_framebuffer.c | 1 - include/drm/drm_mode_config.h | 16 ---------------- 2 files changed, 17 deletions(-) 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 4a93dac91cf9..6b5e01295348 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