Linus Torvalds
2d65a9f48f
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux ...
Pull drm updates from Dave Airlie:
"This is the main git pull for the drm,
I pretty much froze major pulls at -rc5/6 time, and haven't had much
fallout, so will probably continue doing that.
Lots of changes all over, big internal header cleanup to make it clear
drm features are legacy things and what are things that modern KMS
drivers should be using. Also big move to use the new generic fences
in all the TTM drivers.
core:
atomic prep work,
vblank rework changes, allows immediate vblank disables
major header reworking and cleanups to better delinate legacy
interfaces from what KMS drivers should be using.
cursor planes locking fixes
ttm:
move to generic fences (affects all TTM drivers)
ppc64 caching fixes
radeon:
userptr support,
uvd for old asics,
reset rework for fence changes
better buffer placement changes,
dpm feature enablement
hdmi audio support fixes
intel:
Cherryview work,
180 degree rotation,
skylake prep work,
execlist command submission
full ppgtt prep work
cursor improvements
edid caching,
vdd handling improvements
nouveau:
fence reworking
kepler memory clock work
gt21x clock work
fan control improvements
hdmi infoframe fixes
DP audio
ast:
ppc64 fixes
caching fix
rcar:
rcar-du DT support
ipuv3:
prep work for capture support
msm:
LVDS support for mdp4, new panel, gpu refactoring
exynos:
exynos3250 SoC support, drop bad mmap interface,
mipi dsi changes, and component match support"
* 'drm-next' of git://people.freedesktop.org/~airlied/linux: (640 commits)
drm/mst: rework payload table allocation to conform better.
drm/ast: Fix HW cursor image
drm/radeon/kv: add uvd/vce info to dpm debugfs output
drm/radeon/ci: add uvd/vce info to dpm debugfs output
drm/radeon: export reservation_object from dmabuf to ttm
drm/radeon: cope with foreign fences inside the reservation object
drm/radeon: cope with foreign fences inside display
drm/core: use helper to check driver features
drm/radeon/cik: write gfx ucode version to ucode addr reg
drm/radeon/si: print full CS when we hit a packet 0
drm/radeon: remove unecessary includes
drm/radeon/combios: declare legacy_connector_convert as static
drm/radeon/atombios: declare connector convert tables as static
drm/radeon: drop btc_get_max_clock_from_voltage_dependency_table
drm/radeon/dpm: drop clk/voltage dependency filters for BTC
drm/radeon/dpm: drop clk/voltage dependency filters for CI
drm/radeon/dpm: drop clk/voltage dependency filters for SI
drm/radeon/dpm: drop clk/voltage dependency filters for NI
drm/radeon: disable audio when we disable hdmi (v2)
drm/radeon: split audio enable between eg and r600 (v2)
...
2014-10-14 09:39:08 +02:00
drm/radeon: allow geom rings to be setup on r600/r700 (v2)
2014-02-06 12:13:52 +10:00
drm/radeon/atom: initialize more atom interpretor elements to 0
2013-07-30 17:24:12 -04:00
UAPI: (Scripted) Convert #include "..." to #include <path/...> in drivers/gpu/
2012-10-02 18:01:07 +01:00
drm/radeon: atombios.h updates for hawaii
2013-11-08 12:33:45 -05:00
drm/radeon: Prevent too early kms-pageflips triggered by vblank.
2014-07-17 09:01:31 -04:00
Merge tag 'drm-intel-next-2014-09-05' of git://anongit.freedesktop.org/drm-intel into drm-next
2014-09-16 16:02:09 +10:00
drm/radeon: consolidate duplicate encode is digital function
2014-10-01 09:00:02 -04:00
drm/radeon: add a i2c bus mutex
2014-06-02 10:25:02 -04:00
drm/radeon: drop btc_get_max_clock_from_voltage_dependency_table
2014-10-01 09:00:07 -04:00
drm/radeon: drop btc_get_max_clock_from_voltage_dependency_table
2014-10-01 09:00:07 -04:00
drm/radeon/dpm: use the driver state for dpm debugfs
2014-02-06 12:22:46 -05:00
drm/radeon/kms: remove r6xx+ blit copy routines
2013-08-30 16:29:57 -04:00
drm/radeon/ci: add uvd/vce info to dpm debugfs output
2014-10-03 09:19:17 -04:00
drm/radeon/dpm: track uvd gated state for ci
2013-08-30 16:31:06 -04:00
drm/radeon/cik: Add support for new ucode format (v5)
2014-08-05 08:53:24 -04:00
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
2014-10-14 09:39:08 +02:00
drm/radeon: Add CP init for CIK (v7)
2013-06-25 17:50:28 -04:00
drm/radeon: Add CP init for CIK (v7)
2013-06-25 17:50:28 -04:00
drm/radeon: add indirect accessors for dift registers on CIK
2013-08-30 16:30:09 -04:00
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
2014-10-14 09:39:08 +02:00
drm/radeon/cik: fix typo in EOP packet
2014-07-02 14:10:19 -04:00
drm/radeon: use NULL instead of zero in clearstate headers
2014-06-02 10:25:07 -04:00
drm/radeon: use NULL instead of zero in clearstate headers
2014-06-02 10:25:07 -04:00
drm/radeon: properly set up the RLC on ON/LN/TN (v3)
2013-06-27 10:49:18 -04:00
drm/radeon: convert SI,CIK to use sumo_rlc functions
2013-08-30 16:30:08 -04:00
drm/radeon: use NULL instead of zero in clearstate headers
2014-06-02 10:25:07 -04:00
drm/radeon/dpm: fix typo in vddci setup for eg/btc
2014-07-01 12:15:17 -04:00
drm/radeon/dpm: add pre/post_set_power_state callback (BTC)
2013-06-27 19:16:19 -04:00
drm/radeon: split audio enable between eg and r600 (v2)
2014-10-01 09:00:03 -04:00
drm/radeon: split audio enable between eg and r600 (v2)
2014-10-01 09:00:03 -04:00
drm/radeon: move drm_buffer to drm/radeon/
2014-09-10 17:11:21 +10:00
drm/radeon: move drm_buffer to drm/radeon/
2014-09-10 17:11:21 +10:00
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
2014-10-14 09:39:08 +02:00
drm/radeon/kms: remove r6xx+ blit copy routines
2013-08-30 16:29:57 -04:00
drm/radeon: remove struct radeon_bo_list
2014-03-04 14:34:34 +01:00
drm/radeon: cope with foreign fences inside the reservation object
2014-10-03 09:19:16 -04:00
drm/radeon: disable audio when we disable hdmi (v2)
2014-10-01 09:00:04 -04:00
drm/radeon: Prevent too early kms-pageflips triggered by vblank.
2014-07-17 09:01:31 -04:00
drm/radeon/dpm: fix typo in EVERGREEN_SMC_FIRMWARE_HEADER_softRegisters
2014-03-06 16:46:58 -05:00
drm/radeon: Setup HDMI_CONTROL for hdmi deep color gcp's (v2)
2014-06-02 18:37:33 -04:00
drm/radeon: Deprecate UMS support v2
2013-01-31 16:24:47 -05:00
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
2014-10-14 09:39:08 +02:00
drm/radeon/dpm: handle bapm on kb/kv
2013-09-11 11:44:38 -04:00
drm/radeon/dpm: handle bapm on kb/kv
2013-09-11 11:44:38 -04:00
drm/radeon: consolidate r600_audio.c into r600_hdmi.c
2014-10-01 09:00:03 -04:00
mkregtable: Fix sscanf handling
2014-01-10 15:28:10 +01:00
drm/radeon: save/restore the PD addr on suspend/resume
2014-08-26 12:20:38 -04:00
drm/radeon: don't reset dma on NI/SI init
2014-09-18 18:57:08 -04:00
drm/radeon/dpm: drop clk/voltage dependency filters for NI
2014-10-01 09:00:04 -04:00
drm/radeon/dpm: implement vblank_too_short callback for si
2013-07-08 17:41:11 -04:00
drm/radeon: add proper support for RADEON_VM_BLOCK_SIZE v2
2014-06-02 10:25:03 -04:00
drm/radeon/kms: add dpm support for cayman (v5)
2013-06-27 19:16:10 -04:00
drm/radeon: upstream ObjectID.h updates (v2)
2013-06-26 16:11:34 -04:00
drm/radeon/dpm: handle bapm on trinity
2013-09-11 11:44:37 -04:00
drm/radeon: fix pptable.h portability
2014-01-03 11:34:21 -05:00
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
2014-10-14 09:39:08 +02:00
drm/radeon: use common next_reloc function
2013-01-31 16:24:45 -05:00
drm/radeon: consolidate redundant macros and constants
2013-01-31 16:24:46 -05:00
drm/radeon: add the infrastructure for concurrent buffer access
2014-09-11 10:46:01 -04:00
drm/radeon: Only flush HDP cache for indirect buffers from userspace
2014-08-18 17:09:44 -04:00
drm/radeon: move drm_buffer to drm/radeon/
2014-09-10 17:11:21 +10:00
drm/radeon: consolidate redundant macros and constants
2013-01-31 16:24:46 -05:00
drm/radeon: Only flush HDP cache for indirect buffers from userspace
2014-08-18 17:09:44 -04:00
drm/radeon: Bypass hw lut's for > 8 bpc framebuffer scanout.
2014-06-13 12:22:30 -04:00
drm/radeon: resume old pm late
2014-03-06 16:46:56 -05:00
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
2014-10-14 09:39:08 +02:00
drm/radeon/kms: remove r6xx+ blit copy routines
2013-08-30 16:29:57 -04:00
drm/radeon/kms: remove r6xx+ blit copy routines
2013-08-30 16:29:57 -04:00
drm: Move drm_memory.c map support declarations to <drm/drm_legacy.h>
2014-09-12 15:28:12 +02:00
drm/radeon: use helpers
2014-07-18 14:25:23 +10:00
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
2014-10-14 09:39:08 +02:00
drm/radeon/pm: don't walk the crtc list before it has been initialized (v2)
2014-04-22 16:51:19 +02:00
drm/radeon/dpm: move platform caps fetching to a separate function
2014-02-18 16:11:30 +01:00
drm/radeon: disable audio when we disable hdmi (v2)
2014-10-01 09:00:04 -04:00
drm/radeon: add indirect accessors for UVD CTX registers
2013-06-27 19:16:30 -04:00
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
2014-10-14 09:39:08 +02:00
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
2014-10-14 09:39:08 +02:00
ACPI: Clean up inclusions of ACPI header files
2013-12-07 01:03:14 +01:00
drm/radeon: implement handler for ACPI event
2012-09-20 13:10:36 -04:00
radeon: Remove useless quirk for zx1/FireGL X1 combo introduced with fdo #7770
2014-06-02 10:25:08 -04:00
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
2014-10-14 09:39:08 +02:00
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
2014-10-14 09:39:08 +02:00
drm/radeon/atombios: declare connector convert tables as static
2014-10-01 09:00:07 -04:00
ACPIPHP / radeon / nouveau: Remove acpi_bus_no_hotplug()
2014-09-15 13:15:34 -06:00
drm/radeon: export reservation_object from dmabuf to ttm
2014-10-03 09:19:17 -04:00
drm: Remove spurious ';'
2014-06-10 09:35:42 +10:00
UAPI: (Scripted) Convert #include "..." to #include <path/...> in drivers/gpu/
2012-10-02 18:01:07 +01:00
drm/radeon/combios: declare legacy_connector_convert as static
2014-10-01 09:00:08 -04:00
drm/radeon: Prevent hdmi deep color if max_tmds_clock is undefined.
2014-08-05 11:22:54 -04:00
drm: Move drm_memory.c map support declarations to <drm/drm_legacy.h>
2014-09-12 15:28:12 +02:00
drm/radeon: cope with foreign fences inside the reservation object
2014-10-03 09:19:16 -04:00
drm/radeon/cik: add hw cursor support (v2)
2013-06-26 16:11:38 -04:00
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
2014-10-14 09:39:08 +02:00
drm/radeon: cope with foreign fences inside display
2014-10-03 09:19:15 -04:00
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
2014-10-14 09:39:08 +02:00
drm: Create drm legacy driver header
2014-09-12 11:08:55 +02:00
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
2014-10-14 09:39:08 +02:00
drm/radeon: add Mullins chip family
2014-05-06 12:19:57 +02:00
drm/radeon: use container_of to resolve radeon_fbdev from drm_fb_helper
2014-09-24 12:09:25 +02:00
drm/radeon: cope with foreign fences inside the reservation object
2014-10-03 09:19:16 -04:00
drm/radeon: export reservation_object from dmabuf to ttm
2014-10-03 09:19:17 -04:00
drm/radeon: export reservation_object from dmabuf to ttm
2014-10-03 09:19:17 -04:00
drm/dp: add a hw mutex around the transfer functions. (v2)
2014-06-05 09:54:29 +10:00
drm/radeon: add the infrastructure for concurrent buffer access
2014-09-11 10:46:01 -04:00
drm: Remove DRM_ARRAY_SIZE() for ARRAY_SIZE()
2014-06-10 09:36:17 +10:00
drm: Kill DRM_COPY_(TO|FROM)_USER
2013-12-18 11:35:01 +10:00
drm/radeon: use common fence implementation for fences, v4
2014-09-01 10:22:08 +02:00
drm/radeon: add userptr support v8
2014-08-11 11:04:23 -04:00
drm: Replace crtc fb with primary plane fb (v3)
2014-04-01 20:18:28 -04:00
drm/sysfs: sort out minor and connector device object lifetimes.
2013-10-22 09:37:40 +01:00
UAPI: (Scripted) Convert #include "..." to #include <path/...> in drivers/gpu/
2012-10-02 18:01:07 +01:00
drm: Kill DRM_COPY_(TO|FROM)_USER
2013-12-18 11:35:01 +10:00
drm/ttm: flip the switch, and convert to dma_fence
2014-09-02 16:41:50 +02:00
drm/radeon: consolidate duplicate encode is digital function
2014-10-01 09:00:02 -04:00
drm/radeon: export reservation_object from dmabuf to ttm
2014-10-03 09:19:17 -04:00
drm/radeon: export reservation_object from dmabuf to ttm
2014-10-03 09:19:17 -04:00
Merge remote-tracking branch 'airlied/drm-next' into topic/vblank-rework
2014-09-11 14:46:53 +02:00
drm/radeon: export reservation_object from dmabuf to ttm
2014-10-03 09:19:17 -04:00
drm/radeon/cik: add hw cursor support (v2)
2013-06-26 16:11:38 -04:00
drm/radeon: export reservation_object from dmabuf to ttm
2014-10-03 09:19:17 -04:00
drm/radeon: export reservation_object from dmabuf to ttm
2014-10-03 09:19:17 -04:00
drm/radeon: cope with foreign fences inside the reservation object
2014-10-03 09:19:16 -04:00
drm/radeon: move drm_buffer to drm/radeon/
2014-09-10 17:11:21 +10:00
drm/radeon: export reservation_object from dmabuf to ttm
2014-10-03 09:19:17 -04:00
drm/radeon: use an intervall tree to manage the VMA v2
2014-08-05 08:53:51 -04:00
UAPI: (Scripted) Convert #include "..." to #include <path/...> in drivers/gpu/
2012-10-02 18:01:07 +01:00
drm/radeon: export reservation_object from dmabuf to ttm
2014-10-03 09:19:17 -04:00
drm/radeon: add new firmware header definitions (v3)
2014-08-05 08:53:22 -04:00
drm/radeon: add new firmware header definitions (v3)
2014-08-05 08:53:22 -04:00
drm/radeon: export reservation_object from dmabuf to ttm
2014-10-03 09:19:17 -04:00
drm/radeon: export reservation_object from dmabuf to ttm
2014-10-03 09:19:17 -04:00
drm/radeon: export reservation_object from dmabuf to ttm
2014-10-03 09:19:17 -04:00
drm/radeon: Fix typo 'addr' -> 'entry' in rs400_gart_set_page
2014-09-18 21:52:29 -04:00
drm/radeon: Pass GART page flags to radeon_gart_set_page() explicitly
2014-08-05 08:53:32 -04:00
drm/radeon: resume old pm late
2014-03-06 16:46:56 -05:00
drm/radeon: Use direct mapping for fast fb access on RS690
2013-04-09 10:31:31 -04:00
drm/radeon/dpm: move platform caps fetching to a separate function
2014-02-18 16:11:30 +01:00
drm/radeon/kms: add dpm support for rs780/rs880
2013-06-27 10:49:25 -04:00
drm/radeon/dpm: add debugfs support for RS780/RS880 (v3)
2013-07-17 16:47:52 -04:00
drm/radeon/dpm: move platform caps fetching to a separate function
2014-02-18 16:11:30 +01:00
drm/radeon/kms: add dpm support for rv6xx (v3)
2013-06-27 10:50:08 -04:00
drm/radeon/kms: add dpm support for rv6xx (v3)
2013-06-27 10:50:08 -04:00
drm/radeon: Only flush HDP cache for indirect buffers from userspace
2014-08-18 17:09:44 -04:00
drm/radeon: consolidate redundant macros and constants
2013-01-31 16:24:46 -05:00
drm/radeon/kms: add dpm support for rv7xx (v4)
2013-06-27 19:14:59 -04:00
drm/radeon/kms: add dpm support for rv7xx (v4)
2013-06-27 19:14:59 -04:00
drm/radeon/dpm/rv7xx: restructure code
2013-06-27 19:16:12 -04:00
drm/radeon/kms: add dpm support for rv7xx (v4)
2013-06-27 19:14:59 -04:00
drm/radeon: remove unecessary includes
2014-10-01 09:00:09 -04:00
drm/radeon: cope with foreign fences inside the reservation object
2014-10-03 09:19:16 -04:00
drm/radeon/dpm: Reenabling SS on Cayman
2014-07-10 17:01:30 -04:00
drm/radeon/dpm: switch on new late_enable callback
2013-12-24 17:56:50 -05:00
drm/radeon: protect concurrent smc register access with a spinlock
2013-09-11 11:44:28 -04:00
drm/radeon: protect concurrent smc register access with a spinlock
2013-09-11 11:44:28 -04:00
drm/radeon: implement pci config reset for r6xx/7xx (v3)
2014-01-08 18:42:22 -05:00
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
2014-10-14 09:39:08 +02:00
drm/radeon: cope with foreign fences inside the reservation object
2014-10-03 09:19:16 -04:00
drm/radeon/dpm: drop clk/voltage dependency filters for SI
2014-10-01 09:00:05 -04:00
drm/radeon/dpm: add support for SVI2 voltage for SI
2014-08-05 08:53:21 -04:00
drm/radeon: SI tiling fixes for display
2012-06-20 19:55:56 +01:00
drm/radeon/si: Add support for new ucode format (v3)
2014-08-05 08:53:23 -04:00
drm/radeon: fix register name to match internal name
2014-10-01 09:00:01 -04:00
drm/radeon/dpm: add support for SVI2 voltage for SI
2014-08-05 08:53:21 -04:00
drm/radeon/kms: add dpm support for KB/KV
2013-08-30 16:30:28 -04:00
drm/radeon: add dpm support for CI dGPUs (v2)
2013-08-30 16:30:29 -04:00
drm/radeon/kms: add dpm support for KB/KV
2013-08-30 16:30:28 -04:00
drm/radeon/dpm: move platform caps fetching to a separate function
2014-02-18 16:11:30 +01:00
drm/radeon/sumo add helper to go from vid7 to vid2
2013-08-30 16:30:10 -04:00
drm/radeon/dpm: make some functions static for sumo
2014-01-07 12:55:50 -05:00
drm/radeon: add dpm UVD handling for sumo asics
2013-06-27 19:15:48 -04:00
drm/radeon: add bapm module parameter
2014-08-15 00:57:27 -04:00
drm/radeon/dpm: add bapm callback for trinity
2013-09-11 11:44:39 -04:00
drm/radeon/dpm: make some functions static for TN
2014-01-07 12:55:57 -05:00
drm/radeon: add dpm UVD handling for TN asics (v2)
2013-06-27 19:15:48 -04:00
drm/radeon: enable RB_ARB before resetting the VCPU
2014-08-27 12:48:00 -04:00
drm/radeon: add UVD support for older asics v4
2014-08-27 12:47:55 -04:00
drm/radeon: allow semaphore emission to fail
2013-11-15 15:56:09 -05:00
drm/radeon: split out radeon_uvd_resume from uvd_v4_2_resume
2013-08-30 16:31:12 -04:00
drm/radeon: drop drivers copy of the rptr
2014-02-18 17:49:19 +01:00
drm/radeon: add support for vce 2.0 clock gating
2014-02-18 16:11:44 +01:00
2d65a9f48f