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

Commit 3d7d0c85 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Use fw_domains_put_with_fifo() on HSW 



HSW still has the wake FIFO, so let's check it.

Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Cc: Deepak S <deepak.s@linux.intel.com>
Fixes: 05a2fb15 ("drm/i915: Consolidate forcewake code")
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1460633942-24013-1-git-send-email-ville.syrjala@linux.intel.com


Cc: stable@vger.kernel.org
Reviewed-by: default avatarMika Kuoppala <mika.kuoppala@intel.com>
parent e30e251a

drivers/gpu/drm/i915/intel_uncore.c

+5 −1
Original line number Diff line number Diff line
@@ -1265,6 +1265,10 @@ static void intel_uncore_fw_domains_init(struct drm_device *dev) 
	} else if (IS_HASWELL(dev) || IS_BROADWELL(dev)) {

		dev_priv->uncore.funcs.force_wake_get =

			fw_domains_get_with_thread_status;

		if (IS_HASWELL(dev))

			dev_priv->uncore.funcs.force_wake_put =

				fw_domains_put_with_fifo;

		else

			dev_priv->uncore.funcs.force_wake_put = fw_domains_put;

		fw_domain_init(dev_priv, FW_DOMAIN_ID_RENDER,

			       FORCEWAKE_MT, FORCEWAKE_ACK_HSW);