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

Commit 6b312cd3 authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Daniel Vetter
Browse files

drm/i915: Read power well status before other registers for drpc info 



Trying to read the status of the power wells right after taking forcewake
for the other register reads makes little sense. Most of the time the
power wells will still be up due to the recent forcewake. Instead do the
power well status read first, and only then read the register needing
forcewake. This way the reported power well status can actually reflect
what's going on in the system.

Cc: Deepak S <deepak.s@intel.com>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarDeepak S <deepak.s@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 656bfa3a

drivers/gpu/drm/i915/i915_debugfs.c

+4 −5
Original line number Diff line number Diff line
@@ -1240,11 +1240,12 @@ static int vlv_drpc_info(struct seq_file *m) 
	struct drm_info_node *node = m->private;

	struct drm_device *dev = node->minor->dev;

	struct drm_i915_private *dev_priv = dev->dev_private;

	u32 rpmodectl1, rcctl1;

	u32 rpmodectl1, rcctl1, pw_status;

	unsigned fw_rendercount = 0, fw_mediacount = 0;



	intel_runtime_pm_get(dev_priv);



	pw_status = I915_READ(VLV_GTLC_PW_STATUS);

	rpmodectl1 = I915_READ(GEN6_RP_CONTROL);

	rcctl1 = I915_READ(GEN6_RC_CONTROL);
@@ -1263,11 +1264,9 @@ static int vlv_drpc_info(struct seq_file *m) 
		   yesno(rcctl1 & (GEN7_RC_CTL_TO_MODE |

					GEN6_RC_CTL_EI_MODE(1))));

	seq_printf(m, "Render Power Well: %s\n",

			(I915_READ(VLV_GTLC_PW_STATUS) &

				VLV_GTLC_PW_RENDER_STATUS_MASK) ? "Up" : "Down");

		   (pw_status & VLV_GTLC_PW_RENDER_STATUS_MASK) ? "Up" : "Down");

	seq_printf(m, "Media Power Well: %s\n",

			(I915_READ(VLV_GTLC_PW_STATUS) &

				VLV_GTLC_PW_MEDIA_STATUS_MASK) ? "Up" : "Down");

		   (pw_status & VLV_GTLC_PW_MEDIA_STATUS_MASK) ? "Up" : "Down");



	seq_printf(m, "Render RC6 residency since boot: %u\n",

		   I915_READ(VLV_GT_RENDER_RC6));