diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-12-13 22:23:18 +0100 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-12-13 22:23:18 +0100 |
| commit | 010f5b9f0d44f73943e0b63d7f4362af227ae2ea (patch) | |
| tree | 4dc737ec6bda0af04098ecaa5d1863780fcdd6e6 /drivers/gpu/drm/radeon/si.c | |
| parent | de7b6be7f3009fef47a2ca0df237a055147b6d25 (diff) | |
| parent | 2cf026ae85c42f253feb9f420d1b4bc99bd5503d (diff) | |
Merge tag 'drm-for-v4.10' of git://people.freedesktop.org/~airlied/linux into drm-misc-next
Main pull request for drm for 4.10 kernel - resync drm-misc with full
4.10 state (2 new drivers) so that we can start pulling in all the
refactorings for 4.11!
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/si.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/si.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c index 143280dc0851..ad4d7b8b8322 100644 --- a/drivers/gpu/drm/radeon/si.c +++ b/drivers/gpu/drm/radeon/si.c @@ -1714,6 +1714,7 @@ static int si_init_microcode(struct radeon_device *rdev) (rdev->pdev->revision == 0x80) || (rdev->pdev->revision == 0x81) || (rdev->pdev->revision == 0x83) || + (rdev->pdev->revision == 0x87) || (rdev->pdev->device == 0x6604) || (rdev->pdev->device == 0x6605)) new_smc = true; |