diff options
author | Dave Airlie <airlied@redhat.com> | 2012-01-26 22:25:54 +0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2012-01-26 22:25:54 +0400 |
commit | c8fe74ae9a7285767cda1a053cfe806d67f77227 (patch) | |
tree | 592cf9380cf27c66f574de62febe582e1b06bfa1 /drivers/char/agp | |
parent | 9f1feed2e16652a6e599ed4a73b4c501bb3d4568 (diff) | |
parent | 93b525dccf212e50a895792d79d64bdb53312f5c (diff) | |
download | linux-c8fe74ae9a7285767cda1a053cfe806d67f77227.tar.xz |
Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~keithp/linux into drm-fixes
* 'drm-intel-fixes' of git://people.freedesktop.org/~keithp/linux: (24 commits)
drm/i915: fixup forcewake spinlock fallout in drpc debugfs function
drm/i915: debugfs: show semaphore registers also on gen7
drm/i915: allow userspace forcewake references also on gen7
drm/i915: Re-enable gen7 RC6 and GPU turbo after resume.
drm/i915: Correct debugfs printout for RC1e.
Revert "drm/i915: Work around gen7 BLT ring synchronization issues."
drm/i915: rip out the HWSTAM missed irq workaround
drm/i915: paper over missed irq issues with force wake voodoo
drm/i915: Hold gt_lock across forcewake register reads
drm/i915: Hold gt_lock during reset
drm/i915: Move reset forcewake processing to gen6_do_reset
drm/i915: protect force_wake_(get|put) with the gt_lock
drm/i915: convert force_wake_get to func pointer in the gpu reset code
drm/i915: sprite init failure on pre-SNB is not a failure
drm/i915: VBT Parser cleanup for eDP block
drm/i915: mask transcoder select bits before setting them on LVDS
drm/i915: Add Clientron E830 to the ignore LVDS list
CHROMIUM: i915: Add DMI override to skip CRT initialization on ZGB
drm/i915: handle 3rd pipe
drm/i915: simplify pipe checking
...
Diffstat (limited to 'drivers/char/agp')
0 files changed, 0 insertions, 0 deletions