Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0cb65c83 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 3c49de52 ab7cd8d8

drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c

+9 −2
Original line number Diff line number Diff line
@@ -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;

	}

drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.c

+4 −1
Original line number Diff line number Diff line
@@ -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);

drivers/gpu/drm/arm/hdlcd_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -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 @@ static int hdlcd_drm_bind(struct device *dev) 
	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);

drivers/gpu/drm/drm_ioctl.c

+6 −4
Original line number Diff line number Diff line
@@ -254,11 +254,13 @@ 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:

		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:

		if (dev->mode_config.cursor_width)

drivers/gpu/drm/i915/i915_gem.c

+3 −2
Original line number Diff line number Diff line
@@ -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);