Merge drm-fixes into drm-next.

Nouveau wanted this to avoid some worse conflicts when I merge that.
2016-03-14 09:42:34 +10:00
parent 550e3b23a5 125234dc8b
commit 9b61c0fcdf
1064 changed files with 12863 additions and 8130 deletions
--- a/drivers/gpu/drm/amd/amdgpu/vi.c
+++ b/drivers/gpu/drm/amd/amdgpu/vi.c
@@ -1092,8 +1092,7 @@ static int vi_common_early_init(void *handle)
 	case CHIP_STONEY:
 		adev->has_uvd = true;
 		adev->cg_flags = 0;
-		/* Disable UVD pg */
-		adev->pg_flags = /* AMDGPU_PG_SUPPORT_UVD | */AMDGPU_PG_SUPPORT_VCE;
+		adev->pg_flags = 0;
 		adev->external_rev_id = adev->rev_id + 0x1;
 		break;
 	default: