linux/drivers/gpu/drm/radeon
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
..
reg_srcs drm/radeon: add WAIT_UNTIL to the non-VM safe regs list for cayman/TN 2013-01-27 22:38:44 -05:00
.gitignore
atom-bits.h
atom-names.h
atom-types.h
atom.c drm/radeon: Avoid NULL pointer dereference from atom_index_iio() allocation failure 2013-02-20 08:51:19 -05:00
atom.h UAPI: (Scripted) Convert #include "..." to #include <path/...> in drivers/gpu/ 2012-10-02 18:01:07 +01:00
atombios_crtc.c drm/radeon/dce6: fix display powergating 2013-02-05 18:01:45 -05:00
atombios_dp.c drm: extract drm_dp_max_lane_count helper 2012-10-22 22:56:43 +02:00
atombios_encoders.c drm/radeon: fix eDP clk and lane setup for scaled modes 2012-12-07 19:48:23 -05:00
atombios_i2c.c UAPI: (Scripted) Convert #include "..." to #include <path/...> in drivers/gpu/ 2012-10-02 18:01:07 +01:00
atombios.h drm/radeon/kms: upstream power table updates 2012-03-21 06:55:50 +00:00
avivod.h
cayman_blit_shaders.c bug.h: add include of it to various implicit C users 2012-02-29 17:15:08 -05:00
cayman_blit_shaders.h
evergreen_blit_kms.c UAPI: (Scripted) Convert #include "..." to #include <path/...> in drivers/gpu/ 2012-10-02 18:01:07 +01:00
evergreen_blit_shaders.c bug.h: add include of it to various implicit C users 2012-02-29 17:15:08 -05:00
evergreen_blit_shaders.h
evergreen_cs.c Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux 2013-02-25 16:46:44 -08:00
evergreen_hdmi.c drm/radeon: Use generic HDMI infoframe helpers 2013-02-22 08:20:20 +01:00
evergreen_reg.h drm/radeon: use status regs to determine what to reset (evergreen) 2013-01-31 16:24:53 -05:00
evergreen.c drm/radeon: fix multi-head power profile stability on BTC+ asics 2013-02-20 08:51:10 -05:00
evergreend.h drm/radeon: use status regs to determine what to reset (evergreen) 2013-01-31 16:24:53 -05:00
Kconfig drm/radeon: Deprecate UMS support v2 2013-01-31 16:24:47 -05:00
Makefile drm/radeon: Deprecate UMS support v2 2013-01-31 16:24:47 -05:00
mkregtable.c
ni_reg.h
ni.c drm/radeon: use IBs for VM page table updates v2 2013-02-01 13:57:10 -05:00
nid.h drm/radeon: use status regs to determine what to reset (cayman) 2013-01-31 16:24:53 -05:00
ObjectID.h drm/radeon/kms: Upstream ObjectID.h updates 2012-03-21 06:55:49 +00:00
r100_track.h drm/radeon: use common next_reloc function 2013-01-31 16:24:45 -05:00
r100.c drm/radeon: consolidate redundant macros and constants 2013-01-31 16:24:46 -05:00
r100d.h drm/radeon: consolidate redundant macros and constants 2013-01-31 16:24:46 -05:00
r200.c drm/radeon: use common next_reloc function 2013-01-31 16:24:45 -05:00
r300_cmdbuf.c drm/radeon: Deprecate UMS support v2 2013-01-31 16:24:47 -05:00
r300_reg.h
r300.c drm/radeon: consolidate redundant macros and constants 2013-01-31 16:24:46 -05:00
r300d.h drm/radeon: consolidate redundant macros and constants 2013-01-31 16:24:46 -05:00
r420.c UAPI: (Scripted) Convert #include "..." to #include <path/...> in drivers/gpu/ 2012-10-02 18:01:07 +01:00
r420d.h
r500_reg.h drm/radeon: use status regs to determine what to reset (6xx/7xx) 2013-01-31 16:24:52 -05:00
r520.c Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux 2012-10-03 23:29:23 -07:00
r520d.h
r600_audio.c UAPI: (Scripted) Convert #include "..." to #include <path/...> in drivers/gpu/ 2012-10-02 18:01:07 +01:00
r600_blit_kms.c drm/radeon: Deprecate UMS support v2 2013-01-31 16:24:47 -05:00
r600_blit_shaders.c The following text was taken from the original review request: 2012-03-24 10:08:39 -07:00
r600_blit_shaders.h Annotate int2float() as being a pure function. 2012-09-20 13:10:34 -04:00
r600_blit.c drm/radeon: Deprecate UMS support v2 2013-01-31 16:24:47 -05:00
r600_cp.c drm/radeon: Deprecate UMS support v2 2013-01-31 16:24:47 -05:00
r600_cs.c Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux 2013-02-25 16:46:44 -08:00
r600_hdmi.c drm/radeon: Use generic HDMI infoframe helpers 2013-02-22 08:20:20 +01:00
r600_reg.h drm/radeon: improve mc_stop/mc_resume on r5xx-r7xx 2012-12-12 14:34:08 -05:00
r600.c drm/radeon: switch get_gpu_clock() to a callback (v2) 2013-02-20 08:51:21 -05:00
r600d.h drm/radeon: use status regs to determine what to reset (6xx/7xx) 2013-01-31 16:24:52 -05:00
radeon_acpi.c drm/radeon: fix compilation with backlight disabled 2012-10-15 13:21:00 -04:00
radeon_acpi.h drm/radeon: implement handler for ACPI event 2012-09-20 13:10:36 -04:00
radeon_agp.c radeon: add AGPMode 1 quirk for RV250 2012-11-20 11:47:32 -05:00
radeon_asic.c drm/radeon: switch get_gpu_clock() to a callback (v2) 2013-02-20 08:51:21 -05:00
radeon_asic.h drm/radeon: switch get_gpu_clock() to a callback (v2) 2013-02-20 08:51:21 -05:00
radeon_atombios.c Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux 2012-10-03 23:29:23 -07:00
radeon_atpx_handler.c drm/radeon: properly validate the atpx interface 2013-02-20 08:51:21 -05:00
radeon_benchmark.c drm/radeon: remove radeon_fence_create 2012-06-21 09:38:35 +02:00
radeon_bios.c UAPI: (Scripted) Convert #include "..." to #include <path/...> in drivers/gpu/ 2012-10-02 18:01:07 +01:00
radeon_blit_common.h drm/radeon/kms: common definitions for blit copy code 2012-02-03 09:31:14 +00:00
radeon_clocks.c UAPI: (Scripted) Convert #include "..." to #include <path/...> in drivers/gpu/ 2012-10-02 18:01:07 +01:00
radeon_combios.c drm/radeon: add quirk for RV100 board 2013-01-29 16:40:55 -05:00
radeon_connectors.c drm/radeon: Properly handle DDC probe for DP bridges 2013-01-03 15:04:38 -05:00
radeon_cp.c drm/radeon: Deprecate UMS support v2 2013-01-31 16:24:47 -05:00
radeon_cs.c drm/radeon: use IBs for VM page table updates v2 2013-02-01 13:57:10 -05:00
radeon_cursor.c Merge branch 'fbcon-locking-fixes' of ssh://people.freedesktop.org/~airlied/linux into drm-next 2013-02-08 12:10:18 +10:00
radeon_device.c Merge branch 'drm-next-3.9' of git://people.freedesktop.org/~agd5f/linux into drm-next 2013-02-21 07:15:16 +10:00
radeon_display.c Merge branch 'fbcon-locking-fixes' of ssh://people.freedesktop.org/~airlied/linux into drm-next 2013-02-08 12:10:18 +10:00
radeon_drv.c drm/radeon: use prime helpers 2013-02-08 13:48:43 +10:00
radeon_drv.h drm/radeon: Deprecate UMS support v2 2013-01-31 16:24:47 -05:00
radeon_encoders.c Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux 2012-10-03 23:29:23 -07:00
radeon_family.h drm/radeon: add Oland chip family 2013-02-01 19:34:23 -05:00
radeon_fb.c drm/<drivers>: simplify ->fb_probe callback 2013-02-14 00:07:58 +01:00
radeon_fence.c drm/radeon: avoid deadlock in pm path when waiting for fence 2012-12-19 17:44:05 -05:00
radeon_gart.c drm/radeon: use IBs for VM page table updates v2 2013-02-01 13:57:10 -05:00
radeon_gem.c drm/radeon: move the retry to gem_object_create 2012-10-24 11:41:56 -04:00
radeon_i2c.c drm/radeon: Properly handle DDC probe for DP bridges 2013-01-03 15:04:38 -05:00
radeon_ioc32.c Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux 2012-10-03 23:29:23 -07:00
radeon_irq_kms.c Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux 2012-10-03 23:29:23 -07:00
radeon_irq.c drm/radeon: Deprecate UMS support v2 2013-01-31 16:24:47 -05:00
radeon_kms.c drm/radeon: switch get_gpu_clock() to a callback (v2) 2013-02-20 08:51:21 -05:00
radeon_legacy_crtc.c DRM/radeon: For single CRTC GPUs move handling of CRTC_CRT_ON to crtc_dpms(). 2012-11-01 10:34:34 -04:00
radeon_legacy_encoders.c radeon/kms: force rn50 chip to always report connected on analog output 2013-01-10 17:05:37 -05:00
radeon_legacy_tv.c UAPI: (Scripted) Convert #include "..." to #include <path/...> in drivers/gpu/ 2012-10-02 18:01:07 +01:00
radeon_mem.c drm/radeon: Deprecate UMS support v2 2013-01-31 16:24:47 -05:00
radeon_mode.h drm/radeon: Properly handle DDC probe for DP bridges 2013-01-03 15:04:38 -05:00
radeon_object.c Revert "drm/radeon: do not move bo to different placement at each cs" 2013-01-17 13:10:50 -05:00
radeon_object.h drm/radeon: Use ttm_bo_is_reserved 2012-11-07 10:58:14 +10:00
radeon_pm.c drm/radeon: fix multi-head power profile stability on BTC+ asics 2013-02-20 08:51:10 -05:00
radeon_prime.c drm/radeon: use prime helpers 2013-02-08 13:48:43 +10:00
radeon_reg.h drm/radeon: refactor vline packet parsing function 2013-01-31 16:24:43 -05:00
radeon_ring.c drm/radeon: use IBs for VM page table updates v2 2013-02-01 13:57:10 -05:00
radeon_sa.c Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux 2012-10-03 23:29:23 -07:00
radeon_semaphore.c drm/radeon: improve semaphore debugging on lockup 2013-01-15 09:07:13 -05:00
radeon_state.c drm/radeon: Deprecate UMS support v2 2013-01-31 16:24:47 -05:00
radeon_test.c drm/radeon/kms: add support for dma rings to radeon_test_moves() 2012-12-10 16:53:47 -05:00
radeon_trace_points.c UAPI: (Scripted) Convert #include "..." to #include <path/...> in drivers/gpu/ 2012-10-02 18:01:07 +01:00
radeon_trace.h
radeon_ttm.c drm: fix compile failure by including <linux/swiotlb.h> 2013-02-15 10:19:39 +10:00
radeon.h Merge branch 'drm-next-3.9' of git://people.freedesktop.org/~agd5f/linux into drm-next 2013-02-21 07:15:16 +10:00
rs100d.h
rs400.c drm/radeon: Mark all possible functions / structs as static 2012-09-20 13:10:41 -04:00
rs400d.h
rs600.c Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux 2012-10-03 23:29:23 -07:00
rs600d.h drm/radeon/kms: add register definitions for audio 2012-04-24 09:50:13 +01:00
rs690.c Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux 2012-10-03 23:29:23 -07:00
rs690d.h
rv200d.h
rv250d.h
rv350d.h
rv515.c drm/radeon/r5xx-r7xx: wait for the MC to settle after MC blackout 2013-01-31 16:13:42 -05:00
rv515d.h drm/radeon: consolidate redundant macros and constants 2013-01-31 16:24:46 -05:00
rv770.c drm/radeon: add a asic callback to get the xclk 2013-02-20 08:51:20 -05:00
rv770d.h drm/radeon: add a asic callback to get the xclk 2013-02-20 08:51:20 -05:00
si_blit_shaders.c The following text was taken from the original review request: 2012-03-24 10:08:39 -07:00
si_blit_shaders.h drm/radeon/kms: add support for CP setup on SI 2012-03-21 06:55:54 +00:00
si_reg.h drm/radeon: SI tiling fixes for display 2012-06-20 19:55:56 +01:00
si.c drm/radeon: switch get_gpu_clock() to a callback (v2) 2013-02-20 08:51:21 -05:00
sid.h drm/radeon: add a asic callback to get the xclk 2013-02-20 08:51:20 -05:00