From: Sam Ravnborg <sam@ravnborg.org>
To: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Daniel Vetter <daniel.vetter@intel.com>,
Intel Graphics Development <intel-gfx@lists.freedesktop.org>,
Tomi Valkeinen <tomi.valkeinen@ti.com>,
Jyri Sarha <jsarha@ti.com>,
DRI Development <dri-devel@lists.freedesktop.org>
Subject: Re: [PATCH 28/44] drm/tidss: Don't use drm_device->dev_private
Date: Wed, 8 Apr 2020 09:52:55 +0200 [thread overview]
Message-ID: <20200408075255.GL14965@ravnborg.org> (raw)
In-Reply-To: <20200403135828.2542770-29-daniel.vetter@ffwll.ch>
On Fri, Apr 03, 2020 at 03:58:12PM +0200, Daniel Vetter wrote:
> Upcasting using a container_of macro is more typesafe, faster and
> easier for the compiler to optimize.
>
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> Cc: Jyri Sarha <jsarha@ti.com>
> Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
> ---
> drivers/gpu/drm/tidss/tidss_crtc.c | 16 ++++++++--------
> drivers/gpu/drm/tidss/tidss_drv.c | 2 --
> drivers/gpu/drm/tidss/tidss_drv.h | 2 ++
> drivers/gpu/drm/tidss/tidss_irq.c | 12 ++++++------
> drivers/gpu/drm/tidss/tidss_kms.c | 2 +-
> drivers/gpu/drm/tidss/tidss_plane.c | 6 +++---
> 6 files changed, 20 insertions(+), 20 deletions(-)
>
> diff --git a/drivers/gpu/drm/tidss/tidss_crtc.c b/drivers/gpu/drm/tidss/tidss_crtc.c
> index d4ce9bab8c7e..2396262c09e4 100644
> --- a/drivers/gpu/drm/tidss/tidss_crtc.c
> +++ b/drivers/gpu/drm/tidss/tidss_crtc.c
> @@ -24,7 +24,7 @@
> static void tidss_crtc_finish_page_flip(struct tidss_crtc *tcrtc)
> {
> struct drm_device *ddev = tcrtc->crtc.dev;
> - struct tidss_device *tidss = ddev->dev_private;
> + struct tidss_device *tidss = to_tidss(ddev);
> struct drm_pending_vblank_event *event;
> unsigned long flags;
> bool busy;
> @@ -88,7 +88,7 @@ static int tidss_crtc_atomic_check(struct drm_crtc *crtc,
> struct drm_crtc_state *state)
> {
> struct drm_device *ddev = crtc->dev;
> - struct tidss_device *tidss = ddev->dev_private;
> + struct tidss_device *tidss = to_tidss(ddev);
> struct dispc_device *dispc = tidss->dispc;
> struct tidss_crtc *tcrtc = to_tidss_crtc(crtc);
> u32 hw_videoport = tcrtc->hw_videoport;
> @@ -165,7 +165,7 @@ static void tidss_crtc_atomic_flush(struct drm_crtc *crtc,
> {
> struct tidss_crtc *tcrtc = to_tidss_crtc(crtc);
> struct drm_device *ddev = crtc->dev;
> - struct tidss_device *tidss = ddev->dev_private;
> + struct tidss_device *tidss = to_tidss(ddev);
> unsigned long flags;
>
> dev_dbg(ddev->dev,
> @@ -216,7 +216,7 @@ static void tidss_crtc_atomic_enable(struct drm_crtc *crtc,
> {
> struct tidss_crtc *tcrtc = to_tidss_crtc(crtc);
> struct drm_device *ddev = crtc->dev;
> - struct tidss_device *tidss = ddev->dev_private;
> + struct tidss_device *tidss = to_tidss(ddev);
> const struct drm_display_mode *mode = &crtc->state->adjusted_mode;
> unsigned long flags;
> int r;
> @@ -259,7 +259,7 @@ static void tidss_crtc_atomic_disable(struct drm_crtc *crtc,
> {
> struct tidss_crtc *tcrtc = to_tidss_crtc(crtc);
> struct drm_device *ddev = crtc->dev;
> - struct tidss_device *tidss = ddev->dev_private;
> + struct tidss_device *tidss = to_tidss(ddev);
> unsigned long flags;
>
> dev_dbg(ddev->dev, "%s, event %p\n", __func__, crtc->state->event);
> @@ -295,7 +295,7 @@ enum drm_mode_status tidss_crtc_mode_valid(struct drm_crtc *crtc,
> {
> struct tidss_crtc *tcrtc = to_tidss_crtc(crtc);
> struct drm_device *ddev = crtc->dev;
> - struct tidss_device *tidss = ddev->dev_private;
> + struct tidss_device *tidss = to_tidss(ddev);
>
> return dispc_vp_mode_valid(tidss->dispc, tcrtc->hw_videoport, mode);
> }
> @@ -314,7 +314,7 @@ static const struct drm_crtc_helper_funcs tidss_crtc_helper_funcs = {
> static int tidss_crtc_enable_vblank(struct drm_crtc *crtc)
> {
> struct drm_device *ddev = crtc->dev;
> - struct tidss_device *tidss = ddev->dev_private;
> + struct tidss_device *tidss = to_tidss(ddev);
>
> dev_dbg(ddev->dev, "%s\n", __func__);
>
> @@ -328,7 +328,7 @@ static int tidss_crtc_enable_vblank(struct drm_crtc *crtc)
> static void tidss_crtc_disable_vblank(struct drm_crtc *crtc)
> {
> struct drm_device *ddev = crtc->dev;
> - struct tidss_device *tidss = ddev->dev_private;
> + struct tidss_device *tidss = to_tidss(ddev);
>
> dev_dbg(ddev->dev, "%s\n", __func__);
>
> diff --git a/drivers/gpu/drm/tidss/tidss_drv.c b/drivers/gpu/drm/tidss/tidss_drv.c
> index 7d4465d58be8..99edc66ebdef 100644
> --- a/drivers/gpu/drm/tidss/tidss_drv.c
> +++ b/drivers/gpu/drm/tidss/tidss_drv.c
> @@ -147,8 +147,6 @@ static int tidss_probe(struct platform_device *pdev)
>
> platform_set_drvdata(pdev, tidss);
>
> - ddev->dev_private = tidss;
> -
> ret = dispc_init(tidss);
> if (ret) {
> dev_err(dev, "failed to initialize dispc: %d\n", ret);
> diff --git a/drivers/gpu/drm/tidss/tidss_drv.h b/drivers/gpu/drm/tidss/tidss_drv.h
> index e2aa6436ad18..b23cd95c8d78 100644
> --- a/drivers/gpu/drm/tidss/tidss_drv.h
> +++ b/drivers/gpu/drm/tidss/tidss_drv.h
> @@ -33,6 +33,8 @@ struct tidss_device {
> struct drm_atomic_state *saved_state;
> };
>
> +#define to_tidss(__dev) container_of(__dev, struct tidss_device, ddev)
> +
> int tidss_runtime_get(struct tidss_device *tidss);
> void tidss_runtime_put(struct tidss_device *tidss);
>
> diff --git a/drivers/gpu/drm/tidss/tidss_irq.c b/drivers/gpu/drm/tidss/tidss_irq.c
> index 612c046738e5..1b80f2d62e0a 100644
> --- a/drivers/gpu/drm/tidss/tidss_irq.c
> +++ b/drivers/gpu/drm/tidss/tidss_irq.c
> @@ -23,7 +23,7 @@ static void tidss_irq_update(struct tidss_device *tidss)
> void tidss_irq_enable_vblank(struct drm_crtc *crtc)
> {
> struct drm_device *ddev = crtc->dev;
> - struct tidss_device *tidss = ddev->dev_private;
> + struct tidss_device *tidss = to_tidss(ddev);
> struct tidss_crtc *tcrtc = to_tidss_crtc(crtc);
> u32 hw_videoport = tcrtc->hw_videoport;
> unsigned long flags;
> @@ -38,7 +38,7 @@ void tidss_irq_enable_vblank(struct drm_crtc *crtc)
> void tidss_irq_disable_vblank(struct drm_crtc *crtc)
> {
> struct drm_device *ddev = crtc->dev;
> - struct tidss_device *tidss = ddev->dev_private;
> + struct tidss_device *tidss = to_tidss(ddev);
> struct tidss_crtc *tcrtc = to_tidss_crtc(crtc);
> u32 hw_videoport = tcrtc->hw_videoport;
> unsigned long flags;
> @@ -53,7 +53,7 @@ void tidss_irq_disable_vblank(struct drm_crtc *crtc)
> irqreturn_t tidss_irq_handler(int irq, void *arg)
> {
> struct drm_device *ddev = (struct drm_device *)arg;
> - struct tidss_device *tidss = ddev->dev_private;
> + struct tidss_device *tidss = to_tidss(ddev);
> unsigned int id;
> dispc_irq_t irqstatus;
>
> @@ -95,7 +95,7 @@ void tidss_irq_resume(struct tidss_device *tidss)
>
> void tidss_irq_preinstall(struct drm_device *ddev)
> {
> - struct tidss_device *tidss = ddev->dev_private;
> + struct tidss_device *tidss = to_tidss(ddev);
>
> spin_lock_init(&tidss->wait_lock);
>
> @@ -109,7 +109,7 @@ void tidss_irq_preinstall(struct drm_device *ddev)
>
> int tidss_irq_postinstall(struct drm_device *ddev)
> {
> - struct tidss_device *tidss = ddev->dev_private;
> + struct tidss_device *tidss = to_tidss(ddev);
> unsigned long flags;
> unsigned int i;
>
> @@ -138,7 +138,7 @@ int tidss_irq_postinstall(struct drm_device *ddev)
>
> void tidss_irq_uninstall(struct drm_device *ddev)
> {
> - struct tidss_device *tidss = ddev->dev_private;
> + struct tidss_device *tidss = to_tidss(ddev);
>
> tidss_runtime_get(tidss);
> dispc_set_irqenable(tidss->dispc, 0);
> diff --git a/drivers/gpu/drm/tidss/tidss_kms.c b/drivers/gpu/drm/tidss/tidss_kms.c
> index 4bd339a467a4..4b99e9fa84a5 100644
> --- a/drivers/gpu/drm/tidss/tidss_kms.c
> +++ b/drivers/gpu/drm/tidss/tidss_kms.c
> @@ -25,7 +25,7 @@
> static void tidss_atomic_commit_tail(struct drm_atomic_state *old_state)
> {
> struct drm_device *ddev = old_state->dev;
> - struct tidss_device *tidss = ddev->dev_private;
> + struct tidss_device *tidss = to_tidss(ddev);
>
> dev_dbg(ddev->dev, "%s\n", __func__);
>
> diff --git a/drivers/gpu/drm/tidss/tidss_plane.c b/drivers/gpu/drm/tidss/tidss_plane.c
> index ff99b2dd4a17..23bb3e59504b 100644
> --- a/drivers/gpu/drm/tidss/tidss_plane.c
> +++ b/drivers/gpu/drm/tidss/tidss_plane.c
> @@ -22,7 +22,7 @@ static int tidss_plane_atomic_check(struct drm_plane *plane,
> struct drm_plane_state *state)
> {
> struct drm_device *ddev = plane->dev;
> - struct tidss_device *tidss = ddev->dev_private;
> + struct tidss_device *tidss = to_tidss(ddev);
> struct tidss_plane *tplane = to_tidss_plane(plane);
> const struct drm_format_info *finfo;
> struct drm_crtc_state *crtc_state;
> @@ -101,7 +101,7 @@ static void tidss_plane_atomic_update(struct drm_plane *plane,
> struct drm_plane_state *old_state)
> {
> struct drm_device *ddev = plane->dev;
> - struct tidss_device *tidss = ddev->dev_private;
> + struct tidss_device *tidss = to_tidss(ddev);
> struct tidss_plane *tplane = to_tidss_plane(plane);
> struct drm_plane_state *state = plane->state;
> u32 hw_videoport;
> @@ -133,7 +133,7 @@ static void tidss_plane_atomic_disable(struct drm_plane *plane,
> struct drm_plane_state *old_state)
> {
> struct drm_device *ddev = plane->dev;
> - struct tidss_device *tidss = ddev->dev_private;
> + struct tidss_device *tidss = to_tidss(ddev);
> struct tidss_plane *tplane = to_tidss_plane(plane);
>
> dev_dbg(ddev->dev, "%s\n", __func__);
> --
> 2.25.1
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2020-04-08 7:53 UTC|newest]
Thread overview: 122+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-03 13:57 [PATCH 00/44] devm_drm_dev_alloc, no more drmm_add_final_kfree Daniel Vetter
2020-04-03 13:57 ` [PATCH 01/44] drivers/base: Always release devres on device_del Daniel Vetter
2020-04-03 14:17 ` Greg Kroah-Hartman
2020-04-03 14:47 ` Daniel Vetter
2020-04-03 14:51 ` Daniel Vetter
2020-04-03 15:01 ` Greg Kroah-Hartman
2020-04-03 15:06 ` Greg Kroah-Hartman
2020-04-03 15:15 ` Daniel Vetter
2020-04-03 15:33 ` Daniel Vetter
2020-04-06 12:32 ` Daniel Vetter
2020-04-06 13:38 ` Greg Kroah-Hartman
2020-04-06 13:55 ` Daniel Vetter
2020-04-28 13:15 ` Daniel Vetter
2020-05-15 12:55 ` Greg Kroah-Hartman
2020-05-15 14:05 ` Daniel Vetter
2020-04-03 13:57 ` [PATCH 02/44] drm: Add devm_drm_dev_alloc macro Daniel Vetter
2020-04-05 10:20 ` Noralf Trønnes
2020-04-06 12:00 ` Laurent Pinchart
2020-04-06 12:18 ` Daniel Vetter
2020-04-08 6:57 ` Sam Ravnborg
2020-04-08 12:11 ` Daniel Vetter
2020-04-08 18:55 ` Sam Ravnborg
2020-04-03 13:57 ` [PATCH 03/44] drm/device: Deprecate dev_private harder Daniel Vetter
2020-04-08 7:02 ` Sam Ravnborg
2020-04-14 16:43 ` Daniel Vetter
2020-04-03 13:57 ` [PATCH 04/44] drm/vgem: Use devm_drm_dev_alloc Daniel Vetter
2020-04-03 13:57 ` [PATCH 05/44] drm/vkms: " Daniel Vetter
2020-04-03 13:57 ` [PATCH 06/44] drm/vboxvideo: drop DRM_MTRR_WC #define Daniel Vetter
2020-04-08 7:03 ` Sam Ravnborg
2020-04-03 13:57 ` [PATCH 07/44] drm/vboxvideo: Use devm_drm_dev_alloc Daniel Vetter
2020-04-03 13:57 ` [PATCH 08/44] drm/vboxvideo: Stop using drm_device->dev_private Daniel Vetter
2020-04-06 11:56 ` Thomas Zimmermann
2020-04-07 7:24 ` Daniel Vetter
2020-04-08 6:33 ` Thomas Zimmermann
2020-04-08 7:19 ` Sam Ravnborg
2020-04-03 13:57 ` [PATCH 09/44] drm/vboxvidoe: use managed pci functions Daniel Vetter
2020-04-08 7:21 ` Sam Ravnborg
2020-04-14 16:30 ` Daniel Vetter
2020-04-03 13:57 ` [PATCH 10/44] drm/vboxvideo: Use devm_gen_pool_create Daniel Vetter
2020-04-08 7:24 ` Sam Ravnborg
2020-04-03 13:57 ` [PATCH 11/44] drm/v3d: Don't set drm_device->dev_private Daniel Vetter
2020-04-03 17:39 ` Eric Anholt
2020-04-03 13:57 ` [PATCH 12/44] drm/v3d: Use devm_drm_dev_alloc Daniel Vetter
2020-04-03 17:38 ` Eric Anholt
2020-04-03 13:57 ` [PATCH 13/44] drm/v3d: Delete v3d_dev->dev Daniel Vetter
2020-04-03 17:35 ` Eric Anholt
2020-04-03 13:57 ` [PATCH 14/44] drm/v3d: Delete v3d_dev->pdev Daniel Vetter
2020-04-03 17:35 ` Eric Anholt
2020-04-08 7:27 ` Sam Ravnborg
2020-04-08 12:13 ` Daniel Vetter
2020-04-03 13:57 ` [PATCH 15/44] drm/udl: Use demv_drm_dev_alloc Daniel Vetter
2020-04-05 10:18 ` Noralf Trønnes
2020-04-05 13:47 ` Daniel Vetter
2020-04-05 14:46 ` Noralf Trønnes
2020-04-06 12:05 ` Thomas Zimmermann
2020-04-03 13:58 ` [PATCH 16/44] drm/udl: don't set drm_device->dev_private Daniel Vetter
2020-04-06 11:52 ` Thomas Zimmermann
2020-04-08 7:29 ` Sam Ravnborg
2020-04-03 13:58 ` [PATCH 17/44] drm/st7735r: Use devm_drm_dev_alloc Daniel Vetter
2020-04-03 17:00 ` David Lechner
2020-04-03 13:58 ` [PATCH 18/44] drm/st7586: " Daniel Vetter
2020-04-03 17:01 ` David Lechner
2020-04-03 13:58 ` [PATCH 19/44] drm/repaper: " Daniel Vetter
2020-04-05 10:00 ` Noralf Trønnes
2020-04-03 13:58 ` [PATCH 20/44] drm/mi0283qt: " Daniel Vetter
2020-04-05 10:01 ` Noralf Trønnes
2020-04-03 13:58 ` [PATCH 21/44] drm/ili9486: " Daniel Vetter
2020-04-05 10:02 ` Noralf Trønnes
2020-04-03 13:58 ` [PATCH 22/44] drm/ili9341: " Daniel Vetter
2020-04-03 17:02 ` David Lechner
2020-04-03 13:58 ` [PATCH 23/44] drm/ili9225: " Daniel Vetter
2020-04-03 17:02 ` David Lechner
2020-04-03 13:58 ` [PATCH 24/44] drm/hx8357d: " Daniel Vetter
2020-04-03 17:38 ` Eric Anholt
2020-04-03 13:58 ` [PATCH 25/44] drm/gm12u320: " Daniel Vetter
2020-04-03 13:58 ` [PATCH 26/44] drm/gm12u320: Don't use drm_device->dev_private Daniel Vetter
2020-04-03 13:58 ` [PATCH 27/44] drm/tidss: Use devm_drm_dev_alloc Daniel Vetter
2020-04-08 7:52 ` Sam Ravnborg
2020-04-14 9:55 ` Jyri Sarha
2020-04-03 13:58 ` [PATCH 28/44] drm/tidss: Don't use drm_device->dev_private Daniel Vetter
2020-04-08 7:52 ` Sam Ravnborg [this message]
2020-04-14 9:55 ` Jyri Sarha
2020-04-03 13:58 ` [PATCH 29/44] drm/tidss: Delete tidss->saved_state Daniel Vetter
2020-04-08 7:53 ` Sam Ravnborg
2020-04-14 9:55 ` Jyri Sarha
2020-04-03 13:58 ` [PATCH 30/44] drm/qxl: Use devm_drm_dev_alloc Daniel Vetter
2020-04-06 6:55 ` Gerd Hoffmann
2020-04-06 12:11 ` Thomas Zimmermann
2020-04-07 7:19 ` Daniel Vetter
2020-04-03 13:58 ` [PATCH 31/44] drm/qxl: Don't use drm_device->dev_private Daniel Vetter
2020-04-06 6:55 ` Gerd Hoffmann
2020-04-03 13:58 ` [PATCH 32/44] drm/mcde: Use devm_drm_dev_alloc Daniel Vetter
2020-04-08 7:57 ` Sam Ravnborg
2020-04-03 13:58 ` [PATCH 33/44] drm/mcde: Don't use drm_device->dev_private Daniel Vetter
2020-04-08 7:58 ` Sam Ravnborg
2020-04-12 0:44 ` Linus Walleij
2020-04-03 13:58 ` [PATCH 34/44] drm/ingenic: Use devm_drm_dev_alloc Daniel Vetter
2020-04-08 7:59 ` Sam Ravnborg
2020-04-03 13:58 ` [PATCH 35/44] drm/ingenic: Don't set drm_device->dev_private Daniel Vetter
2020-04-08 8:00 ` Sam Ravnborg
2020-04-03 13:58 ` [PATCH 36/44] drm/komeda: use devm_drm_dev_alloc Daniel Vetter
2020-04-08 8:40 ` james qian wang (Arm Technology China)
2020-04-08 9:03 ` Daniel Vetter
2020-04-03 13:58 ` [PATCH 37/44] drm/armada: Use devm_drm_dev_alloc Daniel Vetter
2020-04-03 13:58 ` [PATCH 38/44] drm/armada: Don't use drm_device->dev_private Daniel Vetter
2020-04-03 13:58 ` [PATCH 39/44] drm/cirrus: Use devm_drm_dev_alloc Daniel Vetter
2020-04-05 10:04 ` Noralf Trønnes
2020-04-08 8:01 ` Sam Ravnborg
2020-04-03 13:58 ` [PATCH 40/44] drm/cirrus: Don't use drm_device->dev_private Daniel Vetter
2020-04-03 17:40 ` Eric Anholt
2020-04-06 11:58 ` Thomas Zimmermann
2020-04-08 8:04 ` Sam Ravnborg
2020-04-08 8:01 ` Sam Ravnborg
2020-04-03 13:58 ` [PATCH 41/44] drm/i915: Use devm_drm_dev_alloc Daniel Vetter
2020-04-03 13:58 ` [PATCH 42/44] drm/i915/selftest: Create mock_destroy_device Daniel Vetter
2020-04-03 22:31 ` [PATCH] " Daniel Vetter
2020-04-03 13:58 ` [PATCH 43/44] drm/i915/selftests: align more to real device lifetimes Daniel Vetter
2020-04-03 22:31 ` [PATCH] " Daniel Vetter
2020-04-03 13:58 ` [PATCH 44/44] drm/managed: Cleanup of unused functions and polishing docs Daniel Vetter
2020-04-05 10:29 ` Noralf Trønnes
2020-04-08 8:08 ` [PATCH 00/44] devm_drm_dev_alloc, no more drmm_add_final_kfree Sam Ravnborg
2020-04-08 12:15 ` Daniel Vetter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200408075255.GL14965@ravnborg.org \
--to=sam@ravnborg.org \
--cc=daniel.vetter@ffwll.ch \
--cc=daniel.vetter@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jsarha@ti.com \
--cc=tomi.valkeinen@ti.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).