drm/vc4: hvs: Boost the core clock during modeset (d7d96c00) · Commits · 戴 / test

drivers/gpu/drm/vc4/vc4_drv.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -320,6 +320,8 @@ struct vc4_hvs {
		void __iomem *regs;
		u32 __iomem *dlist;

		struct clk *core_clk;

		/* Memory manager for CRTCs to allocate space in the display
		* list. Units are dwords.
		*/

+18 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@
		* each CRTC.
		*/

		#include <linux/clk.h>
		#include <linux/component.h>
		#include <linux/platform_device.h>

		@@ -540,6 +541,20 @@ static int vc4_hvs_bind(struct device dev, struct device master, void *data)
		hvs->regset.regs = hvs_regs;
		hvs->regset.nregs = ARRAY_SIZE(hvs_regs);

		if (hvs->hvs5) {
		hvs->core_clk = devm_clk_get(&pdev->dev, NULL);
		if (IS_ERR(hvs->core_clk)) {
		dev_err(&pdev->dev, "Couldn't get core clock\n");
		return PTR_ERR(hvs->core_clk);
		}

		ret = clk_prepare_enable(hvs->core_clk);
		if (ret) {
		dev_err(&pdev->dev, "Couldn't enable the core clock\n");
		return ret;
		}
		}

		if (!hvs->hvs5)
		hvs->dlist = hvs->regs + SCALER_DLIST_START;
		else
		@@ -624,6 +639,7 @@ static void vc4_hvs_unbind(struct device dev, struct device master,
		{
		struct drm_device *drm = dev_get_drvdata(master);
		struct vc4_dev *vc4 = drm->dev_private;
		struct vc4_hvs *hvs = vc4->hvs;

		if (drm_mm_node_allocated(&vc4->hvs->mitchell_netravali_filter))
		drm_mm_remove_node(&vc4->hvs->mitchell_netravali_filter);
		@@ -631,6 +647,8 @@ static void vc4_hvs_unbind(struct device dev, struct device master,
		drm_mm_takedown(&vc4->hvs->dlist_mm);
		drm_mm_takedown(&vc4->hvs->lbm_mm);

		clk_disable_unprepare(hvs->core_clk);

		vc4->hvs = NULL;
		}

+9 −0

Original line number	Diff line number	Diff line
		@@ -11,6 +11,8 @@
		* crtc, HDMI encoder).
		*/

		#include <linux/clk.h>

		#include <drm/drm_atomic.h>
		#include <drm/drm_atomic_helper.h>
		#include <drm/drm_crtc.h>
		@@ -149,6 +151,7 @@ vc4_atomic_complete_commit(struct drm_atomic_state *state)
		{
		struct drm_device *dev = state->dev;
		struct vc4_dev *vc4 = to_vc4_dev(dev);
		struct vc4_hvs *hvs = vc4->hvs;
		struct vc4_crtc *vc4_crtc;
		int i;

		@@ -160,6 +163,9 @@ vc4_atomic_complete_commit(struct drm_atomic_state *state)
		vc4_hvs_mask_underrun(dev, vc4_crtc->channel);
		}

		if (vc4->hvs->hvs5)
		clk_set_min_rate(hvs->core_clk, 500000000);

		drm_atomic_helper_wait_for_fences(dev, state, false);

		drm_atomic_helper_wait_for_dependencies(state);
		@@ -182,6 +188,9 @@ vc4_atomic_complete_commit(struct drm_atomic_state *state)

		drm_atomic_helper_commit_cleanup_done(state);

		if (vc4->hvs->hvs5)
		clk_set_min_rate(hvs->core_clk, 0);

		drm_atomic_state_put(state);

		up(&vc4->async_modeset);