From patchwork Mon Aug 29 13:11:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 12957948 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id CD3DAECAAD2 for ; Mon, 29 Aug 2022 13:50:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; 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=LIl/iyTAZCWDBKGJtuBysadoAWHRPTO05MSgCFUJCCo=; b=RLYagb1V+jqrR6 lh+9JJpAXbIu5ckwfJnf8RB7uCdn4B8Yqtoy+2o2/UJ17zSSbEjmNt36ArIXyJiSo3xWEUHvc0y19 WfZ+ksoQDs3C7St7WlJcGuhBBN8LmkNlit112KDCfMDoCrxV3W5HyBL838V2clbaYUwsV3rui8fOb b4o6FkXymYF7dqCU5Bnt11/XbUoHgaLjYmvYe1Ehq3tS26hrLWndDJb1TA922lYGjxo/l53xluaP/ 7v40coLT2yyNEcp6FiGN+ogIYQCbgfUE8UpPDDjUGld6Qme/VzR9zfiGosnpbDDz2fXSIm5v5RQpx krSYnKG7vrtkJeksRCxw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oSf7z-00ApXw-NA; Mon, 29 Aug 2022 13:48:37 +0000 Received: from wnew2-smtp.messagingengine.com ([64.147.123.27]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oSecV-00Abfq-QB for linux-arm-kernel@lists.infradead.org; Mon, 29 Aug 2022 13:16:07 +0000 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailnew.west.internal (Postfix) with ESMTP id 7FF612B06030; Mon, 29 Aug 2022 09:16:00 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Mon, 29 Aug 2022 09:16:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cerno.tech; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm3; t=1661778960; x= 1661786160; bh=HaNtO91X8wVp/AZd+CLfPSi0rxBzaPaGsS0q1kMO3AQ=; b=P SspWNLxyOHIFND0XwCfhQ2aYf/rmiRHAWMqStot70EXQWCaBKE5b9+EZR1p2yb4r mY6KQiCJWyhVru8bpb0lcyIOmbJDydDVGL1Cc6Cp6ZR1E4CQHHrv8+c99MZ8uZDg LnDGUqf7eih9BeEDW5oGmBesvj6C4UlnA4okbHEc3Rj+iYlG095D+IbBOErKhOH8 b+u0UxlBaLEPFxtElyH2W+i2zb2nYjUs70b55okgmcIPOeJ1yHAwIMlWbNXMT5RR bllxPiteF6QrQGE6Q7CFkOIkG0xmLM8aOWNBvf1Vt7GknYG6sUYV9hn7uAqJt+10 jf7RBDrQjzydabB6RN1Ag== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=1661778960; x= 1661786160; bh=HaNtO91X8wVp/AZd+CLfPSi0rxBzaPaGsS0q1kMO3AQ=; b=1 F0qVieGIST1yez16+8a4Mz82pbcvqCH9ddqWGKh/W2iGqvwP630MUUY7poBiK/ce TsC2Aa8fTkdtk0Abo6841ZDzQ6BDNbaQuuEH2srUpaEr1UIChcfDNxlQir0t/XWM x4hQqlPKNug31eeK6p0KlSahBhxZ15PB9Kfo8FZaKdsDZIlgNAeMF7zl7DigUlVN pEyceb1AcpT7fTacQks3HKQVxKfPnEdF+ybCCdE4xOTIPpNuZlh61cSPfwS6Hy2J 6USBNwlw2mTcGCEZDWntG9dx7ybGTa7bWkFwhTIPoSgg2OD+D6RgjBOvtHdhQLk2 1WxohkbZFdbdzUm2kqcRg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrvdekuddgieefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhggtgfogfesthhqredtredtjeenucfhrhhomhepofgr gihimhgvucftihhprghrugcuoehmrgigihhmvgestggvrhhnohdrthgvtghhqeenucggtf frrghtthgvrhhnpeefiedvfefggffgffehveejieffuddtgffhjefggeetieduvdeileet lefgveegtdenucevlhhushhtvghrufhiiigvpeehnecurfgrrhgrmhepmhgrihhlfhhroh hmpehmrgigihhmvgestggvrhhnohdrthgvtghh X-ME-Proxy: Feedback-ID: i8771445c:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 29 Aug 2022 09:15:58 -0400 (EDT) From: Maxime Ripard To: Maxime Ripard , Ben Skeggs , David Airlie , Chen-Yu Tsai , Thomas Zimmermann , Jani Nikula , Lyude Paul , Philipp Zabel , Maarten Lankhorst , Rodrigo Vivi , Tvrtko Ursulin , Jernej Skrabec , Samuel Holland , Karol Herbst , =?utf-8?q?Noralf_Tr=C3=B8nnes?= , Emma Anholt , Daniel Vetter , Joonas Lahtinen Cc: Maxime Ripard , Hans de Goede , linux-arm-kernel@lists.infradead.org, Phil Elwell , intel-gfx@lists.freedesktop.org, Dave Stevenson , dri-devel@lists.freedesktop.org, Dom Cobley , linux-kernel@vger.kernel.org, nouveau@lists.freedesktop.org, linux-sunxi@lists.linux.dev, Mateusz Kwiatkowski , Geert Uytterhoeven Subject: [PATCH v2 36/41] drm/sun4i: tv: Merge mode_set into atomic_enable Date: Mon, 29 Aug 2022 15:11:50 +0200 Message-Id: <20220728-rpi-analog-tv-properties-v2-36-459522d653a7@cerno.tech> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220728-rpi-analog-tv-properties-v2-0-459522d653a7@cerno.tech> References: <20220728-rpi-analog-tv-properties-v2-0-459522d653a7@cerno.tech> MIME-Version: 1.0 X-Mailer: b4 0.10.0-dev-65ba7 X-Developer-Signature: v=1; a=openpgp-sha256; l=2077; i=maxime@cerno.tech; h=from:subject:message-id; bh=8f83P3U97bSAZ8QzllfF75YiPBqFH3osodi8Teklke8=; b=owGbwMvMwCX2+D1vfrpE4FHG02pJDMk8uxSPr+f6yCBW9/9izvzc6Iz4iQJvsqXPHAz1rYn9mCWQ 5jWlo5SFQYyLQVZMkSVG2HxJ3KlZrzvZ+ObBzGFlAhnCwMUpABNJ42f475z7reFT0/X19t18drN6tj A9Yww4MbVAb8pibYbLPd+T+Bj+x64KOXCkcffFr7y8KhdXbdVe3POP/bi8xo8fe7oDjZI52AE= X-Developer-Key: i=maxime@cerno.tech; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220829_061604_079585_B5DC5785 X-CRM114-Status: UNSURE ( 8.18 ) X-CRM114-Notice: Please train this message. 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 Our mode_set implementation can be merged into our atomic_enable implementation to simplify things, so let's do this. Signed-off-by: Maxime Ripard Acked-by: Jernej Skrabec diff --git a/drivers/gpu/drm/sun4i/sun4i_tv.c b/drivers/gpu/drm/sun4i/sun4i_tv.c index f7aad995ab5b..3944da9a3c34 100644 --- a/drivers/gpu/drm/sun4i/sun4i_tv.c +++ b/drivers/gpu/drm/sun4i/sun4i_tv.c @@ -359,23 +359,13 @@ static void sun4i_tv_enable(struct drm_encoder *encoder, { struct sun4i_tv *tv = drm_encoder_to_sun4i_tv(encoder); struct sun4i_crtc *crtc = drm_crtc_to_sun4i_crtc(encoder->crtc); - - DRM_DEBUG_DRIVER("Enabling the TV Output\n"); - - sunxi_engine_apply_color_correction(crtc->engine); - - regmap_update_bits(tv->regs, SUN4I_TVE_EN_REG, - SUN4I_TVE_EN_ENABLE, - SUN4I_TVE_EN_ENABLE); -} - -static void sun4i_tv_mode_set(struct drm_encoder *encoder, - struct drm_display_mode *mode, - struct drm_display_mode *adjusted_mode) -{ - struct sun4i_tv *tv = drm_encoder_to_sun4i_tv(encoder); + struct drm_crtc_state *crtc_state = + drm_atomic_get_new_crtc_state(state, encoder->crtc); + struct drm_display_mode *mode = &crtc_state->mode; const struct tv_mode *tv_mode = sun4i_tv_find_tv_by_mode(mode); + DRM_DEBUG_DRIVER("Enabling the TV Output\n"); + /* Enable and map the DAC to the output */ regmap_update_bits(tv->regs, SUN4I_TVE_EN_REG, SUN4I_TVE_EN_DAC_MAP_MASK, @@ -468,12 +458,17 @@ static void sun4i_tv_mode_set(struct drm_encoder *encoder, SUN4I_TVE_RESYNC_FIELD : 0)); regmap_write(tv->regs, SUN4I_TVE_SLAVE_REG, 0); + + sunxi_engine_apply_color_correction(crtc->engine); + + regmap_update_bits(tv->regs, SUN4I_TVE_EN_REG, + SUN4I_TVE_EN_ENABLE, + SUN4I_TVE_EN_ENABLE); } static const struct drm_encoder_helper_funcs sun4i_tv_helper_funcs = { .atomic_disable = sun4i_tv_disable, .atomic_enable = sun4i_tv_enable, - .mode_set = sun4i_tv_mode_set, }; static int sun4i_tv_comp_get_modes(struct drm_connector *connector)