iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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: Thomas Zimmermann <tzimmermann@suse.de>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Daniel 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
This commit is contained in:
Daniel Vetter 2020-04-15 09:39:47 +02:00
parent 50b9bbecaa
commit 6ae355a260
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/drm/udl/udl_connector.c
View File

@ -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, static enum drm_mode_status udl_mode_valid(struct drm_connector *connector,
struct drm_display_mode *mode) 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) if (!udl->sku_pixel_limit)
return 0; return 0;
@ -72,7 +72,7 @@ static enum drm_mode_status udl_mode_valid(struct drm_connector *connector,
static enum drm_connector_status static enum drm_connector_status
udl_detect(struct drm_connector *connector, bool force) 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 = struct udl_drm_connector *udl_connector =
container_of(connector, container_of(connector,
struct udl_drm_connector, struct udl_drm_connector,

1
drivers/gpu/drm/udl/udl_drv.c
View File

@ -63,7 +63,6 @@ static struct udl_device *udl_driver_create(struct usb_interface *interface)
return udl; return udl;
udl->udev = udev; udl->udev = udev;
udl->drm.dev_private = udl;
r = udl_init(udl); r = udl_init(udl);
if (r) if (r)

6
drivers/gpu/drm/udl/udl_modeset.c
View File

@ -215,7 +215,7 @@ static char *udl_dummy_render(char *wrptr)
static int udl_crtc_write_mode_to_hw(struct drm_crtc *crtc) static int udl_crtc_write_mode_to_hw(struct drm_crtc *crtc)
{ {
struct drm_device *dev = crtc->dev; struct drm_device *dev = crtc->dev;
struct udl_device *udl = dev->dev_private; struct udl_device *udl = to_udl(dev);
struct urb *urb; struct urb *urb;
char *buf; char *buf;
int retval; 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_crtc *crtc = &pipe->crtc;
struct drm_device *dev = crtc->dev; struct drm_device *dev = crtc->dev;
struct drm_framebuffer *fb = plane_state->fb; 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; struct drm_display_mode *mode = &crtc_state->mode;
char *buf; char *buf;
char *wrptr; char *wrptr;
@ -464,7 +464,7 @@ static const struct drm_mode_config_funcs udl_mode_funcs = {
int udl_modeset_init(struct drm_device *dev) int udl_modeset_init(struct drm_device *dev)
{ {
size_t format_count = ARRAY_SIZE(udl_simple_display_pipe_formats); 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; struct drm_connector *connector;
int ret; int ret;