diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-06-23 21:01:17 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-06-23 21:01:17 -0400 |
| commit | 9253d0590ef17b4ef2167a66ad500c51b2d61610 (patch) | |
| tree | edb4a088e8df95c9da2f7ea0679fb978e22dcaa0 /drivers/gpu/drm/omapdrm/omap_fbdev.c | |
| parent | 4b01ec97808bd897fc91dfbaac63747528d74680 (diff) | |
| parent | f510f34c12f65105146ace5561969e5003f6c007 (diff) | |
Merge tag 'topic/drm-misc-2016-06-22-updated' of git://anongit.freedesktop.org/drm-intel into drm-next
Again a pile of things all over
- Conversion to rst from docbook from Jani. Looks real pretty, and the
source is now actually readable (compared to horrible, horrible docbook
xml)! https://01.org/linuxgraphics/gfx-docs/drm/
- device register/unregister rework from Chris, with follow-up work from
Benjamin. Allows more drivers to demidlayer load/unload and others to
remove a bit of boilerplate.
- master/auth related cleanup, with docs
- some dma-buf polish, merged by Sumit
- small stuff all over (like build fixes from Arnd)
Group maintainership seems to slowly take off, with both Thierry and Sumit
pushing a few things. No hiccups thus far.
* tag 'topic/drm-misc-2016-06-22-updated' of git://anongit.freedesktop.org/drm-intel: (68 commits)
drm/vc4: Remove unused connector
drm/fb-helper: Reduce READ_ONCE(master) to lockless_dereference
drm/sun4i: Remove open-coded drm_connector_register_all()
drm/vc4: Remove open-coded drm_connector_register_all()
drm/atmel-hlcdc: Remove redundant call to drm_connector_unregister_all()
drm: document drm_auth.c
drm: Clear up master tracking booleans
drm: Extract drm_is_current_master
drm: Refactor drop/set master code a bit
drm: Lobotomize set_busid nonsense for !pci drivers
drm: Nuke SET_UNIQUE ioctl
drm: Don't call drm_dev_set_unique from platform drivers
drm/vgem: Stop calling drm_drv_set_unique
drm: Use dev->name as fallback for dev->unique
drm: Clean up drm_crtc.h
drm: Move master pointer from drm_minor to drm_device
drm: sti: rework init sequence
drm: sti: use late_register and early_unregister callbacks
drm/amdkfd: Clean up inline handling
drm: Add callbacks for late registering
...
Diffstat (limited to 'drivers/gpu/drm/omapdrm/omap_fbdev.c')
| -rw-r--r-- | drivers/gpu/drm/omapdrm/omap_fbdev.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/gpu/drm/omapdrm/omap_fbdev.c b/drivers/gpu/drm/omapdrm/omap_fbdev.c index 31dfa0893416..adb10fbe918d 100644 --- a/drivers/gpu/drm/omapdrm/omap_fbdev.c +++ b/drivers/gpu/drm/omapdrm/omap_fbdev.c | |||
| @@ -279,9 +279,6 @@ struct drm_fb_helper *omap_fbdev_init(struct drm_device *dev) | |||
| 279 | if (ret) | 279 | if (ret) |
| 280 | goto fini; | 280 | goto fini; |
| 281 | 281 | ||
| 282 | /* disable all the possible outputs/crtcs before entering KMS mode */ | ||
| 283 | drm_helper_disable_unused_functions(dev); | ||
| 284 | |||
| 285 | ret = drm_fb_helper_initial_config(helper, 32); | 282 | ret = drm_fb_helper_initial_config(helper, 32); |
| 286 | if (ret) | 283 | if (ret) |
| 287 | goto fini; | 284 | goto fini; |
