diff options
| author | Dave Airlie <airlied@gmail.com> | 2012-09-19 19:57:58 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@gmail.com> | 2012-09-19 19:57:58 +1000 |
| commit | f2032d413a2d47089f2b3f8fdd0e344a04de8195 (patch) | |
| tree | 3a37a701eead5d1105a5a9b0cdab9808f378665d /drivers/gpu/drm/Kconfig | |
| parent | 09e7dcf081b1100d1cdff57fa9eb25c3a834c9d6 (diff) | |
| parent | 51c1327876f35d61c8bdd81fc96e1b501c9380ee (diff) | |
Merge branch 'drm-lcdc' of git://linuxtv.org/pinchartl/fbdev into drm-next
Laurent writes:
The SH Mobile DRM driver is now (in my opinion) ready for mainline. It
requires GEM and KMS/FB helpers that have been reviewed on the list and
tested. Sascha is waiting for them to reach your tree to send a pull request
for another new driver.
* 'drm-lcdc' of git://linuxtv.org/pinchartl/fbdev:
drm: Renesas SH Mobile DRM driver
drm: Add NV24 and NV42 pixel formats
DRM: Add DRM KMS/FB CMA helper
DRM: Add DRM GEM CMA helper
drm/edid: limit printk when facing bad edid
Diffstat (limited to 'drivers/gpu/drm/Kconfig')
| -rw-r--r-- | drivers/gpu/drm/Kconfig | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig index 0cbdc458011f..18321b68b880 100644 --- a/drivers/gpu/drm/Kconfig +++ b/drivers/gpu/drm/Kconfig @@ -54,6 +54,21 @@ config DRM_TTM GPU memory types. Will be enabled automatically if a device driver uses it. +config DRM_GEM_CMA_HELPER + bool + depends on DRM + help + Choose this if you need the GEM CMA helper functions + +config DRM_KMS_CMA_HELPER + bool + select DRM_GEM_CMA_HELPER + select FB_SYS_FILLRECT + select FB_SYS_COPYAREA + select FB_SYS_IMAGEBLIT + help + Choose this if you need the KMS CMA helper functions + config DRM_TDFX tristate "3dfx Banshee/Voodoo3+" depends on DRM && PCI @@ -193,3 +208,5 @@ source "drivers/gpu/drm/ast/Kconfig" source "drivers/gpu/drm/mgag200/Kconfig" source "drivers/gpu/drm/cirrus/Kconfig" + +source "drivers/gpu/drm/shmobile/Kconfig" |