Merge tag 'drm-fixes-for-v4.9-rc8' of git://people.freedesktop.org/~airlied/linux

Pull drm fixes from Dave Airlie:
 "A pretty small pull request: a couple of AMD powerxpress regression
  fixes and a power management fix, a couple of i915 fixes and one hdlcd
  fix, along with one core don't oops because of incorrect API usage fix"

* tag 'drm-fixes-for-v4.9-rc8' of git://people.freedesktop.org/~airlied/linux:
  drm/i915: drop the struct_mutex when wedged or trying to reset
  drm/i915: Don't touch NULL sg on i915_gem_object_get_pages_gtt() error
  drm: Don't call drm_for_each_crtc with a non-KMS driver
  drm/radeon: fix check for port PM availability
  drm/amdgpu: fix check for port PM availability
  drm/amd/powerplay: initialize the soft_regs offset in struct smu7_hwmgr
  drm: hdlcd: Fix cleanup order

7 files changed, 34 insertions, 13 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c
index 02ca5dd978f6..6c343a933182 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c
@@ -485,7 +485,6 @@ static int amdgpu_atpx_power_state(enum vga_switcheroo_client_id id,
  */
 static bool amdgpu_atpx_pci_probe_handle(struct pci_dev *pdev)
 {
-        struct pci_dev *parent_pdev = pci_upstream_bridge(pdev);
         acpi_handle dhandle, atpx_handle;
         acpi_status status;
 
@@ -500,7 +499,6 @@ static bool amdgpu_atpx_pci_probe_handle(struct pci_dev *pdev)
         }
         amdgpu_atpx_priv.dhandle = dhandle;
         amdgpu_atpx_priv.atpx.handle = atpx_handle;
-        amdgpu_atpx_priv.bridge_pm_usable = parent_pdev && parent_pdev->bridge_d3;
         return true;
 }
 
@@ -562,17 +560,25 @@ static bool amdgpu_atpx_detect(void)
         struct pci_dev *pdev = NULL;
         bool has_atpx = false;
         int vga_count = 0;
+        bool d3_supported = false;
+        struct pci_dev *parent_pdev;
 
         while ((pdev = pci_get_class(PCI_CLASS_DISPLAY_VGA << 8, pdev)) != NULL) {
                 vga_count++;
 
                 has_atpx |= (amdgpu_atpx_pci_probe_handle(pdev) == true);
+
+                parent_pdev = pci_upstream_bridge(pdev);
+                d3_supported |= parent_pdev && parent_pdev->bridge_d3;
         }
 
         while ((pdev = pci_get_class(PCI_CLASS_DISPLAY_OTHER << 8, pdev)) != NULL) {
                 vga_count++;
 
                 has_atpx |= (amdgpu_atpx_pci_probe_handle(pdev) == true);
+
+                parent_pdev = pci_upstream_bridge(pdev);
+                d3_supported |= parent_pdev && parent_pdev->bridge_d3;
         }
 
         if (has_atpx && vga_count == 2) {
@@ -580,6 +586,7 @@ static bool amdgpu_atpx_detect(void)
                 printk(KERN_INFO "vga_switcheroo: detected switching method %s handle\n",
                        acpi_method_name);
                 amdgpu_atpx_priv.atpx_detected = true;
+                amdgpu_atpx_priv.bridge_pm_usable = d3_supported;
                 amdgpu_atpx_init();
                 return true;
         }
diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.c b/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.c
index 4ccc0b72324d..71bb2f8dc157 100644
--- a/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.c
+++ b/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.c
@@ -2214,6 +2214,7 @@ uint32_t polaris10_get_mac_definition(uint32_t value)
 int polaris10_process_firmware_header(struct pp_hwmgr *hwmgr)
 {
         struct polaris10_smumgr *smu_data = (struct polaris10_smumgr *)(hwmgr->smumgr->backend);
+        struct smu7_hwmgr *data = (struct smu7_hwmgr *)(hwmgr->backend);
         uint32_t tmp;
         int result;
         bool error = false;
@@ -2233,8 +2234,10 @@ int polaris10_process_firmware_header(struct pp_hwmgr *hwmgr)
                         offsetof(SMU74_Firmware_Header, SoftRegisters),
                         &tmp, SMC_RAM_END);
 
-        if (!result)
+        if (!result) {
+                data->soft_regs_start = tmp;
                 smu_data->smu7_data.soft_regs_start = tmp;
+        }
 
         error |= (0 != result);
 
diff --git a/drivers/gpu/drm/arm/hdlcd_drv.c b/drivers/gpu/drm/arm/hdlcd_drv.c
index fb6a418ce6be..e138fb51e8ce 100644
--- a/drivers/gpu/drm/arm/hdlcd_drv.c
+++ b/drivers/gpu/drm/arm/hdlcd_drv.c
@@ -375,7 +375,6 @@ static int hdlcd_drm_bind(struct device *dev)
 
 err_fbdev:
         drm_kms_helper_poll_fini(drm);
-        drm_mode_config_cleanup(drm);
         drm_vblank_cleanup(drm);
 err_vblank:
         pm_runtime_disable(drm->dev);
@@ -387,6 +386,7 @@ err_unload:
         drm_irq_uninstall(drm);
         of_reserved_mem_device_release(drm->dev);
 err_free:
