From nobody Fri Dec 19 17:40:18 2025 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 537B0C001DC for ; Tue, 18 Jul 2023 16:55:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232562AbjGRQzx (ORCPT ); Tue, 18 Jul 2023 12:55:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58116 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232495AbjGRQzA (ORCPT ); Tue, 18 Jul 2023 12:55:00 -0400 Received: from baptiste.telenet-ops.be (baptiste.telenet-ops.be [IPv6:2a02:1800:120:4::f00:13]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D49BD1BF5 for ; Tue, 18 Jul 2023 09:54:56 -0700 (PDT) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed40:5803:2d6d:5bbc:e252]) by baptiste.telenet-ops.be with bizsmtp id Ngur2A00Y0ucMBo01gurDX; Tue, 18 Jul 2023 18:54:54 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qLnyD-001nZB-Hv; Tue, 18 Jul 2023 18:54:51 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qLnyN-000gdH-Iw; Tue, 18 Jul 2023 18:54:51 +0200 From: Geert Uytterhoeven To: Laurent Pinchart , Kieran Bingham , David Airlie , Daniel Vetter , Thomas Zimmermann , Magnus Damm Cc: linux-renesas-soc@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven , Laurent Pinchart , Sui Jingfeng Subject: [PATCH v2 27/41] drm: renesas: shmobile: Rename shmob_drm_crtc.crtc Date: Tue, 18 Jul 2023 18:54:32 +0200 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Rename the "crtc" member of the shmob_drm_crtc subclass structure to "base", to improve readability. Signed-off-by: Geert Uytterhoeven Reviewed-by: Laurent Pinchart Reviewed-by: Sui Jingfeng --- v2: - Add Reviewed-by. --- .../gpu/drm/renesas/shmobile/shmob_drm_crtc.c | 26 +++++++++---------- .../gpu/drm/renesas/shmobile/shmob_drm_crtc.h | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c b/drivers/gp= u/drm/renesas/shmobile/shmob_drm_crtc.c index 564051b505ed4ac5..84a773a5363035e0 100644 --- a/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c +++ b/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c @@ -55,7 +55,7 @@ static const struct { =20 static void shmob_drm_crtc_setup_geometry(struct shmob_drm_crtc *scrtc) { - struct drm_crtc *crtc =3D &scrtc->crtc; + struct drm_crtc *crtc =3D &scrtc->base; struct shmob_drm_device *sdev =3D to_shmob_device(crtc->dev); const struct drm_display_info *info =3D &sdev->connector->display_info; const struct drm_display_mode *mode =3D &crtc->mode; @@ -114,7 +114,7 @@ static void shmob_drm_crtc_setup_geometry(struct shmob_= drm_crtc *scrtc) =20 static void shmob_drm_crtc_start_stop(struct shmob_drm_crtc *scrtc, bool s= tart) { - struct shmob_drm_device *sdev =3D to_shmob_device(scrtc->crtc.dev); + struct shmob_drm_device *sdev =3D to_shmob_device(scrtc->base.dev); u32 value; =20 value =3D lcdc_read(sdev, LDCNT2R); @@ -147,7 +147,7 @@ static void shmob_drm_crtc_start_stop(struct shmob_drm_= crtc *scrtc, bool start) */ static void shmob_drm_crtc_start(struct shmob_drm_crtc *scrtc) { - struct drm_crtc *crtc =3D &scrtc->crtc; + struct drm_crtc *crtc =3D &scrtc->base; struct shmob_drm_device *sdev =3D to_shmob_device(crtc->dev); const struct shmob_drm_interface_data *idata =3D &sdev->pdata->iface; const struct shmob_drm_format_info *format; @@ -227,7 +227,7 @@ static void shmob_drm_crtc_start(struct shmob_drm_crtc = *scrtc) =20 static void shmob_drm_crtc_stop(struct shmob_drm_crtc *scrtc) { - struct drm_crtc *crtc =3D &scrtc->crtc; + struct drm_crtc *crtc =3D &scrtc->base; struct shmob_drm_device *sdev =3D to_shmob_device(crtc->dev); =20 if (!scrtc->started) @@ -260,7 +260,7 @@ void shmob_drm_crtc_resume(struct shmob_drm_crtc *scrtc) static void shmob_drm_crtc_compute_base(struct shmob_drm_crtc *scrtc, int x, int y) { - struct drm_crtc *crtc =3D &scrtc->crtc; + struct drm_crtc *crtc =3D &scrtc->base; struct drm_framebuffer *fb =3D crtc->primary->fb; struct drm_gem_dma_object *gem; unsigned int bpp; @@ -281,7 +281,7 @@ static void shmob_drm_crtc_compute_base(struct shmob_dr= m_crtc *scrtc, =20 static void shmob_drm_crtc_update_base(struct shmob_drm_crtc *scrtc) { - struct drm_crtc *crtc =3D &scrtc->crtc; + struct drm_crtc *crtc =3D &scrtc->base; struct shmob_drm_device *sdev =3D to_shmob_device(crtc->dev); =20 shmob_drm_crtc_compute_base(scrtc, crtc->x, crtc->y); @@ -295,7 +295,7 @@ static void shmob_drm_crtc_update_base(struct shmob_drm= _crtc *scrtc) =20 static inline struct shmob_drm_crtc *to_shmob_crtc(struct drm_crtc *crtc) { - return container_of(crtc, struct shmob_drm_crtc, crtc); + return container_of(crtc, struct shmob_drm_crtc, base); } =20 static void shmob_drm_crtc_dpms(struct drm_crtc *crtc, int mode) @@ -367,15 +367,15 @@ static const struct drm_crtc_helper_funcs crtc_helper= _funcs =3D { void shmob_drm_crtc_finish_page_flip(struct shmob_drm_crtc *scrtc) { struct drm_pending_vblank_event *event; - struct drm_device *dev =3D scrtc->crtc.dev; + struct drm_device *dev =3D scrtc->base.dev; unsigned long flags; =20 spin_lock_irqsave(&dev->event_lock, flags); event =3D scrtc->event; scrtc->event =3D NULL; if (event) { - drm_crtc_send_vblank_event(&scrtc->crtc, event); - drm_crtc_vblank_put(&scrtc->crtc); + drm_crtc_send_vblank_event(&scrtc->base, event); + drm_crtc_vblank_put(&scrtc->base); } spin_unlock_irqrestore(&dev->event_lock, flags); } @@ -387,7 +387,7 @@ static int shmob_drm_crtc_page_flip(struct drm_crtc *cr= tc, struct drm_modeset_acquire_ctx *ctx) { struct shmob_drm_crtc *scrtc =3D to_shmob_crtc(crtc); - struct drm_device *dev =3D scrtc->crtc.dev; + struct drm_device *dev =3D scrtc->base.dev; unsigned long flags; =20 spin_lock_irqsave(&dev->event_lock, flags); @@ -402,7 +402,7 @@ static int shmob_drm_crtc_page_flip(struct drm_crtc *cr= tc, =20 if (event) { event->pipe =3D 0; - drm_crtc_vblank_get(&scrtc->crtc); + drm_crtc_vblank_get(&scrtc->base); spin_lock_irqsave(&dev->event_lock, flags); scrtc->event =3D event; spin_unlock_irqrestore(&dev->event_lock, flags); @@ -454,7 +454,7 @@ static const struct drm_crtc_funcs crtc_funcs =3D { =20 int shmob_drm_crtc_create(struct shmob_drm_device *sdev) { - struct drm_crtc *crtc =3D &sdev->crtc.crtc; + struct drm_crtc *crtc =3D &sdev->crtc.base; struct drm_plane *primary, *plane; unsigned int i; int ret; diff --git a/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.h b/drivers/gp= u/drm/renesas/shmobile/shmob_drm_crtc.h index f507eaf912e16a22..79cce0a0ada4cfce 100644 --- a/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.h +++ b/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.h @@ -21,7 +21,7 @@ struct shmob_drm_device; struct shmob_drm_format_info; =20 struct shmob_drm_crtc { - struct drm_crtc crtc; + struct drm_crtc base; =20 struct drm_pending_vblank_event *event; int dpms; --=20 2.34.1