linux/drivers/gpu/drm/radeon/reg_srcs
Dave Airlie 34db18abd3 Merge remote branch 'intel/drm-intel-next' of ../drm-next into drm-core-next
* 'intel/drm-intel-next' of ../drm-next: (755 commits)
  drm/i915: Only wait on a pending flip if we intend to write to the buffer
  drm/i915/dp: Sanity check eDP existence
  drm/i915: Rebind the buffer if its alignment constraints changes with tiling
  drm/i915: Disable GPU semaphores by default
  drm/i915: Do not overflow the MMADDR write FIFO
  Revert "drm/i915: fix corruptions on i8xx due to relaxed fencing"
  drm/i915: Don't save/restore hardware status page address register
  drm/i915: don't store the reg value for HWS_PGA
  drm/i915: fix memory corruption with GM965 and >4GB RAM
  Linux 2.6.38-rc7
  Revert "TPM: Long default timeout fix"
  drm/i915: Re-enable GPU semaphores for SandyBridge mobile
  drm/i915: Replace vblank PM QoS with "Interrupt-Based AGPBUSY#"
  Revert "drm/i915: Use PM QoS to prevent C-State starvation of gen3 GPU"
  drm/i915: Allow relocation deltas outside of target bo
  drm/i915: Silence an innocuous compiler warning for an unused variable
  fs/block_dev.c: fix new kernel-doc warning
  ACPI: Fix build for CONFIG_NET unset
  mm: <asm-generic/pgtable.h> must include <linux/mm_types.h>
  x86: Use u32 instead of long to set reset vector back to 0
  ...

Conflicts:
	drivers/gpu/drm/i915/i915_gem.c
2011-03-14 14:15:13 +10:00
..
cayman drm/radeon/kms: cayman/evergreen cs checker updates 2011-03-03 11:57:03 +10:00
evergreen drm/radeon/kms: cayman/evergreen cs checker updates 2011-03-03 11:57:03 +10:00
r100 drm/radeon/kms: add rn50/r100/r200 CS tracker. 2009-09-08 08:54:31 +10:00
r200 drm/radeon/kms/r200: fix bug in CS parser 2010-01-21 08:17:27 +10:00
r300 drm/radeon/kms: check AA resolve registers on r300 2011-02-14 10:12:14 +10:00
r420 drm/radeon/kms: check AA resolve registers on r300 2011-02-14 10:12:14 +10:00
r600 drm/radeon/r6xx/r7xx: further safe reg clean up 2010-03-31 13:12:39 +10:00
rn50 drm/radeon/kms: add rn50/r100/r200 CS tracker. 2009-09-08 08:54:31 +10:00
rs600 drm/radeon/kms: check AA resolve registers on r300 2011-02-14 10:12:14 +10:00
rv515 drm/radeon/kms: check AA resolve registers on r300 2011-02-14 10:12:14 +10:00