diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-05-04 19:56:30 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-05-04 19:56:30 -0400 |
| commit | 21daaeee9f55ee407422ad225790dee57f0d5171 (patch) | |
| tree | ab4f5a4db79fe51bf893fc901264e100a2d13bf4 /drivers/gpu/drm/fsl-dcu | |
| parent | 4946dd2e14d252cd04e188ed6a4b794541d1c3ce (diff) | |
| parent | 6d3e7fddb39a4f0a47c8042df11554bb61d7a4aa (diff) | |
Merge tag 'topic/drm-misc-2016-05-04' of git://anongit.freedesktop.org/drm-intel into drm-next
Ofc I promise just a few leftovers for drm-misc and somehow it's the
biggest pull. But really mostly trivial stuff:
- MAINTAINERS updates from Emil
- rename async to nonblock in atomic_commit to avoid the confusion between
nonblocking ioctl and async flip (= not vblank synced), from Maarten.
Needs to be regened with newer drivers, but probably only after -rc1 to
catch them all.
- actually lockless gem_object_free, plus acked driver conversion patches.
All the trickier prep stuff already is in drm-next.
- Noralf's nice work for generic defio support in our fbdev emulation.
Keeps the udl hack, and qxl is tested by Gerd.
* tag 'topic/drm-misc-2016-05-04' of git://anongit.freedesktop.org/drm-intel: (47 commits)
drm: Fixup locking WARN_ON mistake around gem_object_free_unlocked
drm/etnaviv: Use lockless gem BO free callback
drm/imx: Use lockless gem BO free callback
drm/radeon: Use lockless gem BO free callback
drm/amdgpu: Use lockless gem BO free callback
drm/gem: support BO freeing without dev->struct_mutex
MAINTAINERS: Add myself for the new VC4 (RPi GPU) graphics driver.
MAINTAINERS: Add a bunch of legacy (UMS) DRM drivers
MAINTAINERS: Add a few DRM drivers by Dave Airlie
MAINTAINERS: List the correct git repo for the Renesas DRM drivers
MAINTAINERS: Update the files list for the Renesas DRM drivers
MAINTAINERS: Update the files list for the Armada DRM driver
MAINTAINERS: Update the files list for the Rockchip DRM driver
MAINTAINERS: Update the files list for the Exynos DRM driver
MAINTAINERS: Add maintainer entry for the VMWGFX DRM driver
MAINTAINERS: Add maintainer entry for the MSM DRM driver
MAINTAINERS: Add maintainer entry for the Nouveau DRM driver
MAINTAINERS: Update the files list for the Etnaviv DRM driver
MAINTAINERS: Remove unneded wildcard for the i915 DRM driver
drm/atomic: Add WARN_ON when state->acquire_ctx is not set.
...
Diffstat (limited to 'drivers/gpu/drm/fsl-dcu')
| -rw-r--r-- | drivers/gpu/drm/fsl-dcu/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/fsl-dcu/Kconfig b/drivers/gpu/drm/fsl-dcu/Kconfig index c78cf3f605d0..b9c714de6e40 100644 --- a/drivers/gpu/drm/fsl-dcu/Kconfig +++ b/drivers/gpu/drm/fsl-dcu/Kconfig | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | config DRM_FSL_DCU | 1 | config DRM_FSL_DCU |
| 2 | tristate "DRM Support for Freescale DCU" | 2 | tristate "DRM Support for Freescale DCU" |
| 3 | depends on DRM && OF && ARM | 3 | depends on DRM && OF && ARM && COMMON_CLK |
| 4 | select BACKLIGHT_CLASS_DEVICE | 4 | select BACKLIGHT_CLASS_DEVICE |
| 5 | select BACKLIGHT_LCD_SUPPORT | 5 | select BACKLIGHT_LCD_SUPPORT |
| 6 | select DRM_KMS_HELPER | 6 | select DRM_KMS_HELPER |