Merge airlied/drm-next into drm-misc-next

Backmerge the main pull request to sync up with all the newly landed
drivers. Otherwise we'll have chaos even before 4.12 started in
earnest.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/cik.c b/drivers/gpu/drm/amd/amdgpu/cik.c
index 7da688b0d27d..c4d4b35e54ec 100644
--- a/drivers/gpu/drm/amd/amdgpu/cik.c
+++ b/drivers/gpu/drm/amd/amdgpu/cik.c
@@ -1176,6 +1176,7 @@ static int cik_gpu_pci_config_reset(struct amdgpu_device *adev)
                 if (RREG32(mmCONFIG_MEMSIZE) != 0xffffffff) {
                         /* enable BM */
                         pci_set_master(adev->pdev);
+                        adev->has_hw_reset = true;
                         r = 0;
                         break;
                 }
@@ -1722,8 +1723,8 @@ static int cik_common_early_init(void *handle)
                           AMD_PG_SUPPORT_GFX_SMG |
                           AMD_PG_SUPPORT_GFX_DMG |*/
                         AMD_PG_SUPPORT_UVD |
-                        /*AMD_PG_SUPPORT_VCE |
-                          AMD_PG_SUPPORT_CP |
+                        AMD_PG_SUPPORT_VCE |
+                        /*  AMD_PG_SUPPORT_CP |
                           AMD_PG_SUPPORT_GDS |
                           AMD_PG_SUPPORT_RLC_SMU_HS |
                           AMD_PG_SUPPORT_ACP |