Commit eb2b47bb authored by Jonathan Marek's avatar Jonathan Marek Committed by Rob Clark
Browse files

drm/msm/mdp4: only use lut_clk on mdp4.2+ 



Signed-off-by: default avatarJonathan Marek <jonathan@marek.ca>
Signed-off-by: default avatarRob Clark <robdclark@gmail.com>
parent 1fed8df3

drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c

+13 −9
Original line number Diff line number Diff line
@@ -206,6 +206,7 @@ int mdp4_disable(struct mdp4_kms *mdp4_kms) 
	clk_disable_unprepare(mdp4_kms->clk);

	if (mdp4_kms->pclk)

		clk_disable_unprepare(mdp4_kms->pclk);

	if (mdp4_kms->lut_clk)

		clk_disable_unprepare(mdp4_kms->lut_clk);

	if (mdp4_kms->axi_clk)

		clk_disable_unprepare(mdp4_kms->axi_clk);
@@ -220,6 +221,7 @@ int mdp4_enable(struct mdp4_kms *mdp4_kms) 
	clk_prepare_enable(mdp4_kms->clk);

	if (mdp4_kms->pclk)

		clk_prepare_enable(mdp4_kms->pclk);

	if (mdp4_kms->lut_clk)

		clk_prepare_enable(mdp4_kms->lut_clk);

	if (mdp4_kms->axi_clk)

		clk_prepare_enable(mdp4_kms->axi_clk);
@@ -472,13 +474,14 @@ struct msm_kms *mdp4_kms_init(struct drm_device *dev) 
	if (IS_ERR(mdp4_kms->pclk))

		mdp4_kms->pclk = NULL;



	// XXX if (rev >= MDP_REV_42) { ???

	if (mdp4_kms->rev >= 2) {

		mdp4_kms->lut_clk = devm_clk_get(&pdev->dev, "lut_clk");

		if (IS_ERR(mdp4_kms->lut_clk)) {

			DRM_DEV_ERROR(dev->dev, "failed to get lut_clk\n");

			ret = PTR_ERR(mdp4_kms->lut_clk);

			goto fail;

		}

	}



	mdp4_kms->axi_clk = devm_clk_get(&pdev->dev, "bus_clk");

	if (IS_ERR(mdp4_kms->axi_clk)) {
@@ -488,6 +491,7 @@ struct msm_kms *mdp4_kms_init(struct drm_device *dev) 
	}



	clk_set_rate(mdp4_kms->clk, config->max_clk);

	if (mdp4_kms->lut_clk)

		clk_set_rate(mdp4_kms->lut_clk, config->max_clk);



	pm_runtime_enable(dev->dev);