From: Thomas Zimmermann <tzimmermann@suse.de>
To: Daniel Vetter <daniel.vetter@ffwll.ch>,
DRI Development <dri-devel@lists.freedesktop.org>
Cc: Hans de Goede <hdegoede@redhat.com>,
Intel Graphics Development <intel-gfx@lists.freedesktop.org>,
Daniel Vetter <daniel.vetter@intel.com>
Subject: Re: [PATCH 08/44] drm/vboxvideo: Stop using drm_device->dev_private
Date: Mon, 6 Apr 2020 13:56:16 +0200 [thread overview]
Message-ID: <0e60d88e-0429-049a-b4b2-5e3b6b660bbc@suse.de> (raw)
In-Reply-To: <20200403135828.2542770-9-daniel.vetter@ffwll.ch>
[-- Attachment #1.1.1: Type: text/plain, Size: 4923 bytes --]
Hi
Am 03.04.20 um 15:57 schrieb Daniel Vetter:
> We use the baseclass pattern here, so lets to the proper (and more
> typesafe) upcasting.
>
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> Cc: Hans de Goede <hdegoede@redhat.com>
> ---
> drivers/gpu/drm/vboxvideo/vbox_drv.c | 1 -
> drivers/gpu/drm/vboxvideo/vbox_drv.h | 1 +
> drivers/gpu/drm/vboxvideo/vbox_irq.c | 2 +-
> drivers/gpu/drm/vboxvideo/vbox_mode.c | 10 +++++-----
> 4 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/vboxvideo/vbox_drv.c b/drivers/gpu/drm/vboxvideo/vbox_drv.c
> index be0600b22cf5..d34cddd809fd 100644
> --- a/drivers/gpu/drm/vboxvideo/vbox_drv.c
> +++ b/drivers/gpu/drm/vboxvideo/vbox_drv.c
> @@ -52,7 +52,6 @@ static int vbox_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
> return PTR_ERR(vbox);
>
> vbox->ddev.pdev = pdev;
> - vbox->ddev.dev_private = vbox;
> pci_set_drvdata(pdev, vbox);
> mutex_init(&vbox->hw_mutex);
>
> diff --git a/drivers/gpu/drm/vboxvideo/vbox_drv.h b/drivers/gpu/drm/vboxvideo/vbox_drv.h
> index 87421903816c..ac7c2effc46f 100644
> --- a/drivers/gpu/drm/vboxvideo/vbox_drv.h
> +++ b/drivers/gpu/drm/vboxvideo/vbox_drv.h
> @@ -127,6 +127,7 @@ struct vbox_encoder {
> #define to_vbox_crtc(x) container_of(x, struct vbox_crtc, base)
> #define to_vbox_connector(x) container_of(x, struct vbox_connector, base)
> #define to_vbox_encoder(x) container_of(x, struct vbox_encoder, base)
> +#define to_vbox_dev(x) container_of(x, struct vbox_private, ddev)
I suggest ot call this macro to to_vbox_device(). At some point, we
should rename struct vbox_private to struct vbox_device for consistency
among drivers. The new macro's name would then fit.
For the overall patch:
Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
Best regards
Thomas
>
> bool vbox_check_supported(u16 id);
> int vbox_hw_init(struct vbox_private *vbox);
> diff --git a/drivers/gpu/drm/vboxvideo/vbox_irq.c b/drivers/gpu/drm/vboxvideo/vbox_irq.c
> index 16a1e29f5292..631657fa554f 100644
> --- a/drivers/gpu/drm/vboxvideo/vbox_irq.c
> +++ b/drivers/gpu/drm/vboxvideo/vbox_irq.c
> @@ -34,7 +34,7 @@ void vbox_report_hotplug(struct vbox_private *vbox)
> irqreturn_t vbox_irq_handler(int irq, void *arg)
> {
> struct drm_device *dev = (struct drm_device *)arg;
> - struct vbox_private *vbox = (struct vbox_private *)dev->dev_private;
> + struct vbox_private *vbox = to_vbox_dev(dev);
> u32 host_flags = vbox_get_flags(vbox);
>
> if (!(host_flags & HGSMIHOSTFLAGS_IRQ))
> diff --git a/drivers/gpu/drm/vboxvideo/vbox_mode.c b/drivers/gpu/drm/vboxvideo/vbox_mode.c
> index 0883a435e62b..d9a5af62af89 100644
> --- a/drivers/gpu/drm/vboxvideo/vbox_mode.c
> +++ b/drivers/gpu/drm/vboxvideo/vbox_mode.c
> @@ -36,7 +36,7 @@ static void vbox_do_modeset(struct drm_crtc *crtc)
> u16 flags;
> s32 x_offset, y_offset;
>
> - vbox = crtc->dev->dev_private;
> + vbox = to_vbox_dev(crtc->dev);
> width = vbox_crtc->width ? vbox_crtc->width : 640;
> height = vbox_crtc->height ? vbox_crtc->height : 480;
> bpp = fb ? fb->format->cpp[0] * 8 : 32;
> @@ -77,7 +77,7 @@ static void vbox_do_modeset(struct drm_crtc *crtc)
> static int vbox_set_view(struct drm_crtc *crtc)
> {
> struct vbox_crtc *vbox_crtc = to_vbox_crtc(crtc);
> - struct vbox_private *vbox = crtc->dev->dev_private;
> + struct vbox_private *vbox = to_vbox_dev(crtc->dev);
> struct vbva_infoview *p;
>
> /*
> @@ -174,7 +174,7 @@ static void vbox_crtc_set_base_and_mode(struct drm_crtc *crtc,
> int x, int y)
> {
> struct drm_gem_vram_object *gbo = drm_gem_vram_of_gem(fb->obj[0]);
> - struct vbox_private *vbox = crtc->dev->dev_private;
> + struct vbox_private *vbox = to_vbox_dev(crtc->dev);
> struct vbox_crtc *vbox_crtc = to_vbox_crtc(crtc);
> bool needs_modeset = drm_atomic_crtc_needs_modeset(crtc->state);
>
> @@ -272,7 +272,7 @@ static void vbox_primary_atomic_update(struct drm_plane *plane,
> {
> struct drm_crtc *crtc = plane->state->crtc;
> struct drm_framebuffer *fb = plane->state->fb;
> - struct vbox_private *vbox = fb->dev->dev_private;
> + struct vbox_private *vbox = to_vbox_dev(fb->dev);
> struct drm_mode_rect *clips;
> uint32_t num_clips, i;
>
> @@ -704,7 +704,7 @@ static int vbox_get_modes(struct drm_connector *connector)
> int preferred_width, preferred_height;
>
> vbox_connector = to_vbox_connector(connector);
> - vbox = connector->dev->dev_private;
> + vbox = to_vbox_dev(connector->dev);
>
> hgsmi_report_flags_location(vbox->guest_pool, GUEST_HEAP_OFFSET(vbox) +
> HOST_FLAGS_OFFSET);
>
--
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Felix Imendörffer
[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
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-06 17:27 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 [this message]
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
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=0e60d88e-0429-049a-b4b2-5e3b6b660bbc@suse.de \
--to=tzimmermann@suse.de \
--cc=daniel.vetter@ffwll.ch \
--cc=daniel.vetter@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=hdegoede@redhat.com \
--cc=intel-gfx@lists.freedesktop.org \
/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).