From: Dave Airlie <airlied@redhat.com>
Date: Mon, 20 May 2013 23:42:55 +0000 (+1000)
Subject: Merge branch 'drm-fixes-3.10-sun' of git://people.freedesktop.org/~agd5f/linux into... 
X-Git-Tag: firefly_0821_release~3680^2~442^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=cc3e06a57d4314ca0582fcf7d6b56dea5ca11f77;p=firefly-linux-kernel-4.4.55.git

Merge branch 'drm-fixes-3.10-sun' of git://people.freedesktop.org/~agd5f/linux into drm-next

This is the pull request for AMD Sun/Hainan support.  I've
split it out separately from my regular fixes stream.  Hainan
is a new SI asic with no UVD or DCE hardware.  The patches are
minimally invasive; basically just pci ids and skipping UVD and
DCE init for this family.  Most of the changes to si.c are just
the golden register tables for the family.

* 'drm-fixes-3.10-sun' of git://people.freedesktop.org/~agd5f/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
---

cc3e06a57d4314ca0582fcf7d6b56dea5ca11f77