Commit 6ae355a2 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/udl: don't set drm_device->dev_private 



We're mostly there already, just a handful of places that didn't use
the to_udl container_of cast. To make sure no new appear, don't set
->dev_private.

Reviewed-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Acked-by: default avatarSam Ravnborg <sam@ravnborg.org>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Cc: Dave Airlie <airlied@redhat.com>
Cc: Sean Paul <sean@poorly.run>
Cc: Emil Velikov <emil.l.velikov@gmail.com>
Cc: Thomas Zimmermann <tzimmermann@suse.de>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Alexios Zavras <alexios.zavras@intel.com>
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: "José Roberto de Souza" <jose.souza@intel.com>
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Allison Randal <allison@lohutok.net>
Link: https://patchwork.freedesktop.org/patch/msgid/20200415074034.175360-13-daniel.vetter@ffwll.ch
parent 50b9bbec

drivers/gpu/drm/udl/udl_connector.c

+2 −2
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ static int udl_get_modes(struct drm_connector *connector) 
static enum drm_mode_status udl_mode_valid(struct drm_connector *connector,

			  struct drm_display_mode *mode)

{

	struct udl_device *udl = connector->dev->dev_private;

	struct udl_device *udl = to_udl(connector->dev);

	if (!udl->sku_pixel_limit)

		return 0;
@@ -72,7 +72,7 @@ static enum drm_mode_status udl_mode_valid(struct drm_connector *connector, 
static enum drm_connector_status

udl_detect(struct drm_connector *connector, bool force)

{

	struct udl_device *udl = connector->dev->dev_private;

	struct udl_device *udl = to_udl(connector->dev);

	struct udl_drm_connector *udl_connector =

					container_of(connector,

					struct udl_drm_connector,

drivers/gpu/drm/udl/udl_drv.c

+0 −1
Original line number Diff line number Diff line
@@ -63,7 +63,6 @@ static struct udl_device *udl_driver_create(struct usb_interface *interface) 
		return udl;



	udl->udev = udev;

	udl->drm.dev_private = udl;



	r = udl_init(udl);

	if (r)

drivers/gpu/drm/udl/udl_modeset.c

+3 −3
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ static char *udl_dummy_render(char *wrptr) 
static int udl_crtc_write_mode_to_hw(struct drm_crtc *crtc)

{

	struct drm_device *dev = crtc->dev;

	struct udl_device *udl = dev->dev_private;

	struct udl_device *udl = to_udl(dev);

	struct urb *urb;

	char *buf;

	int retval;
@@ -369,7 +369,7 @@ udl_simple_display_pipe_enable(struct drm_simple_display_pipe *pipe, 
	struct drm_crtc *crtc = &pipe->crtc;

	struct drm_device *dev = crtc->dev;

	struct drm_framebuffer *fb = plane_state->fb;

	struct udl_device *udl = dev->dev_private;

	struct udl_device *udl = to_udl(dev);

	struct drm_display_mode *mode = &crtc_state->mode;

	char *buf;

	char *wrptr;
@@ -464,7 +464,7 @@ static const struct drm_mode_config_funcs udl_mode_funcs = { 
int udl_modeset_init(struct drm_device *dev)

{

	size_t format_count = ARRAY_SIZE(udl_simple_display_pipe_formats);

	struct udl_device *udl = dev->dev_private;

	struct udl_device *udl = to_udl(dev);

	struct drm_connector *connector;

	int ret;

CRA Git | Maintained and supported by SUSTech CRA and CCSE