From patchwork Tue Apr 13 09:48:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 12199881 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9B4D6C433ED for ; Tue, 13 Apr 2021 09:49:29 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 61AAE613A9 for ; Tue, 13 Apr 2021 09:49:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 61AAE613A9 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E320F6E314; Tue, 13 Apr 2021 09:49:17 +0000 (UTC) Received: from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com [IPv6:2a00:1450:4864:20::32a]) by gabe.freedesktop.org (Postfix) with ESMTPS id 884C46E2C0 for ; Tue, 13 Apr 2021 09:49:15 +0000 (UTC) Received: by mail-wm1-x32a.google.com with SMTP id z24-20020a1cf4180000b029012463a9027fso8388921wma.5 for ; Tue, 13 Apr 2021 02:49:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=kflxSBqLQaPPRJYxvd/LNnDO2sK1GIdN9i+UPGrUqpQ=; b=lOs4ZUh4aFlEAaDuPradkJytOePPNKjsnB5l9JuSEDrjMBvEpASLZ6BFMnpndw7Y8y AamCWbb+JylQb+6X4NPZiuNpPGuS6PXOcWmZxn05iqyA+suNvol8MLHwF84wMeVLilmK q74N8RB2VZC8JUEJ7Zbtqur750OzSJz7Bdn6Q= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=kflxSBqLQaPPRJYxvd/LNnDO2sK1GIdN9i+UPGrUqpQ=; b=ODslsEANNp0AhCYb2a6D2fzBx4HeM0+2MIy1Q05POghg8eZhbd6SChApMR9NNe2t14 ZnqzDcdcQ1xuzxGyuCT2JrJ/O/2mM+Xx5I79IehWLpz2zzLP3k+UggTsDUO91c4z6V/q 2+fI8M8Qo05VpnH75wkOJ4uuEz8xOc6kVunvNGAMUObXAyKQXXbPBLXoXd2MQIhAXa+p AFBHVNj8Y/AhlauSatUrmOhIo4cFOmizd8tkkWx114dNHIH/ykcPR0ZMTRW0bW8VxoFA GMKYiXeRTSKYDPSC0IOwSGB2vS2Y2rYLB0JRVHcI/oNByR1sX0FglFIQccAnn9ad5ZBn 39Ow== X-Gm-Message-State: AOAM530IVz0eJV8/ZMfnoqqQYiH6aJqYoVpbF0c9Xu/HWAKhUKDC/uqh rJh6jqBGbRm7D3iOoLVZlRy0n7sWrtm6IQ== X-Google-Smtp-Source: ABdhPJwJSGRymhGmSzjJLWTzNCtPih2XjXM79SNIHdkr/3jbietkqqwhLRz8rdVTpcUEryV7iJRfyQ== X-Received: by 2002:a05:600c:3594:: with SMTP id p20mr3115175wmq.173.1618307354288; Tue, 13 Apr 2021 02:49:14 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id 64sm1956458wmz.7.2021.04.13.02.49.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Apr 2021 02:49:13 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 05/12] drm/imx: Don't set allow_fb_modifiers explicitly Date: Tue, 13 Apr 2021 11:48:56 +0200 Message-Id: <20210413094904.3736372-5-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.31.0 In-Reply-To: <20210413094904.3736372-1-daniel.vetter@ffwll.ch> References: <20210413094904.3736372-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 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: Pengutronix Kernel Team , Daniel Vetter , Intel Graphics Development , NXP Linux Team , Daniel Vetter , Shawn Guo , Sascha Hauer , linux-arm-kernel@lists.infradead.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Since commit 890880ddfdbe256083170866e49c87618b706ac7 Author: Paul Kocialkowski Date: Fri Jan 4 09:56:10 2019 +0100 drm: Auto-set allow_fb_modifiers when given modifiers at plane init this is done automatically as part of plane init, if drivers set the modifier list correctly. Which is the case here. This one actually set it twice on top of what drm_plane_init does, so double-redundant! Signed-off-by: Daniel Vetter Cc: Philipp Zabel Cc: Shawn Guo Cc: Sascha Hauer Cc: Pengutronix Kernel Team Cc: Fabio Estevam Cc: NXP Linux Team Cc: linux-arm-kernel@lists.infradead.org Reviewed-by: Lucas Stach --- drivers/gpu/drm/imx/dcss/dcss-kms.c | 1 - drivers/gpu/drm/imx/imx-drm-core.c | 1 - 2 files changed, 2 deletions(-) diff --git a/drivers/gpu/drm/imx/dcss/dcss-kms.c b/drivers/gpu/drm/imx/dcss/dcss-kms.c index b549ce5e7607..37ae68a7fba5 100644 --- a/drivers/gpu/drm/imx/dcss/dcss-kms.c +++ b/drivers/gpu/drm/imx/dcss/dcss-kms.c @@ -52,7 +52,6 @@ static void dcss_kms_mode_config_init(struct dcss_kms_dev *kms) config->min_height = 1; config->max_width = 4096; config->max_height = 4096; - config->allow_fb_modifiers = true; config->normalize_zpos = true; config->funcs = &dcss_drm_mode_config_funcs; diff --git a/drivers/gpu/drm/imx/imx-drm-core.c b/drivers/gpu/drm/imx/imx-drm-core.c index 2ded8e4f32d0..8be4edaec958 100644 --- a/drivers/gpu/drm/imx/imx-drm-core.c +++ b/drivers/gpu/drm/imx/imx-drm-core.c @@ -209,7 +209,6 @@ static int imx_drm_bind(struct device *dev) drm->mode_config.max_height = 4096; drm->mode_config.funcs = &imx_drm_mode_config_funcs; drm->mode_config.helper_private = &imx_drm_mode_config_helpers; - drm->mode_config.allow_fb_modifiers = true; drm->mode_config.normalize_zpos = true; ret = drmm_mode_config_init(drm);