OSDN Git Service

Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 4 Oct 2011 16:54:18 +0000 (09:54 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 4 Oct 2011 16:54:18 +0000 (09:54 -0700)
commit1fd2a850ecad717113cb36fa9d6e4304cd19b89d
treef900df8bb42dc465e27f036f99de9d46f9107fb6
parentf8451c3f15982ebdf71f7b5e155ade38efc5993f
parent12d5180bd7e683a4ae80830b82ba67e7b7fac7b2
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/radeon/kms: fix channel_remap setup (v2)
  drm/radeon: Set cursor x/y to 0 when x/yorigin > 0.
  drm/radeon: Update AVIVO cursor coordinate origin before x/yorigin calculation.
  drm/radeon: Simplify cursor x/yorigin calculation.
  drm/radeon/kms: fix cursor image off-by-one error
  drm/radeon/kms: Fix logic error in DP HPD handler
  drm/radeon/kms: add retry limits for native DP aux defer
  drm/radeon/kms: fix regression in DP aux defer handling