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

Commit 6006d6e7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull drm fixes from Dave Airlie:
 "Seems to be quietening down nicely, a few mediatek, one exynos and one
  hdlcd fix, along with two amd fixes"

* tag 'drm-fixes-for-v4.9-rc7' of git://people.freedesktop.org/~airlied/linux:
  gpu/drm/exynos/exynos_hdmi - Unmap region obtained by of_iomap
  drm/mediatek: fix null pointer dereference
  drm/mediatek: fixed the calc method of data rate per lane
  drm/mediatek: fix a typo of DISP_OD_CFG to OD_RELAYMODE
  drm/radeon: fix power state when port pm is unavailable (v2)
  drm/amdgpu: fix power state when port pm is unavailable
  drm/arm: hdlcd: fix plane base address update
  drm/amd/powerplay: avoid out of bounds access on array ps.
parents 16ae16c6 9704668e

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

+8 −1
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ struct amdgpu_atpx { 


static struct amdgpu_atpx_priv {

	bool atpx_detected;

	bool bridge_pm_usable;

	/* handle for device - and atpx */

	acpi_handle dhandle;

	acpi_handle other_handle;
@@ -205,7 +206,11 @@ static int amdgpu_atpx_validate(struct amdgpu_atpx *atpx) 
	atpx->is_hybrid = false;

	if (valid_bits & ATPX_MS_HYBRID_GFX_SUPPORTED) {

		printk("ATPX Hybrid Graphics\n");

		atpx->functions.power_cntl = false;

		/*

		 * Disable legacy PM methods only when pcie port PM is usable,

		 * otherwise the device might fail to power off or power on.

		 */

		atpx->functions.power_cntl = !amdgpu_atpx_priv.bridge_pm_usable;

		atpx->is_hybrid = true;

	}
@@ -480,6 +485,7 @@ 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;
@@ -494,6 +500,7 @@ 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;

}

drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c

+6 −6
Original line number Diff line number Diff line
@@ -2984,19 +2984,19 @@ static int smu7_get_pp_table_entry_callback_func_v0(struct pp_hwmgr *hwmgr, 
	if (!(data->mc_micro_code_feature & DISABLE_MC_LOADMICROCODE) && memory_clock > data->highest_mclk)

		data->highest_mclk = memory_clock;



	performance_level = &(ps->performance_levels

			[ps->performance_level_count++]);



	PP_ASSERT_WITH_CODE(

			(ps->performance_level_count < smum_get_mac_definition(hwmgr->smumgr, SMU_MAX_LEVELS_GRAPHICS)),

			"Performance levels exceeds SMC limit!",

			return -EINVAL);



	PP_ASSERT_WITH_CODE(

			(ps->performance_level_count <=

			(ps->performance_level_count <

					hwmgr->platform_descriptor.hardwareActivityPerformanceLevels),

			"Performance levels exceeds Driver limit!",

			return -EINVAL);

			"Performance levels exceeds Driver limit, Skip!",

			return 0);



	performance_level = &(ps->performance_levels

			[ps->performance_level_count++]);



	/* Performance levels are arranged from low to high. */

	performance_level->memory_clock = memory_clock;

drivers/gpu/drm/arm/hdlcd_crtc.c

+2 −3
Original line number Diff line number Diff line
@@ -150,15 +150,14 @@ static void hdlcd_crtc_enable(struct drm_crtc *crtc) 
	clk_prepare_enable(hdlcd->clk);

	hdlcd_crtc_mode_set_nofb(crtc);

	hdlcd_write(hdlcd, HDLCD_REG_COMMAND, 1);

	drm_crtc_vblank_on(crtc);

}



static void hdlcd_crtc_disable(struct drm_crtc *crtc)

{

	struct hdlcd_drm_private *hdlcd = crtc_to_hdlcd_priv(crtc);



	if (!crtc->state->active)

		return;



	drm_crtc_vblank_off(crtc);

	hdlcd_write(hdlcd, HDLCD_REG_COMMAND, 0);

	clk_disable_unprepare(hdlcd->clk);

}

drivers/gpu/drm/exynos/exynos_hdmi.c

+5 −0
Original line number Diff line number Diff line
@@ -1907,6 +1907,8 @@ static int hdmi_probe(struct platform_device *pdev) 
err_hdmiphy:

	if (hdata->hdmiphy_port)

		put_device(&hdata->hdmiphy_port->dev);

	if (hdata->regs_hdmiphy)

		iounmap(hdata->regs_hdmiphy);

err_ddc:

	put_device(&hdata->ddc_adpt->dev);
@@ -1929,6 +1931,9 @@ static int hdmi_remove(struct platform_device *pdev) 
	if (hdata->hdmiphy_port)

		put_device(&hdata->hdmiphy_port->dev);



	if (hdata->regs_hdmiphy)

		iounmap(hdata->regs_hdmiphy);



	put_device(&hdata->ddc_adpt->dev);



	return 0;

drivers/gpu/drm/mediatek/mtk_disp_ovl.c

+7 −7
Original line number Diff line number Diff line
@@ -251,13 +251,6 @@ static int mtk_disp_ovl_probe(struct platform_device *pdev) 
	if (irq < 0)

		return irq;



	ret = devm_request_irq(dev, irq, mtk_disp_ovl_irq_handler,

			       IRQF_TRIGGER_NONE, dev_name(dev), priv);

	if (ret < 0) {

		dev_err(dev, "Failed to request irq %d: %d\n", irq, ret);

		return ret;

	}



	comp_id = mtk_ddp_comp_get_id(dev->of_node, MTK_DISP_OVL);

	if (comp_id < 0) {

		dev_err(dev, "Failed to identify by alias: %d\n", comp_id);
@@ -273,6 +266,13 @@ static int mtk_disp_ovl_probe(struct platform_device *pdev) 


	platform_set_drvdata(pdev, priv);



	ret = devm_request_irq(dev, irq, mtk_disp_ovl_irq_handler,

			       IRQF_TRIGGER_NONE, dev_name(dev), priv);

	if (ret < 0) {

		dev_err(dev, "Failed to request irq %d: %d\n", irq, ret);

		return ret;

	}



	ret = component_add(dev, &mtk_disp_ovl_component_ops);

	if (ret)

		dev_err(dev, "Failed to add component: %d\n", ret);