linux-sg2042/drivers/video/console
Linus Torvalds fffddfd6c8 Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
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
  ...
2013-02-25 16:46:44 -08:00
..
Kconfig drivers/video/console: remove depends on CONFIG_EXPERIMENTAL 2013-01-21 14:52:45 -08:00
Makefile sparc: Kill PROM console driver. 2009-09-15 17:04:38 -07:00
bitblit.c fbcon: Fix bit_putcs() call to kmalloc(s, GFP_KERNEL) 2012-08-23 12:29:32 +00:00
dummycon.c
fbcon.c Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux 2013-02-25 16:46:44 -08:00
fbcon.h fb: add hooks to handle KDB enter/exit 2010-08-05 09:22:31 -05:00
fbcon_ccw.c fbcon: uninline four foo_update_attr() functions 2010-08-11 08:59:09 -07:00
fbcon_cw.c fbcon: uninline four foo_update_attr() functions 2010-08-11 08:59:09 -07:00
fbcon_rotate.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
fbcon_rotate.h fbcon: fix rotate upside down crash 2009-08-07 10:39:55 -07:00
fbcon_ud.c fbcon: uninline four foo_update_attr() functions 2010-08-11 08:59:09 -07:00
font_6x11.c
font_7x14.c
font_8x8.c
font_8x16.c
font_10x18.c
font_acorn_8x8.c
font_mini_4x6.c drivers: console: font_: Change a glyph from "broken bar" to "vertical line" 2012-09-22 21:14:22 +00:00
font_pearl_8x8.c
font_sun8x16.c drivers: console: font_: Change a glyph from "broken bar" to "vertical line" 2012-09-22 21:14:22 +00:00
font_sun12x22.c
fonts.c
mdacon.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
newport_con.c VIDEO: Newport Fix console crashes 2012-12-13 18:15:29 +01:00
softcursor.c drivers/video/console/softcursor.c: remove redundant NULL check before kfree() 2012-12-10 11:33:53 +02:00
sticon.c Revert "vt: fix background color on line feed" 2008-10-14 12:12:02 -07:00
sticore.c Drivers: video: remove __dev* attributes. 2013-01-03 15:57:01 -08:00
tileblit.c fbcon: Bugfix soft cursor detection in Tile Blitting 2011-03-22 16:41:08 +09:00
vgacon.c vgacon/vt: clear buffer attributes when we load a 512 character font (v2) 2013-02-07 12:37:03 +10:00