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: 12199867 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.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,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 3E8A5C433ED for ; Tue, 13 Apr 2021 09:51:24 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (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 ABC6C613AB for ; Tue, 13 Apr 2021 09:51:23 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org ABC6C613AB Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=rtQJZaiAwWC7vShptbcgyzjIeh65SYgCUzaFwJC6usM=; b=JPJ6LRONcCAkTaPBAygcft/fH PI8RTQOQeuGdkln8W22TYP032TiXBBKCl1hEvBu5YCrGZ2rVgBs9uCLsExF8pH1LEN3BY3O3J5vao pJ22DuP7wYnqkLQuLdqTaqCj54qo1A2blneHXcsXZ19c++d56Lzh+nQVvc72mcqVuwuIMK5nhkExo BhM+92l1F6NpYAmXyo3avTzwWKTnSmmyTDcpNgyi6xsn9y58C5W2HvcFzKs2BR9dgAP6Cp3EnXJan j8QeSZCPpfzplsOJ3UsvznNDsr5NQZg47tzl8U9GRlY1cSE3fKVj6fVnJRFvTEvr7BRiTMNGsXeu9 I9x5vbtAw==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lWFg2-008mcG-8L; Tue, 13 Apr 2021 09:49:46 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lWFfb-008mVb-1L for linux-arm-kernel@desiato.infradead.org; Tue, 13 Apr 2021 09:49:21 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=kflxSBqLQaPPRJYxvd/LNnDO2sK1GIdN9i+UPGrUqpQ=; b=4M+fStSZHfKP+6Y/ZNdoI5Iz5z 57JtFJvGMaW8L2EFHdFMQ0fnlkFyKERkc/+yCUfUz3FzYGeyzEi7wQQTGFz3tgnSWCTRct378axgv Ge94MtaJ9/JONJyNWDgCOrHhZFRCJLI2Q7ZdRE58P2HPdSopTqV5P7leaAmSRLddB9B3k2VrYFmk6 mqGBWjUHHMp/4fTyNTGfJVEWCt8yR1zUZq+uxXIxMUFsyV6usEweDOMxCOODEGgmqv3EqLUSvyvjV 2wMzPlsIwMNGe0qifVtyeg3q2x4KS0/TZs2C2NO4DDJ5mLk9ltoegGyvxjUH5IEF4QxnKwCR9LAyO 1h9M3zwg==; Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lWFfX-006thb-WF for linux-arm-kernel@lists.infradead.org; Tue, 13 Apr 2021 09:49:17 +0000 Received: by mail-wm1-x32a.google.com with SMTP id y124-20020a1c32820000b029010c93864955so10259842wmy.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=HOrjErty67IZ7vi26HOrga/tq11ssUGZ3e31kmLJyObjtBc7KL88mH7gC02SGGNv/J vtYSkerrOCkvRtrRg+O8HNr81PhNyDoOKUHNphLVr6bD6kXw6hBU/1lCvlj+jaK/U06h gKJfnCm9hFfuFRrGxm16pg2FVh5+tDElT0tM4FC18JZR/aU+np1EKcWVg7DDfYgMDbkJ Q2N15bP66PYkcmb4DxT95eTvtQgZQCVA6ATwJv5HXi7b2wkcUR175oZ8n4Cg5n8AmCbm /QgV6VvDOkNL+L2/PY0IHkf5uMTFuytVky7rGNNFMw5g3D8wOOuuCtvXHQjHTZCEUZXa Ppog== X-Gm-Message-State: AOAM530dNGogIBYa0HCiFfisnJEHqSZvhjmNqpWCoVaE0TTwvAQb3U/E zoqDkgnwXwQtFUZrIK+2q/K5Kw== 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 Cc: Intel Graphics Development , Daniel Vetter , Daniel Vetter , Philipp Zabel , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , linux-arm-kernel@lists.infradead.org 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-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210413_024916_053996_5E89FB7E X-CRM114-Status: GOOD ( 15.06 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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);