From patchwork Fri May 7 15:05:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 432501 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=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham 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 44643C433B4 for ; Fri, 7 May 2021 15:05:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0DBAF6145D for ; Fri, 7 May 2021 15:05:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237774AbhEGPGa (ORCPT ); Fri, 7 May 2021 11:06:30 -0400 Received: from wnew4-smtp.messagingengine.com ([64.147.123.18]:35871 "EHLO wnew4-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237769AbhEGPGa (ORCPT ); Fri, 7 May 2021 11:06:30 -0400 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailnew.west.internal (Postfix) with ESMTP id 46732FE2; Fri, 7 May 2021 11:05:29 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Fri, 07 May 2021 11:05:30 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cerno.tech; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm2; bh=GpLrgkM4UcgJ2 ZncyBkTt4vzSey6iyoCO+a1izkj+do=; b=idR6iW+4fFGSILzHvtWmDXEXYP3JG mobWDryv93DqyY7kHHTt/ayPngv1YnSElGxWfnPnBoT5v6EPfW24aPYgF+IVOvxO aXUtMkSsGuknyy4E4pV8os+U9j+uIAhCkMzq5iEbwRUFmvMKfYBK1wVxw+eRRERf 5ge2Y0hN7W3jGe7/mDnCamL8jPP14P0ET/QuGCLp28SmfWlW7Qt9xcGkgroMNSK0 6Pn+nNzxS5L+RepzymJlJ+7mnPWxomU9Fec4Q+8bxfLp3U3E9GT2mnvJOTdf6k0X uVg3cWAuzrWIae9WAMZLjfWoLgTxebDVxt0IH2cgojd9ioQcERaQ+f9ow== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=GpLrgkM4UcgJ2ZncyBkTt4vzSey6iyoCO+a1izkj+do=; b=cgZiISm6 v98u2ZPDP73GXeNfCkZIYeohv5LD6Yd5SZU0MW83Ob9MGzR04enBhbsoi56ybYdY 68+Pom4YXFhe51WHJlJgIYGKUNfJwg7uAfzpR7YMTHyIz3m9LXvuyK3TjatW7CdP 3aLw5v0OnNI13rOxfaixE7WKZ1htmYnH2KHzSQOzP2NJNfH35Pteb2Sq7W04BI7i Bnq9T74w9YZaZB9AJMh2HmLWA/MDf3nsH1nAKTAIsDoSYpnWg1lZ7OgCpfJInRzy WpNyMg2WkRJfQbUUmO6vOgAjt/TTwQ1ltzUJmqw6V5t63DApkC0E3RJgYeYHi0oT NXXYK0TSonHeIg== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrvdegvddgkeegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpeforgigihhm vgcutfhiphgrrhguuceomhgrgihimhgvsegtvghrnhhordhtvggthheqnecuggftrfgrth htvghrnhepvdekleevfeffkeejhfffueelteelfeduieefheduudfggffhhfffheevveeh hedvnecukfhppeeltddrkeelrdeikedrjeeinecuvehluhhsthgvrhfuihiivgeptdenuc frrghrrghmpehmrghilhhfrhhomhepmhgrgihimhgvsegtvghrnhhordhtvggthh X-ME-Proxy: Received: from localhost (lfbn-tou-1-1502-76.w90-89.abo.wanadoo.fr [90.89.68.76]) by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 7 May 2021 11:05:28 -0400 (EDT) From: Maxime Ripard To: Maarten Lankhorst , Thomas Zimmermann , Maxime Ripard , dri-devel@lists.freedesktop.org, Daniel Vetter , David Airlie Cc: Eric Anholt , Nicolas Saenz Julienne , bcm-kernel-feedback-list@broadcom.com, linux-rpi-kernel@lists.infradead.org, Dave Stevenson , Phil Elwell , Tim Gover , Dom Cobley , linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH v4 01/12] drm/vc4: txp: Properly set the possible_crtcs mask Date: Fri, 7 May 2021 17:05:04 +0200 Message-Id: <20210507150515.257424-2-maxime@cerno.tech> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210507150515.257424-1-maxime@cerno.tech> References: <20210507150515.257424-1-maxime@cerno.tech> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The current code does a binary OR on the possible_crtcs variable of the TXP encoder, while we want to set it to that value instead. Cc: # v5.9+ Fixes: 39fcb2808376 ("drm/vc4: txp: Turn the TXP into a CRTC of its own") Acked-by: Thomas Zimmermann Signed-off-by: Maxime Ripard --- drivers/gpu/drm/vc4/vc4_txp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/vc4/vc4_txp.c b/drivers/gpu/drm/vc4/vc4_txp.c index c0122d83b651..2fc7f4b5fa09 100644 --- a/drivers/gpu/drm/vc4/vc4_txp.c +++ b/drivers/gpu/drm/vc4/vc4_txp.c @@ -507,7 +507,7 @@ static int vc4_txp_bind(struct device *dev, struct device *master, void *data) return ret; encoder = &txp->connector.encoder; - encoder->possible_crtcs |= drm_crtc_mask(crtc); + encoder->possible_crtcs = drm_crtc_mask(crtc); ret = devm_request_irq(dev, irq, vc4_txp_interrupt, 0, dev_name(dev), txp);