Linus Torvalds
988adfdffd
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux ...
Pull drm updates from Dave Airlie:
"Highlights:
- AMD KFD driver merge
This is the AMD HSA interface for exposing a lowlevel interface for
GPGPU use. They have an open source userspace built on top of this
interface, and the code looks as good as it was going to get out of
tree.
- Initial atomic modesetting work
The need for an atomic modesetting interface to allow userspace to
try and send a complete set of modesetting state to the driver has
arisen, and been suffering from neglect this past year. No more,
the start of the common code and changes for msm driver to use it
are in this tree. Ongoing work to get the userspace ioctl finished
and the code clean will probably wait until next kernel.
- DisplayID 1.3 and tiled monitor exposed to userspace.
Tiled monitor property is now exposed for userspace to make use of.
- Rockchip drm driver merged.
- imx gpu driver moved out of staging
Other stuff:
- core:
panel - MIPI DSI + new panels.
expose suggested x/y properties for virtual GPUs
- i915:
Initial Skylake (SKL) support
gen3/4 reset work
start of dri1/ums removal
infoframe tracking
fixes for lots of things.
- nouveau:
tegra k1 voltage support
GM204 modesetting support
GT21x memory reclocking work
- radeon:
CI dpm fixes
GPUVM improvements
Initial DPM fan control
- rcar-du:
HDMI support added
removed some support for old boards
slave encoder driver for Analog Devices adv7511
- exynos:
Exynos4415 SoC support
- msm:
a4xx gpu support
atomic helper conversion
- tegra:
iommu support
universal plane support
ganged-mode DSI support
- sti:
HDMI i2c improvements
- vmwgfx:
some late fixes.
- qxl:
use suggested x/y properties"
* 'drm-next' of git://people.freedesktop.org/~airlied/linux: (969 commits)
drm: sti: fix module compilation issue
drm/i915: save/restore GMBUS freq across suspend/resume on gen4
drm: sti: correctly cleanup CRTC and planes
drm: sti: add HQVDP plane
drm: sti: add cursor plane
drm: sti: enable auxiliary CRTC
drm: sti: fix delay in VTG programming
drm: sti: prepare sti_tvout to support auxiliary crtc
drm: sti: use drm_crtc_vblank_{on/off} instead of drm_vblank_{on/off}
drm: sti: fix hdmi avi infoframe
drm: sti: remove event lock while disabling vblank
drm: sti: simplify gdp code
drm: sti: clear all mixer control
drm: sti: remove gpio for HDMI hot plug detection
drm: sti: allow to change hdmi ddc i2c adapter
drm/doc: Document drm_add_modes_noedid() usage
drm/i915: Remove '& 0xffff' from the mask given to WA_REG()
drm/i915: Invert the mask and val arguments in wa_add() and WA_REG()
drm: Zero out DRM object memory upon cleanup
drm/i915/bdw: Fix the write setting up the WIZ hashing mode
...
2014-12-15 15:52:01 -08:00
drm/radeon: allow geom rings to be setup on r600/r700 (v2)
2014-02-06 12:13:52 +10:00
drm/radeon: add locking around atombios scratch space usage
2014-11-11 17:22:26 -05:00
drm/radeon: add locking around atombios scratch space usage
2014-11-11 17:22:26 -05:00
drm/radeon: atombios.h updates for hawaii
2013-11-08 12:33:45 -05:00
drm/radeon: Re-show the cursor after a modeset
2014-12-03 14:26:44 -05:00
drm/radeon: add locking around atombios scratch space usage
2014-11-11 17:22:26 -05:00
drm/radeon: consolidate duplicate encode is digital function
2014-10-01 09:00:02 -04:00
drm/radeon: add locking around atombios scratch space usage
2014-11-11 17:22:26 -05:00
drm/radeon: reduce sparse false positive warnings
2014-10-16 18:34:10 -04:00
Revert "drm/radeon: drop btc_get_max_clock_from_voltage_dependency_table"
2014-10-13 11:34:13 -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/kms: add blit support for cayman (v2)
2011-05-26 09:19:31 +10:00
drm/radeon: enable smc fan control on CI
2014-12-03 19:05:19 -05:00
drm/radeon/dpm: add thermal dpm support for CI
2014-11-20 13:00:10 -05:00
drm/radeon/cik: Add support for new ucode format (v5)
2014-08-05 08:53:24 -04:00
Linux 3.18-rc7
2014-12-02 10:58:33 +10: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 radeon <--> amdkfd interface
2014-07-15 13:53:32 +03:00
Linux 3.18-rc7
2014-12-02 10:58:33 +10:00
drm/radeon: fix typo in new fan control registers for SI/CI
2014-12-03 14:26:45 -05: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: reduce sparse false positive warnings
2014-10-16 18:34:10 -04:00
drm/radeon/dpm: add pre/post_set_power_state callback (BTC)
2013-06-27 19:16:19 -04:00
drm/radeon: fix speaker allocation setup
2014-10-16 18:34:07 -04:00
drm/radeon: fix speaker allocation setup
2014-10-16 18:34:07 -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
drm/radeon: add missing crtc unlock when setting up the MC
2014-11-06 17:41:19 -05:00
drm/radeon/kms: remove r6xx+ blit copy routines
2013-08-30 16:29:57 -04:00
drm/radeon: use pointers instead of indexes for CS chunks
2014-12-03 18:26:53 -05:00
drm/radeon: split semaphore and sync object handling v2
2014-11-20 13:00:16 -05:00
drm/radeon: fix speaker allocation setup
2014-10-16 18:34:07 -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
drm/radeon: dpm fixes for asrock systems
2014-10-28 10:44:35 -04: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: split semaphore and sync object handling v2
2014-11-20 13:00:16 -05:00
Replace mentions of "list_struct" to "list_head"
2014-11-20 14:45:15 +01:00
drm/radeon: use one VMID for each ring
2014-11-20 13:00:18 -05:00
drm/radeon: use one VMID for each ring
2014-11-20 13:00:18 -05:00
drm/radeon: reduce sparse false positive warnings
2014-10-16 18:34:10 -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: add thermal dpm support for CI
2014-11-20 13:00:10 -05:00
drm/radeon/dpm: add smc fan control for CI (v2)
2014-11-20 13:00:10 -05:00
drm/radeon: use pointers instead of indexes for CS chunks
2014-12-03 18:26:53 -05: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: rename radeon_cs_reloc to radeon_bo_list
2014-12-03 14:26:47 -05:00
drm/radeon: use pointers instead of indexes for CS chunks
2014-12-03 18:26:53 -05:00
drm/radeon: move drm_buffer to drm/radeon/
2014-09-10 17:11:21 +10:00
Fix common misspellings
2011-03-31 11:26:23 -03: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
drm/radeon: split semaphore and sync object handling v2
2014-11-20 13:00:16 -05:00
drm/radeon/kms: remove r6xx+ blit copy routines
2013-08-30 16:29:57 -04:00
The following text was taken from the original review request:
2012-03-24 10:08:39 -07: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 pointers instead of indexes for CS chunks
2014-12-03 18:26:53 -05:00
Linux 3.18-rc7
2014-12-02 10:58:33 +10:00
Linux 3.18-rc7
2014-12-02 10:58:33 +10:00
drm/radeon/dpm: add smc fan control for SI (v2)
2014-11-20 13:00:09 -05: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
drm/radeon: use pointers instead of indexes for CS chunks
2014-12-03 18:26:53 -05: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
drm/radeon: rework vm_flush parameters
2014-11-20 13:00:14 -05: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
radeon: clean up coding style differences in radeon_get_bios()
2014-10-28 10:44:34 -04: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: report disconnected for LVDS/eDP with PX if ddc fails
2014-11-26 20:56:37 -05:00
drm: Move drm_memory.c map support declarations to <drm/drm_legacy.h>
2014-09-12 15:28:12 +02:00
Linux 3.18
2014-12-08 10:33:52 +10:00
drm/radeon: Move hotspot handling out of radeon_set_cursor
2014-12-03 14:26:44 -05:00
Linux 3.18-rc7
2014-12-02 10:58:33 +10:00
drm/radeon: Use cursor_set2 hook for enabling / disabling the HW cursor
2014-11-20 11:11:41 -05: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
drm/radeon: disable native backlight control on pre-r6xx asics (v2)
2014-11-20 11:12:55 -05:00
drm/radeon: add Mullins chip family
2014-05-06 12:19:57 +02:00
drm/radeon: Hide cursor on CRTCs used by fbdev (v2)
2014-12-03 14:26:49 -05:00
drm/radeon: track VM update fences separately
2014-11-20 13:00:17 -05:00
drm/radeon: export reservation_object from dmabuf to ttm
2014-10-03 09:19:17 -04:00
drm/ttm: optionally move duplicates to a separate list
2014-12-03 18:26:52 -05:00
drm/dp: add a hw mutex around the transfer functions. (v2)
2014-06-05 09:54:29 +10:00
drm/radeon: track VM update fences separately
2014-11-20 13:00:17 -05: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
gpu/radeon: Set flag to indicate broken 64-bit MSI
2014-11-24 14:12:56 +11:00
drm/radeon: Add radeon <--> amdkfd interface
2014-07-15 13:53:32 +03:00
drm/radeon: Add radeon <--> amdkfd interface
2014-07-15 13:53:32 +03:00
Linux 3.18
2014-12-08 10:33:52 +10:00
drm/radeon: Re-show the cursor after a modeset
2014-12-03 14:26:44 -05: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: Re-show the cursor after a modeset
2014-12-03 14:26:44 -05:00
Linux 3.18
2014-12-08 10:33:52 +10:00
drm/radeon: fence PT updates manually v2
2014-11-20 13:00:16 -05: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: Use drm_malloc_ab instead of kmalloc_array
2014-10-28 10:44:34 -04:00
drm/radeon: export reservation_object from dmabuf to ttm
2014-10-03 09:19:17 -04:00
drm/radeon: split semaphore and sync object handling v2
2014-11-20 13:00:16 -05:00
drm/radeon: move drm_buffer to drm/radeon/
2014-09-10 17:11:21 +10:00
drm/radeon: track VM update fences separately
2014-11-20 13:00:17 -05:00
drm/radeon: export reservation_object from dmabuf to ttm
2014-10-03 09:19:17 -04:00
drm/radeon: use pointers instead of indexes for CS chunks
2014-12-03 18:26:53 -05:00
UAPI: (Scripted) Convert #include "..." to #include <path/...> in drivers/gpu/
2012-10-02 18:01:07 +01:00
drm/radeon: check the right ring in radeon_evict_flags()
2014-12-03 18:26:51 -05: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: use pointers instead of indexes for CS chunks
2014-12-03 18:26:53 -05:00
drm/radeon: use pointers instead of indexes for CS chunks
2014-12-03 18:26:53 -05:00
drm/radeon: add spinlock for BO_VA status protection (v2)
2014-12-03 14:26:48 -05:00
drm/radeon: Fix typo 'addr' -> 'entry' in rs400_gart_set_page
2014-09-18 21:52:29 -04:00
drm/radeon: make sure mode init is complete in bandwidth_update
2014-11-06 15:42:44 -05:00
drm/radeon/kms: add register definitions for audio
2012-04-24 09:50:13 +01:00
drm/radeon: make sure mode init is complete in bandwidth_update
2014-11-06 15:42:44 -05:00
drm/radeon: Use direct mapping for fast fb access on RS690
2013-04-09 10:31:31 -04:00
drm/radeon: reduce sparse false positive warnings
2014-10-16 18:34:10 -04: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: reduce sparse false positive warnings
2014-10-16 18:34:10 -04: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: make sure mode init is complete in bandwidth_update
2014-11-06 15:42:44 -05: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: split semaphore and sync object handling v2
2014-11-20 13:00:16 -05:00
drm/radeon: reduce sparse false positive warnings
2014-10-16 18:34:10 -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
Linux 3.18-rc7
2014-12-02 10:58:33 +10:00
The following text was taken from the original review request:
2012-03-24 10:08:39 -07:00
drm/radeon/kms: add support for CP setup on SI
2012-03-21 06:55:54 +00:00
drm/radeon: split semaphore and sync object handling v2
2014-11-20 13:00:16 -05:00
drm/radeon: fix copy paste typos in fan control for si/ci
2014-12-03 18:26:51 -05:00
drm/radeon/dpm: add smc fan control for SI (v2)
2014-11-20 13:00:09 -05: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 typo in new fan control registers for SI/CI
2014-12-03 14:26:45 -05:00
drm/radeon/dpm: add smc fan control for SI (v2)
2014-11-20 13:00:09 -05:00
drm/radeon/kms: add dpm support for KB/KV
2013-08-30 16:30:28 -04:00
drm/radeon/dpm: add smc fan control for CI (v2)
2014-11-20 13:00:10 -05:00
drm/radeon/kms: add dpm support for KB/KV
2013-08-30 16:30:28 -04:00
drm/radeon: reduce sparse false positive warnings
2014-10-16 18:34:10 -04: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: reduce sparse false positive warnings
2014-10-16 18:34:10 -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
988adfdffd