From patchwork Wed Aug 16 09:50:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 13354940 X-Patchwork-Delegate: kieran@bingham.xyz 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D4694C07E8F for ; Wed, 16 Aug 2023 10:45:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243992AbjHPKpI (ORCPT ); Wed, 16 Aug 2023 06:45:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51810 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244053AbjHPKpC (ORCPT ); Wed, 16 Aug 2023 06:45:02 -0400 Received: from andre.telenet-ops.be (andre.telenet-ops.be [IPv6:2a02:1800:120:4::f00:15]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 05FA52D60 for ; Wed, 16 Aug 2023 03:44:42 -0700 (PDT) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed40:5d0c:f209:12a7:4ce5]) by andre.telenet-ops.be with bizsmtp id aAkf2A00Q45ualL01AkfC9; Wed, 16 Aug 2023 12:44:41 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qWE0v-000orH-E4; Wed, 16 Aug 2023 12:44:39 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qWDAx-00677E-5d; Wed, 16 Aug 2023 11:50:51 +0200 From: Geert Uytterhoeven To: Laurent Pinchart , Kieran Bingham , David Airlie , Daniel Vetter , Thomas Zimmermann , Magnus Damm Cc: dri-devel@lists.freedesktop.org, linux-renesas-soc@vger.kernel.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven , Laurent Pinchart Subject: [PATCH v3 39/41] drm: renesas: shmobile: Remove internal CRTC state tracking Date: Wed, 16 Aug 2023 11:50:46 +0200 Message-Id: <481a2459557fde22107d50ebbbf7e69af0c69692.1692178020.git.geert+renesas@glider.be> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org Now the suspend/resume methods no longer need to look at internal driver state, the dpms and started fields in the shmob_drm_crtc structure can be removed, as well as the shmob_drm_crtc_dpms() wrapper. After this, shmob_drm_crtc_atomic_{en,dis}able() became just wrappers around shmob_drm_crtc_st{art,op}(), so inline the latter. Signed-off-by: Geert Uytterhoeven Reviewed-by: Laurent Pinchart --- v3: - No changes, v2: - Add Reviewed-by, - Inline shmob_drm_crtc_st{art,op}(). --- .../gpu/drm/renesas/shmobile/shmob_drm_crtc.c | 66 ++++--------------- .../gpu/drm/renesas/shmobile/shmob_drm_crtc.h | 3 - 2 files changed, 11 insertions(+), 58 deletions(-) diff --git a/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c b/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c index a176cd3e494ed2fd..e4d176b1f47654a8 100644 --- a/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c +++ b/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c @@ -191,25 +191,21 @@ static void shmob_drm_crtc_start_stop(struct shmob_drm_crtc *scrtc, bool start) } } -/* - * shmob_drm_crtc_start - Configure and start the LCDC - * @scrtc: the SH Mobile CRTC - * - * Configure and start the LCDC device. External devices (clocks, MERAM, panels, - * ...) are not touched by this function. - */ -static void shmob_drm_crtc_start(struct shmob_drm_crtc *scrtc) +static inline struct shmob_drm_crtc *to_shmob_crtc(struct drm_crtc *crtc) { - struct drm_crtc *crtc = &scrtc->base; + return container_of(crtc, struct shmob_drm_crtc, base); +} + +static void shmob_drm_crtc_atomic_enable(struct drm_crtc *crtc, + struct drm_atomic_state *state) +{ + struct shmob_drm_crtc *scrtc = to_shmob_crtc(crtc); struct shmob_drm_device *sdev = to_shmob_device(crtc->dev); const struct shmob_drm_interface_data *idata = &sdev->pdata->iface; struct device *dev = sdev->dev; u32 value; int ret; - if (scrtc->started) - return; - ret = pm_runtime_resume_and_get(dev); if (ret) return; @@ -256,18 +252,14 @@ static void shmob_drm_crtc_start(struct shmob_drm_crtc *scrtc) /* Turn vertical blank interrupt reporting back on. */ drm_crtc_vblank_on(crtc); - - scrtc->started = true; } -static void shmob_drm_crtc_stop(struct shmob_drm_crtc *scrtc) +static void shmob_drm_crtc_atomic_disable(struct drm_crtc *crtc, + struct drm_atomic_state *state) { - struct drm_crtc *crtc = &scrtc->base; + struct shmob_drm_crtc *scrtc = to_shmob_crtc(crtc); struct shmob_drm_device *sdev = to_shmob_device(crtc->dev); - if (!scrtc->started) - return; - /* * Disable vertical blank interrupt reporting. We first need to wait * for page flip completion before stopping the CRTC as userspace @@ -283,28 +275,6 @@ static void shmob_drm_crtc_stop(struct shmob_drm_crtc *scrtc) lcdc_write(sdev, LDCNT1R, 0); pm_runtime_put(sdev->dev); - - scrtc->started = false; -} - -static inline struct shmob_drm_crtc *to_shmob_crtc(struct drm_crtc *crtc) -{ - return container_of(crtc, struct shmob_drm_crtc, base); -} - -static void shmob_drm_crtc_dpms(struct drm_crtc *crtc, int mode) -{ - struct shmob_drm_crtc *scrtc = to_shmob_crtc(crtc); - - if (scrtc->dpms == mode) - return; - - if (mode == DRM_MODE_DPMS_ON) - shmob_drm_crtc_start(scrtc); - else - shmob_drm_crtc_stop(scrtc); - - scrtc->dpms = mode; } static void shmob_drm_crtc_atomic_flush(struct drm_crtc *crtc, @@ -323,18 +293,6 @@ static void shmob_drm_crtc_atomic_flush(struct drm_crtc *crtc, } } -static void shmob_drm_crtc_atomic_enable(struct drm_crtc *crtc, - struct drm_atomic_state *state) -{ - shmob_drm_crtc_dpms(crtc, DRM_MODE_DPMS_ON); -} - -static void shmob_drm_crtc_atomic_disable(struct drm_crtc *crtc, - struct drm_atomic_state *state) -{ - shmob_drm_crtc_dpms(crtc, DRM_MODE_DPMS_OFF); -} - static const struct drm_crtc_helper_funcs crtc_helper_funcs = { .atomic_flush = shmob_drm_crtc_atomic_flush, .atomic_enable = shmob_drm_crtc_atomic_enable, @@ -424,8 +382,6 @@ int shmob_drm_crtc_create(struct shmob_drm_device *sdev) init_waitqueue_head(&sdev->crtc.flip_wait); - sdev->crtc.dpms = DRM_MODE_DPMS_OFF; - primary = shmob_drm_plane_create(sdev, DRM_PLANE_TYPE_PRIMARY, 0); if (IS_ERR(primary)) return PTR_ERR(primary); diff --git a/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.h b/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.h index 37380c815f1f5a08..89a0746f9a35807d 100644 --- a/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.h +++ b/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.h @@ -27,9 +27,6 @@ struct shmob_drm_crtc { struct drm_pending_vblank_event *event; wait_queue_head_t flip_wait; - int dpms; - - bool started; }; struct shmob_drm_connector {