+        drm_mode_config_cleanup(drm);
         dev_set_drvdata(dev, NULL);
         drm_dev_unref(drm);
 
diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c
index 0ad2c47f808f..71c3473476c7 100644
--- a/drivers/gpu/drm/drm_ioctl.c
+++ b/drivers/gpu/drm/drm_ioctl.c
@@ -254,10 +254,12 @@ static int drm_getcap(struct drm_device *dev, void *data, struct drm_file *file_
                 req->value = dev->mode_config.async_page_flip;
                 break;
         case DRM_CAP_PAGE_FLIP_TARGET:
-                req->value = 1;
-                drm_for_each_crtc(crtc, dev) {
-                        if (!crtc->funcs->page_flip_target)
-                                req->value = 0;
+                if (drm_core_check_feature(dev, DRIVER_MODESET)) {
+                        req->value = 1;
+                        drm_for_each_crtc(crtc, dev) {
+                                if (!crtc->funcs->page_flip_target)
+                                        req->value = 0;
+                        }
                 }
                 break;
         case DRM_CAP_CURSOR_WIDTH:
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 91ab7e9d6d2e..00eb4814b913 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -2268,7 +2268,7 @@ i915_gem_object_get_pages_gtt(struct drm_i915_gem_object *obj)
                         page = shmem_read_mapping_page(mapping, i);
                         if (IS_ERR(page)) {
                                 ret = PTR_ERR(page);
-                                goto err_pages;
+                                goto err_sg;
                         }
                 }
 #ifdef CONFIG_SWIOTLB
@@ -2311,8 +2311,9 @@ i915_gem_object_get_pages_gtt(struct drm_i915_gem_object *obj)
 
         return 0;
 
-err_pages:
+err_sg:
         sg_mark_end(sg);
+err_pages:
         for_each_sgt_page(page, sgt_iter, st)
                 put_page(page);
         sg_free_table(st);
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 81c11499bcf0..3cb70d73239b 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -12260,7 +12260,7 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,
         intel_crtc->reset_count = i915_reset_count(&dev_priv->gpu_error);
         if (i915_reset_in_progress_or_wedged(&dev_priv->gpu_error)) {
                 ret = -EIO;
-                goto cleanup;
+                goto unlock;
         }
 
         atomic_inc(&intel_crtc->unpin_work_count);
@@ -12352,6 +12352,7 @@ cleanup_unpin:
         intel_unpin_fb_obj(fb, crtc->primary->state->rotation);
 cleanup_pending:
         atomic_dec(&intel_crtc->unpin_work_count);
+unlock:
         mutex_unlock(&dev->struct_mutex);
 cleanup:
         crtc->primary->fb = old_fb;
diff --git a/drivers/gpu/drm/radeon/radeon_atpx_handler.c b/drivers/gpu/drm/radeon/radeon_atpx_handler.c
index 4129b12521a6..0ae13cd2adda 100644
--- a/drivers/gpu/drm/radeon/radeon_atpx_handler.c
+++ b/drivers/gpu/drm/radeon/radeon_atpx_handler.c
@@ -479,7 +479,6 @@ static int radeon_atpx_power_state(enum vga_switcheroo_client_id id,
  */
 static bool radeon_atpx_pci_probe_handle(struct pci_dev *pdev)
 {
-        struct pci_dev *parent_pdev = pci_upstream_bridge(pdev);
         acpi_handle dhandle, atpx_handle;
         acpi_status status;
 
@@ -493,7 +492,6 @@ static bool radeon_atpx_pci_probe_handle(struct pci_dev *pdev)
 
         radeon_atpx_priv.dhandle = dhandle;
         radeon_atpx_priv.atpx.handle = atpx_handle;
-        radeon_atpx_priv.bridge_pm_usable = parent_pdev && parent_pdev->bridge_d3;
         return true;
 }
 
@@ -555,11 +553,16 @@ static bool radeon_atpx_detect(void)
         struct pci_dev *pdev = NULL;
         bool has_atpx = false;
         int vga_count = 0;
+        bool d3_supported = false;
+        struct pci_dev *parent_pdev;
 
         while ((pdev = pci_get_class(PCI_CLASS_DISPLAY_VGA << 8, pdev)) != NULL) {
                 vga_count++;
 
                 has_atpx |= (radeon_atpx_pci_probe_handle(pdev) == true);
+
+                parent_pdev = pci_upstream_bridge(pdev);
+                d3_supported |= parent_pdev && parent_pdev->bridge_d3;
         }
 
         /* some newer PX laptops mark the dGPU as a non-VGA display device */
@@ -567,6 +570,9 @@ static bool radeon_atpx_detect(void)
                 vga_count++;
 
                 has_atpx |= (radeon_atpx_pci_probe_handle(pdev) == true);
+
+                parent_pdev = pci_upstream_bridge(pdev);
+                d3_supported |= parent_pdev && parent_pdev->bridge_d3;
         }
 
         if (has_atpx && vga_count == 2) {
@@ -574,6 +580,7 @@ static bool radeon_atpx_detect(void)
                 printk(KERN_INFO "vga_switcheroo: detected switching method %s handle\n",
                        acpi_method_name);
                 radeon_atpx_priv.atpx_detected = true;
+                radeon_atpx_priv.bridge_pm_usable = d3_supported;
                 radeon_atpx_init();
                 return true;
         }