Received: by 2002:a05:6a10:af89:0:0:0:0 with SMTP id iu9csp5278793pxb; Wed, 19 Jan 2022 15:07:50 -0800 (PST) X-Google-Smtp-Source: ABdhPJyGY1sXK6NCSVrd5LyjjDMAun/U5ML7QfrKTwzsaV8WAhxXLQWUOFsa4F89nVSHt/0H2+M1 X-Received: by 2002:aa7:8043:0:b0:4bc:1e18:466e with SMTP id y3-20020aa78043000000b004bc1e18466emr32948172pfm.49.1642633669793; Wed, 19 Jan 2022 15:07:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642633669; cv=none; d=google.com; s=arc-20160816; b=nwxrGwkjn/d1AV72Gvej+jgn4x962P/CaPWVZgYgARfGd5plHx015gA8of4SXcL80l EEQNcbWCGcKfxCvaDHGQrHYf+Lr7P+GRdgO0L0Tr0QRD8yaUsyKgK6ZUcKzLFKHN5DK7 IX3y0JqT1QwY5viYHf+zOdk9JvGlKGTDDT3C6pnO2BDn3LZ82S+gk/4hN2J5U8gW7cuP pRXHtD2uxblyqq80aPY7TlgLo9M3BWNMmR9aHeIm5PqJ3UFMQ40IdSeFYCNWk/NY7Asl MUPwQ0+oxhmp4ZzILXv9tFN6c5MKoblagVKeCxp0QYh74yooEqVPVaKbc0P4ihbzUrgD oxdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Z7DU13bl/Kr7bejWSCxzgyPXSQzgiVvowF1ijJEKZSA=; b=lrjgWQ3nLwQqff3LPxECYEqezK1ASVQQNZMrtR9l249rNkXXIDZkUN+0yiZQDRjTiE OHErw7Jr2kfPXMG5cYa1/2bgM4sRHwAItC2SmIZGn2KeRjEsCzFEdWybxrMEmRy9Cd/I xNchAGrG79oKQL66MwgqJk/UnYNrRmW30sJvCjLw0CFRV6Zg/DZo36prFWJIsYHrdofs qHaB3d69ULpiNYf3faR22WhtYBNdEq3PsrekVtIoEs/R9l2Xef6UWWLbd8mVWISEluvU C09y1OeXXyB9yq3yKEFzP3M1X4fGMlXbJLYL/YSKCwROFCii0PDQOf4ZXrxyzkJAnb4w IT0Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@igel-co-jp.20210112.gappssmtp.com header.s=20210112 header.b="YLSxu/tI"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id nh15si914845pjb.158.2022.01.19.15.07.37; Wed, 19 Jan 2022 15:07:49 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@igel-co-jp.20210112.gappssmtp.com header.s=20210112 header.b="YLSxu/tI"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344602AbiARIh3 (ORCPT + 99 others); Tue, 18 Jan 2022 03:37:29 -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-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: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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_device *dev, const char *name, va_list ap) { struct drm_mode_config *config = &dev->mode_config; + const uint64_t default_modifiers[] = { + DRM_FORMAT_MOD_LINEAR, + DRM_FORMAT_MOD_INVALID + }; unsigned int format_modifier_count = 0; int ret; @@ -277,6 +281,11 @@ static int __drm_universal_plane_init(struct drm_device *dev, while (*temp_modifiers++ != DRM_FORMAT_MOD_INVALID) format_modifier_count++; + } else { + if (!dev->mode_config.fb_modifiers_not_supported) { + format_modifiers = default_modifiers; + format_modifier_count = 1; + } } /* 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); } - if (config->allow_fb_modifiers) + if (format_modifier_count) create_in_format_blob(dev, plane); 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 infrastructure * take care of cleanup and deallocation. * - * Drivers supporting modifiers must set @format_modifiers on all their planes, - * 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 *dev, * * 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. */ -- 2.25.1