Commit dd9a6893 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/vboxvideo: Stop using drm_device->dev_private 



We use the baseclass pattern here, so lets to the proper (and more
typesafe) upcasting.

Acked-by: default avatarSam Ravnborg <sam@ravnborg.org>
Acked-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Cc: Hans de Goede <hdegoede@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200415074034.175360-5-daniel.vetter@ffwll.ch
parent 35b24eed

drivers/gpu/drm/vboxvideo/vbox_drv.c

+0 −1
Original line number Diff line number Diff line
@@ -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);

drivers/gpu/drm/vboxvideo/vbox_drv.h

+1 −0
Original line number Diff line number Diff line
@@ -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)



bool vbox_check_supported(u16 id);

int vbox_hw_init(struct vbox_private *vbox);

drivers/gpu/drm/vboxvideo/vbox_irq.c

+1 −1
Original line number Diff line number Diff line
@@ -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))

drivers/gpu/drm/vboxvideo/vbox_mode.c

+5 −5
Original line number Diff line number Diff line
@@ -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);