From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 21 May 2013 15:50:57 +0000 (-0700)
Subject: Merge branch 'drm-radeon-sun-hainan' of git://people.freedesktop.org/~airlied/linux
X-Git-Tag: Ubuntu-snapdragon-4.4.0-1029.32~10883
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=0ddaa974258a4cde9a06c079bfd7863644e10d31;p=mirror_ubuntu-zesty-kernel.git

Merge branch 'drm-radeon-sun-hainan' of git://people.freedesktop.org/~airlied/linux

Pull radeon sun/hainan support from  Dave Airlie:
 "Since I know its outside the merge window, but since this is new hw I
  thought I'd try and provoke the new hw exception, it just fills in the
  blanks in the driver for the new AMD sun and hainan chipsets."

* 'drm-radeon-sun-hainan' of git://people.freedesktop.org/~airlied/linux:
  drm/radeon: add Hainan pci ids
  drm/radeon: add golden register settings for Hainan (v2)
  drm/radeon: sun/hainan chips do not have UVD (v2)
  drm/radeon: track which asics have UVD
  drm/radeon: radeon-asic updates for Hainan
  drm/radeon: fill in ucode loading support for Hainan
  drm/radeon: don't touch DCE or VGA regs on Hainan (v3)
  drm/radeon: fill in GPU init for Hainan (v2)
  drm/radeon: add chip family for Hainan
---

0ddaa974258a4cde9a06c079bfd7863644e10d31