diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2021-01-07 13:02:56 +0100 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2021-01-07 13:02:57 +0100 |
commit | 73dc923eeb5dab8933ec03fecffca590923ef507 (patch) | |
tree | da2cb871fcd7229c954186861d0672ecc9746d90 /drivers/gpu/drm/drm_drv.c | |
parent | Merge tag 'drm-intel-next-2021-01-04' of git://anongit.freedesktop.org/drm/dr... (diff) | |
parent | drm: bridge: adv7511: Remove redundant null check before clk_disable_unprepare (diff) | |
download | linux-73dc923eeb5dab8933ec03fecffca590923ef507.tar.xz linux-73dc923eeb5dab8933ec03fecffca590923ef507.zip |
Merge tag 'du-next-20210105' of git://linuxtv.org/pinchartl/media into drm-next
- Add default modes for connectors in unknown state
- R-Car DU conversion to DRM-managed API
- R-Car DU miscellaneous fixes
- Miscellaneous bridge and bridge bindings fixes
- Assorted misc driver cleanups
- Constify drm_driver for PCI devices
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Link: https://patchwork.freedesktop.org/patch/msgid/X/P8IOrVXkTpLeCm@pendragon.ideasonboard.com
Diffstat (limited to 'drivers/gpu/drm/drm_drv.c')
-rw-r--r-- | drivers/gpu/drm/drm_drv.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c index ddf7eabdbf3b..d384a5b8119f 100644 --- a/drivers/gpu/drm/drm_drv.c +++ b/drivers/gpu/drm/drm_drv.c @@ -589,11 +589,7 @@ static int drm_dev_init(struct drm_device *dev, kref_init(&dev->ref); dev->dev = get_device(parent); -#ifdef CONFIG_DRM_LEGACY - dev->driver = (struct drm_driver *)driver; -#else dev->driver = driver; -#endif INIT_LIST_HEAD(&dev->managed.resources); spin_lock_init(&dev->managed.lock); |