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

Commit 4fb68f97 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull drm fixes from Dave Airlie:
 "AMD, radeon, i915, imx, msm and udl fixes:

   - amdgpu/radeon have a number of power management regressions and
     fixes along with some better error checking

   - imx has a single regression fix

   - udl has a single kmalloc instead of stack for usb control msg fix

   - msm has some fixes for modesetting bugs and regressions

   - i915 has a one fix for a Sandybridge regression along with some
     others for DP audio.

  They all seem pretty okay at this stage, we've got one MST fix I know
  going through process for i915, but I expect it'll be next week"

* tag 'drm-fixes-for-v4.9-rc5' of git://people.freedesktop.org/~airlied/linux: (30 commits)
  drm/udl: make control msg static const. (v2)
  drm/amd/powerplay: implement get_clock_by_type for iceland.
  drm/amd/powerplay/smu7: fix checks in smu7_get_evv_voltages (v2)
  drm/amd/powerplay: update phm_get_voltage_evv_on_sclk for iceland
  drm/amd/powerplay: propagate errors in phm_get_voltage_evv_on_sclk
  drm/imx: disable planes before DC
  drm/amd/powerplay: return false instead of -EINVAL
  drm/amdgpu/powerplay/smu7: fix unintialized data usage
  drm/amdgpu: fix crash in acp_hw_fini
  drm/i915: Limit Valleyview and earlier to only using mappable scanout
  drm/i915: Round tile chunks up for constructing partial VMAs
  drm/i915/dp: Extend BDW DP audio workaround to GEN9 platforms
  drm/i915/dp: BDW cdclk fix for DP audio
  drm/i915/vlv: Prevent enabling hpd polling in late suspend
  drm/i915: Respect alternate_ddc_pin for all DDI ports
  drm/msm: Fix error handling crashes seen when VRAM allocation fails
  drm/msm/mdp5: 8x16 actually has 8 mixer stages
  drm/msm/mdp5: no scaling support on RGBn pipes for 8x16
  drm/msm/mdp5: handle non-fullscreen base plane case
  drm/msm: Set CLK_IGNORE_UNUSED flag for PLL clocks
  ...
parents b8b73df3 24399f4f

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

+4 −1
Original line number Diff line number Diff line
@@ -395,9 +395,12 @@ static int acp_hw_fini(void *handle) 
{

	int i, ret;

	struct device *dev;



	struct amdgpu_device *adev = (struct amdgpu_device *)handle;



	/* return early if no ACP */

	if (!adev->acp.acp_genpd)

		return 0;



	for (i = 0; i < ACP_DEVS ; i++) {

		dev = get_mfd_cell_dev(adev->acp.acp_cell[i].name, i);

		ret = pm_genpd_remove_device(&adev->acp.acp_genpd->gpd, dev);

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

+11 −2
Original line number Diff line number Diff line
@@ -795,9 +795,18 @@ static int amdgpu_cgs_get_firmware_info(struct cgs_device *cgs_device, 
		if (!adev->pm.fw) {

			switch (adev->asic_type) {

			case CHIP_TOPAZ:

				if (((adev->pdev->device == 0x6900) && (adev->pdev->revision == 0x81)) ||

				    ((adev->pdev->device == 0x6900) && (adev->pdev->revision == 0x83)) ||

				    ((adev->pdev->device == 0x6907) && (adev->pdev->revision == 0x87)))

					strcpy(fw_name, "amdgpu/topaz_k_smc.bin");

				else

					strcpy(fw_name, "amdgpu/topaz_smc.bin");

				break;

			case CHIP_TONGA:

				if (((adev->pdev->device == 0x6939) && (adev->pdev->revision == 0xf1)) ||

				    ((adev->pdev->device == 0x6938) && (adev->pdev->revision == 0xf1)))

					strcpy(fw_name, "amdgpu/tonga_k_smc.bin");

				else

					strcpy(fw_name, "amdgpu/tonga_smc.bin");

				break;

			case CHIP_FIJI:

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

+1 −1
Original line number Diff line number Diff line
@@ -769,7 +769,7 @@ static void amdgpu_connector_unregister(struct drm_connector *connector) 
{

	struct amdgpu_connector *amdgpu_connector = to_amdgpu_connector(connector);



	if (amdgpu_connector->ddc_bus->has_aux) {

	if (amdgpu_connector->ddc_bus && amdgpu_connector->ddc_bus->has_aux) {

		drm_dp_aux_unregister(&amdgpu_connector->ddc_bus->aux);

		amdgpu_connector->ddc_bus->has_aux = false;

	}

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

+24 −2
Original line number Diff line number Diff line
@@ -735,8 +735,20 @@ static struct pci_driver amdgpu_kms_pci_driver = { 


static int __init amdgpu_init(void)

{

	amdgpu_sync_init();

	amdgpu_fence_slab_init();

	int r;



	r = amdgpu_sync_init();

	if (r)

		goto error_sync;



	r = amdgpu_fence_slab_init();

	if (r)

		goto error_fence;



	r = amd_sched_fence_slab_init();

	if (r)

		goto error_sched;



	if (vgacon_text_force()) {

		DRM_ERROR("VGACON disables amdgpu kernel modesetting.\n");

		return -EINVAL;
@@ -748,6 +760,15 @@ static int __init amdgpu_init(void) 
	amdgpu_register_atpx_handler();

	/* let modprobe override vga console setting */

	return drm_pci_init(driver, pdriver);



error_sched:

	amdgpu_fence_slab_fini();



error_fence:

	amdgpu_sync_fini();



error_sync:

	return r;

}



static void __exit amdgpu_exit(void)
@@ -756,6 +777,7 @@ static void __exit amdgpu_exit(void) 
	drm_pci_exit(driver, pdriver);

	amdgpu_unregister_atpx_handler();

	amdgpu_sync_fini();

	amd_sched_fence_slab_fini();

	amdgpu_fence_slab_fini();

}

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

+2 −0
Original line number Diff line number Diff line
@@ -99,6 +99,8 @@ int amdgpu_driver_load_kms(struct drm_device *dev, unsigned long flags) 


	if ((amdgpu_runtime_pm != 0) &&

	    amdgpu_has_atpx() &&

	    (amdgpu_is_atpx_hybrid() ||

	     amdgpu_has_atpx_dgpu_power_cntl()) &&

	    ((flags & AMD_IS_APU) == 0))

		flags |= AMD_IS_PX;