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

Commit a01b0e94 authored by Deepak S's avatar Deepak S Committed by Daniel Vetter
Browse files

drm/i915: add cherryview specfic forcewake in execlists_elsp_write 



In chv, we have two power wells Render & Media. We need to use
corresponsing forcewake count. If we dont follow this we are getting
error "*ERROR*: Timed out waiting for forcewake old ack to clear" due to
multiple entry into __vlv_force_wake_get.

Signed-off-by: default avatarDeepak S <deepak.s@linux.intel.com>
Requested-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent cf303626

drivers/gpu/drm/i915/intel_lrc.c

+25 −4
Original line number Diff line number Diff line
@@ -300,8 +300,18 @@ static void execlists_elsp_write(struct intel_engine_cs *ring, 
	 * Instead, we do the runtime_pm_get/put when creating/destroying requests.

	 */

	spin_lock_irqsave(&dev_priv->uncore.lock, flags);

	if (IS_CHERRYVIEW(dev_priv->dev)) {

		if (dev_priv->uncore.fw_rendercount++ == 0)

			dev_priv->uncore.funcs.force_wake_get(dev_priv,

							      FORCEWAKE_RENDER);

		if (dev_priv->uncore.fw_mediacount++ == 0)

			dev_priv->uncore.funcs.force_wake_get(dev_priv,

							      FORCEWAKE_MEDIA);

	} else {

		if (dev_priv->uncore.forcewake_count++ == 0)

		dev_priv->uncore.funcs.force_wake_get(dev_priv, FORCEWAKE_ALL);

			dev_priv->uncore.funcs.force_wake_get(dev_priv,

							      FORCEWAKE_ALL);

	}

	spin_unlock_irqrestore(&dev_priv->uncore.lock, flags);



	I915_WRITE(RING_ELSP(ring), desc[1]);
@@ -315,8 +325,19 @@ static void execlists_elsp_write(struct intel_engine_cs *ring, 


	/* Release Force Wakeup (see the big comment above). */

	spin_lock_irqsave(&dev_priv->uncore.lock, flags);

	if (IS_CHERRYVIEW(dev_priv->dev)) {

		if (--dev_priv->uncore.fw_rendercount == 0)

			dev_priv->uncore.funcs.force_wake_put(dev_priv,

							      FORCEWAKE_RENDER);

		if (--dev_priv->uncore.fw_mediacount == 0)

			dev_priv->uncore.funcs.force_wake_put(dev_priv,

							      FORCEWAKE_MEDIA);

	} else {

		if (--dev_priv->uncore.forcewake_count == 0)

		dev_priv->uncore.funcs.force_wake_put(dev_priv, FORCEWAKE_ALL);

			dev_priv->uncore.funcs.force_wake_put(dev_priv,

							      FORCEWAKE_ALL);

	}



	spin_unlock_irqrestore(&dev_priv->uncore.lock, flags);

}