From nobody Tue Jun 30 01:43:38 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 C7ABAC433FE for ; Fri, 28 Jan 2022 06:09:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346307AbiA1GJF (ORCPT ); Fri, 28 Jan 2022 01:09:05 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39460 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346301AbiA1GJD (ORCPT ); Fri, 28 Jan 2022 01:09:03 -0500 Received: from mail-pj1-x102f.google.com (mail-pj1-x102f.google.com [IPv6:2607:f8b0:4864:20::102f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3C095C061714 for ; Thu, 27 Jan 2022 22:09:03 -0800 (PST) Received: by mail-pj1-x102f.google.com with SMTP id d5so5550291pjk.5 for ; Thu, 27 Jan 2022 22:09:03 -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=9OzDyLbxHiptRu8aPtp+nu1uB5blDVW/bU01H77AoMs=; b=7dbPaRC95XZLXtUt7We9hvhYTemuqRCNVRhv9im6aqLkPx1t+AXxqeElX3ZhK2E/XI QjaLlFGclSQng/O1bnhUtvDIaNy0WXfjpM2AwnKIyaSA+2ooiwG2oVtWXpuFUQXhHYic u+dMIAmPrz08E78nSKStMMlL5upV4ILlMwafgzCXp0NkEHszgW7UV0zvdkIJmCQCe1Q9 Pr9JPaSSMXhhVJOZJDUgXqQb9YnrF5gZr23ucl6Sm28gT3bDcGfvtdrPtTqNOkF9h/9a YYg1WJIei14of4O3L/xyKcq9NqbhUFBocH+kSCNczOr6truWKWM6dearxgHf7KSO37qz flrQ== 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=9OzDyLbxHiptRu8aPtp+nu1uB5blDVW/bU01H77AoMs=; b=0FE46ZmRVef6599sZmUl+ViydYlq+BOPGfIpHp1rDEGkNrZoSAlIOH3ReMUD6YNAxw W1YfFIjgtu3hjPR6A1u2ZPg2Z1jVYyCNR/jPuFkvaux1xjt4FzRVDtxWAOXoPo0xRrRv y24aUcigerPVbQUcgCAd2JgSDF1L9F0SmKnDX3n6UKqZ6Am0XxeboOzdqG7oYs7a3VfS 4XWsYgYWdSRqxNCPhl6E6hqZh2XGq9lmyrRtrYSdErJ98EhyreXAi/UW1PnUMQ5oS4Vl hWPWoFRI1CvbD4FhIUBB+qpA2/hranf9LuyQ3zm05OvM8CpTnE74lNI3sHTZfM1k2Gb4 TCAw== X-Gm-Message-State: AOAM530bE2HmnOdrNAqo9o996RhCAiTMaVGg+Ii4nA2DPwDCP7bcufed BJcGziwtiFGT/2kLjdT2ZrMKxg== X-Google-Smtp-Source: ABdhPJy2sVlRtsrg85pdzE37SLPebBW7l+fxKl8otodYNXeMZDFUM/4dx4pSYZNuMXJWGZU4YDzOdQ== X-Received: by 2002:a17:903:3049:: with SMTP id u9mr6896351pla.2.1643350142723; Thu, 27 Jan 2022 22:09:02 -0800 (PST) Received: from aqua.hq.igel.co.jp (napt.igel.co.jp. [219.106.231.132]) by smtp.gmail.com with ESMTPSA id h5sm7743182pfi.111.2022.01.27.22.08.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Jan 2022 22:09:02 -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 , Harry Wentland Subject: [RFC PATCH v6 1/3] drm: introduce fb_modifiers_not_supported flag in mode_config Date: Fri, 28 Jan 2022 15:08:34 +0900 Message-Id: <20220128060836.11216-2-etom@igel.co.jp> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220128060836.11216-1-etom@igel.co.jp> References: <20220128060836.11216-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. v3: - change the order as follows: 1. add fb_modifiers_not_supported flag 2. add default modifiers 3. remove allow_fb_modifiers flag - add a conditional disable in amdgpu_dm_plane_init() v4: - modify kernel docs v5: - modify kernel docs Signed-off-by: Tomohito Esaki Acked-by: Harry Wentland Reviewed-by: Andy Shevchenko Reviewed-by: Laurent Pinchart --- 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 01:43:38 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 E419BC433F5 for ; Fri, 28 Jan 2022 06:09:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346314AbiA1GJM (ORCPT ); Fri, 28 Jan 2022 01:09:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39494 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346299AbiA1GJL (ORCPT ); Fri, 28 Jan 2022 01:09:11 -0500 Received: from mail-pj1-x1036.google.com (mail-pj1-x1036.google.com [IPv6:2607:f8b0:4864:20::1036]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 13183C061714 for ; Thu, 27 Jan 2022 22:09:11 -0800 (PST) Received: by mail-pj1-x1036.google.com with SMTP id r59so5555644pjg.4 for ; Thu, 27 Jan 2022 22:09:11 -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=9EzdZpZS4Z4IcY2FEqLzAsgmSU4/ecufEMUgyzjH9DI=; b=f1KfTjyjde3MGlrud7czWaI2aS8ME1vzCb9QYQASOs88grRoMJPZr8I6OowNxoI3Q0 N0YHyEDdHTP4AhLbcN9Uz1/qx3nr0/Ho4uzOYIUORaOR2GinK04vXj6uFPzibJYTXvzK KjJrr07KiH2Ir+a5x6ERoNy472hxzqef3fnImX3KStMfJQNnnSo5YzQLoNB3S3RTD275 WqFALl/KbnfIO9C2f9Q47r94tp1zlcFLzbUkW8dfH/My9yxzDRIOd2P7q/voBqtXRKL2 VQJ+tm8zYZNljyZFwlpFFl7CPHkxp3BAac7n7TE7dVLlCmwIB+ojG/haE9wV1aqUo8VR A+1A== 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=9EzdZpZS4Z4IcY2FEqLzAsgmSU4/ecufEMUgyzjH9DI=; b=mFK7m1/2ZgCFEFESIznVyK8hBT3+14coCrcumYGRlGsyRyG8yFgNRoNJdB2UISclqt mT8v9y2v2ogQ5vuaGpLhP+idRvtBueWu8SgVGyxEdLpF7KADWOpH+azYemvikFI6StA5 RInUYAazhyPFzzJA12vxCKYle6mdNmvgPPVvBmWgTirTGX9iJ5rh86GBDlmpB8iY1nO4 leQk/YYqNJrpRdj1Vx3CZ48pAiUuY94jtZNoNr6D00iwkBrKn5p3/l8tMnW5rCWegZts oZUIO5KpQs9fkBIGJ8tmD5w1zeRlvPqHpVxlWBioo/06aYD4yyq9knipK+qhoeFZA/e/ FBjw== X-Gm-Message-State: AOAM532NP4ZD90TvrkzUkzZ9BGGIhLUYoLJbThkHuVRABGHTgRiod6Aa JNMVHJz9xfmSa+/5jxO9l9Ibuw== X-Google-Smtp-Source: ABdhPJyS1HodQLAIUM/g+1ptfx8lQsTzLsZqTkcYsPcR4gUnEuwEd+yVeBMsvgFauG6tR4asals6vw== X-Received: by 2002:a17:903:2446:: with SMTP id l6mr7240246pls.48.1643350150500; Thu, 27 Jan 2022 22:09:10 -0800 (PST) Received: from aqua.hq.igel.co.jp (napt.igel.co.jp. [219.106.231.132]) by smtp.gmail.com with ESMTPSA id h5sm7743182pfi.111.2022.01.27.22.09.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Jan 2022 22:09:10 -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 v6 2/3] drm: add support modifiers for drivers whose planes only support linear layout Date: Fri, 28 Jan 2022 15:08:35 +0900 Message-Id: <20220128060836.11216-3-etom@igel.co.jp> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220128060836.11216-1-etom@igel.co.jp> References: <20220128060836.11216-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. v2: - rebase to the latest master branch (5.16.0+) + "drm/plane: Make format_mod_supported truly optional" patch [1] [1] https://patchwork.freedesktop.org/patch/467940/?series=3D98255&rev= =3D3 v3: - change the order as follows: 1. add fb_modifiers_not_supported flag 2. add default modifiers 3. remove allow_fb_modifiers flag v5: - change default_modifiers array from non-static to static - remove terminator in default_modifiers array - use ARRAY_SIZE to get the format_modifier_count - update sanity check in plane init func to use the fb_modifiers_not_supported - modify kernel docs Signed-off-by: Tomohito Esaki Reviewed-by: Andy Shevchenko Reviewed-by: Laurent Pinchart --- 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 01:43:38 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 5AA7AC433FE for ; Fri, 28 Jan 2022 06:09:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346253AbiA1GJU (ORCPT ); Fri, 28 Jan 2022 01:09:20 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39530 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346238AbiA1GJS (ORCPT ); Fri, 28 Jan 2022 01:09:18 -0500 Received: from mail-pf1-x42c.google.com (mail-pf1-x42c.google.com [IPv6:2607:f8b0:4864:20::42c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 582CEC061714 for ; Thu, 27 Jan 2022 22:09:18 -0800 (PST) Received: by mail-pf1-x42c.google.com with SMTP id a8so5223704pfa.6 for ; Thu, 27 Jan 2022 22:09:18 -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=xmJUYGxVIOq2ikN9W5Sr7Lz0nyJ9BNBmKrBR0wxwPTE=; b=n52ktlUg3l4qy9m/0Ni0lzQNBoCvDxm+h9y9p5dLfgPUj79JmomeClnGajJBRNzxmI RmTKQGeWberRRjud4XfI5FwJ3M1dW6UAT93DdcwU8iUFTJe8cxoE/1go74mWnbYA2rpN ObgaBv5dxtL/9CfjgaLbkoUzx2YeVR33SLUsBgiGdJY8219auHHuheS18uX7ZVc5tBRI bpCSqfPY4bFEciUcFhrRSRUX2LSAQoAJQgDeyd8SUQkxbTue8yeDx4555WEmKd3iTQ6Z JZdNEHmylYt+bZujgRFF1PZ2l7EVhnbCQDbsk2dLaq4Nwn9fseH3PMqlbu9taC0UJtSe fD7Q== 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=xmJUYGxVIOq2ikN9W5Sr7Lz0nyJ9BNBmKrBR0wxwPTE=; b=1ayTbl4XJDOGx6iqL/8W5rE9ah5oFldvU0UfWOt3gXnl2Ygt02rrczBdo+rhyOF8nk zVYSt0UU6pWhq4NfIzZSSBjowu4JVBz0m3mRALsDHbNpvb0IKhbN+bayfAIe9JDlXaWr qfH9dG1tcodBjv0xFxAOCAKvs3/zNToL86Z2E7cf/HCkyXNiUHl1wvDMSqKUQmrPh6Uz aC4wd9cAm0uqy/eEJyB+1fzbXGfiLtdFDXR3iyQ7z3a6RdEHnMdsTf0KkWHC2Pdj7c/2 HMdZtDMejkwSV8ifD3zRmI0zlcaoCQPhAliN4AJ7wj6UEzZN3ULWbEOsko3zcMzOUE0T Isqg== X-Gm-Message-State: AOAM532VaLMn9SwNzjEM+h6sitms7/iC9Mo9ZDpAdPU/Nx6vIqcS+k0X ZmG8KMr+sV6HK17eWmOXCS639w== X-Google-Smtp-Source: ABdhPJxOswA3kNxXL45GkqcHS4JhxF0KFKbQ4Yl6by2ISkes4m7lp62H+duPcH9WQSM66RTMhk6uqA== X-Received: by 2002:a63:6342:: with SMTP id x63mr5500830pgb.148.1643350157903; Thu, 27 Jan 2022 22:09:17 -0800 (PST) Received: from aqua.hq.igel.co.jp (napt.igel.co.jp. [219.106.231.132]) by smtp.gmail.com with ESMTPSA id h5sm7743182pfi.111.2022.01.27.22.09.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Jan 2022 22:09:17 -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 v6 3/3] drm: remove allow_fb_modifiers Date: Fri, 28 Jan 2022 15:08:36 +0900 Message-Id: <20220128060836.11216-4-etom@igel.co.jp> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220128060836.11216-1-etom@igel.co.jp> References: <20220128060836.11216-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. v3: - change the order as follows: 1. add fb_modifiers_not_supported flag 2. add default modifiers 3. remove allow_fb_modifiers flag v5: - keep a sanity check in plane init func Signed-off-by: Tomohito Esaki Reviewed-by: Andy Shevchenko Reviewed-by: Laurent Pinchart --- 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