diff options
| author | Dave Airlie <airlied@redhat.com> | 2013-11-21 09:42:19 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-11-21 09:42:19 +0100 |
| commit | ded5107e2a347657cdd00abb9354b62d5ab8f770 (patch) | |
| tree | c75df42579031ed756dc25f8969aff5ee5b94cda /drivers/net/can/sja1000/ems_pci.c | |
| parent | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/pow... (diff) | |
| parent | drm/radeon: hook up backlight functions for CI and KV family. (diff) | |
| download | linux-ded5107e2a347657cdd00abb9354b62d5ab8f770.tar.xz linux-ded5107e2a347657cdd00abb9354b62d5ab8f770.zip | |
Merge branch 'drm-next-3.13' of git://people.freedesktop.org/~agd5f/linux into drm-fixes
More fixes for radeon. This adds new queries for tiling on CIK, and
fixes a crash in handling acpi atif backlight events on CIK.
Some fixes for radeon for 3.13. Mostly CI stability fixes. I think
I've tracked down the stability problems with dpm on Trinity/Richland,
so I'm going to enable that by default now.
* 'drm-next-3.13' of git://people.freedesktop.org/~agd5f/linux:
drm/radeon: hook up backlight functions for CI and KV family.
drm/radeon/cik: Add macrotile mode array query
drm/radeon/cik: Return backend map information to userspace
drm/radeon: enable DPM by default in TN asics
drm/radeon: adjust TN dpm parameters for stability (v2)
drm/radeon: use a single doorbell for cik kms compute
drm/radeon/vm: don't attempt to update ptes if ib allocation fails
drm/radeon: disable CIK CP semaphores for now
drm/radeon: allow semaphore emission to fail
drm/radeon: add semaphore trace point
radeon: workaround pinning failure on low ram gpu
radeon/i2c: do not count reg index in number of i2c byte we are writing.
drm/radeon: cypress_dpm: Fix unused variable warning when CONFIG_ACPI=n
drm: radeon: ni_dpm: Fix unused variable warning when CONFIG_ACPI=n
Diffstat (limited to 'drivers/net/can/sja1000/ems_pci.c')
0 files changed, 0 insertions, 0 deletions