mirror of
https://github.com/torvalds/linux
synced 2024-10-24 20:29:05 +00:00
fffddfd6c8
Pull drm merge from Dave Airlie:
"Highlights:
- TI LCD controller KMS driver
- TI OMAP KMS driver merged from staging
- drop gma500 stub driver
- the fbcon locking fixes
- the vgacon dirty like zebra fix.
- open firmware videomode and hdmi common code helpers
- major locking rework for kms object handling - pageflip/cursor
won't block on polling anymore!
- fbcon helper and prime helper cleanups
- i915: all over the map, haswell power well enhancements, valleyview
macro horrors cleaned up, killing lots of legacy GTT code,
- radeon: CS ioctl unification, deprecated UMS support, gpu reset
rework, VM fixes
- nouveau: reworked thermal code, external dp/tmds encoder support
(anx9805), fences sleep instead of polling,
- exynos: all over the driver fixes."
Lovely conflict in radeon/evergreen_cs.c between commit de0babd60d
("drm/radeon: enforce use of radeon_get_ib_value when reading user cmd")
and the new changes that modified that evergreen_dma_cs_parse()
function.
* 'drm-next' of git://people.freedesktop.org/~airlied/linux: (508 commits)
drm/tilcdc: only build on arm
drm/i915: Revert hdmi HDP pin checks
drm/tegra: Add list of framebuffers to debugfs
drm/tegra: Fix color expansion
drm/tegra: Split DC_CMD_STATE_CONTROL register write
drm/tegra: Implement page-flipping support
drm/tegra: Implement VBLANK support
drm/tegra: Implement .mode_set_base()
drm/tegra: Add plane support
drm/tegra: Remove bogus tegra_framebuffer structure
drm: Add consistency check for page-flipping
drm/radeon: Use generic HDMI infoframe helpers
drm/tegra: Use generic HDMI infoframe helpers
drm: Add EDID helper documentation
drm: Add HDMI infoframe helpers
video: Add generic HDMI infoframe helpers
drm: Add some missing forward declarations
drm: Move mode tables to drm_edid.c
drm: Remove duplicate drm_mode_cea_vic()
gma500: Fix n, m1 and m2 clock limits for sdvo and lvds
...
26 lines
608 B
Plaintext
26 lines
608 B
Plaintext
|
|
config DRM_OMAP
|
|
tristate "OMAP DRM"
|
|
depends on DRM && !CONFIG_FB_OMAP2
|
|
depends on ARCH_OMAP2PLUS || ARCH_MULTIPLATFORM
|
|
depends on OMAP2_DSS
|
|
select DRM_KMS_HELPER
|
|
select FB_SYS_FILLRECT
|
|
select FB_SYS_COPYAREA
|
|
select FB_SYS_IMAGEBLIT
|
|
select FB_SYS_FOPS
|
|
default n
|
|
help
|
|
DRM display driver for OMAP2/3/4 based boards.
|
|
|
|
config DRM_OMAP_NUM_CRTCS
|
|
int "Number of CRTCs"
|
|
range 1 10
|
|
default 1 if ARCH_OMAP2 || ARCH_OMAP3
|
|
default 2 if ARCH_OMAP4
|
|
depends on DRM_OMAP
|
|
help
|
|
Select the number of video overlays which can be used as framebuffers.
|
|
The remaining overlays are reserved for video.
|
|
|