[git pull] drm radeon + nouveau fixes

Dave Airlie airlied at linux.ie
Thu Nov 8 21:36:34 PST 2012


Hi Linus,

just radeon and nouveau, mostly regressions fixers, and a couple of radeon 
register checker fixes.

Dave.

The following changes since commit 695ddeb457584a602f2ba117d08ce37cf6ec1589:

  drm/radeon: fix typo in evergreen_mc_resume() (2012-11-07 10:53:49 +1000)

are available in the git repository at:

  git://people.freedesktop.org/~airlied/linux drm-fixes

for you to fetch changes up to 4a48ed2334b7ae61dd11bb114fa35bd4ebdc1ca0:

  Merge branch 'drm-nouveau-fixes' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes (2012-11-09 14:57:02 +1000)

----------------------------------------------------------------

Alex Deucher (3):
      drm/radeon/dce3: switch back to old pll allocation order for discrete
      drm/radeon/cayman: add some missing regs to the VM reg checker
      drm/radeon/si: add some missing regs to the VM reg checker

Dave Airlie (2):
      Merge branch 'drm-fixes-3.7' of git://people.freedesktop.org/~agd5f/linux into drm-fixes
      Merge branch 'drm-nouveau-fixes' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes

Kelly Doran (1):
      drm/nvc0/disp: fix regression in vblank semaphore release

Maarten Lankhorst (1):
      drm/nouveau: fix acpi edid retrieval

Marcin Slusarz (3):
      drm/nv41/vm: fix typo in type name
      drm/nv40/graph: fix typo in type names
      drm/nv40/mpeg: fix context handling

 drivers/gpu/drm/nouveau/core/engine/disp/nv50.c  | 20 +++++----
 drivers/gpu/drm/nouveau/core/engine/graph/nv40.c |  4 +-
 drivers/gpu/drm/nouveau/core/engine/mpeg/nv40.c  |  2 +-
 drivers/gpu/drm/nouveau/core/subdev/vm/nv41.c    |  2 +-
 drivers/gpu/drm/nouveau/nouveau_connector.c      |  2 +-
 drivers/gpu/drm/radeon/atombios_crtc.c           | 54 ++++++++++++++----------
 drivers/gpu/drm/radeon/evergreen_cs.c            |  3 ++
 drivers/gpu/drm/radeon/evergreend.h              |  4 ++
 drivers/gpu/drm/radeon/si.c                      |  1 +
 drivers/gpu/drm/radeon/sid.h                     |  1 +
 10 files changed, 57 insertions(+), 36 deletions(-)


More information about the dri-devel mailing list