drm/i915: Read power well status before other registers for drpc info
Subsystems (2)
PATCH 1/1 drm/i915: Read power well status before other registers for drpc info
From: Ville Syrjälä <[email protected]>
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.
--- drivers/gpu/drm/i915/i915_debugfs.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +4 -5
@@ -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 ));
Signature · 6 lines
2.0.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 37 lines · On Wednesday 19 November 2014 11:37 PM, [email protected] wrote:
From: Ville Syrjälä <[email protected]>
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 <[email protected]>Signed-off-by Ville Syrjälä <[email protected]>--- drivers/gpu/drm/i915/i915_debugfs.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)drivers/gpu/drm/i915/i915_debugfs.c +2
-1@@ -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",
drivers/gpu/drm/i915/i915_debugfs.c static int vlv_drpc_info(struct seq_file *m) · line 1272
Quoted 10 lines
drivers/gpu/drm/i915/i915_debugfs.c +2
-4- (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 ));
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Daniel Vetter
AppliedQuoted 39 lines · Deepak S
Quoted 37 lines · On Wednesday 19 November 2014 11:37 PM, [email protected] wrote:
From: Ville Syrjälä <[email protected]>
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 <[email protected]>Signed-off-by Ville Syrjälä <[email protected]>--- drivers/gpu/drm/i915/i915_debugfs.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)drivers/gpu/drm/i915/i915_debugfs.c +3
-3@@ -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" );
Quoted 8 lines
drivers/gpu/drm/i915/i915_debugfs.c static int vlv_drpc_info(struct seq_file *m) · line 1272
Quoted 6 lines
drivers/gpu/drm/i915/i915_debugfs.c +1
-2seq_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 ));Reviewed-by Deepak S<[email protected]>
Queued for -next, thanks for the patch.
-Daniel
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH] drm/i915: Read power well status before other
In reply to [email protected]-------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
PNV -3 369/369 366/369
ILK +14-12 361/378 363/378
SNB -9 459/459 450/459 IVB -32 535/545 503/545 BYT -1 290/290 289/290 HSW -20 338/338 318/338 BDW -20 302/302 282/302 -------------------------------------Detailed------------------------------------- Platform Test drm-intel-nightly Series Applied PNV igt_drv_hangman_error-state-capture-render TIMEOUT(27, M25M7M23)PASS(4, M23) TIMEOUT(1, M23) PNV igt_drv_missed_irq_hang TIMEOUT(30, M23M25M7)PASS(1, M23) TIMEOUT(1, M23) PNV igt_gen3_mixed_blits PASS(1, M23) CRASH(1, M23) ILK igt_drv_hangman_error-state-basic TIMEOUT(12, M37M26)PASS(4, M26) TIMEOUT(1, M37)PASS(3, M37) ILK igt_drv_hangman_error-state-capture-bsd TIMEOUT(2, M26M37)PASS(1, M26) TIMEOUT(1, M37)PASS(3, M37) ILK igt_drv_hangman_error-state-capture-render PASS(1, M26) TIMEOUT(1, M37)PASS(3, M37) ILK igt_drv_missed_irq_hang PASS(1, M26) TIMEOUT(1, M37)PASS(3, M37) ILK igt_gem_reset_stats_ban-render PASS(4, M26) TIMEOUT(1, M37)PASS(3, M37) ILK igt_gem_reset_stats_close-pending-fork-render PASS(1, M26) TIMEOUT(1, M37)PASS(3, M37) ILK igt_gem_reset_stats_close-pending-fork-reverse-render PASS(1, M26) TIMEOUT(1, M37)PASS(3, M37) ILK igt_gem_reset_stats_close-pending-render PASS(1, M26) TIMEOUT(1, M37)PASS(3, M37) ILK igt_gem_reset_stats_reset-count-render PASS(1, M26) TIMEOUT(1, M37)PASS(3, M37) ILK igt_gem_reset_stats_reset-stats-render PASS(1, M26) TIMEOUT(1, M37)PASS(3, M37) ILK igt_gem_workarounds_reset PASS(1, M26) TIMEOUT(1, M37)PASS(3, M37) ILK igt_kms_flip_bcs-wf_vblank-vs-dpms DMESG_WARN(2, M26)PASS(2, M26) PASS(4, M37) ILK igt_kms_flip_bcs-wf_vblank-vs-dpms-interruptible DMESG_WARN(1, M26) PASS(4, M37) ILK igt_kms_flip_bcs-wf_vblank-vs-modeset-interruptible DMESG_WARN(1, M26)PASS(3, M26) PASS(4, M37) ILK igt_kms_flip_blocking-wf_vblank DMESG_WARN(1, M26)PASS(3, M26) PASS(4, M37) ILK igt_kms_flip_flip-vs-absolute-wf_vblank DMESG_WARN(1, M26) PASS(4, M37) ILK igt_kms_flip_flip-vs-absolute-wf_vblank-interruptible DMESG_WARN(1, M26)PASS(3, M26) PASS(4, M37) ILK igt_kms_flip_flip-vs-dpms-off-vs-modeset-interruptible DMESG_WARN(2, M26)PASS(2, M26) PASS(4, M37) ILK igt_kms_flip_flip-vs-expired-vblank-interruptible DMESG_WARN(2, M26)PASS(2, M26) PASS(4, M37) ILK igt_kms_flip_flip-vs-modeset-vs-hang DMESG_WARN(2, M26)PASS(2, M26) TIMEOUT(1, M37)PASS(3, M37) ILK igt_kms_flip_flip-vs-modeset-vs-hang-interruptible DMESG_WARN(1, M26)PASS(3, M26) TIMEOUT(1, M37)PASS(3, M37) ILK igt_kms_flip_flip-vs-panning NSPT(1, M26) PASS(4, M37) ILK igt_kms_flip_flip-vs-panning-vs-hang-interruptible DMESG_WARN(1, M26)PASS(3, M26) TIMEOUT(1, M37)PASS(3, M37) ILK igt_kms_flip_flip-vs-wf_vblank DMESG_WARN(1, M26)PASS(3, M26) PASS(4, M37) ILK igt_kms_flip_nonexisting-fb DMESG_WARN(1, M26) PASS(4, M37) ILK igt_kms_flip_nonexisting-fb-interruptible DMESG_WARN(1, M26)PASS(3, M26) PASS(4, M37) ILK igt_kms_flip_plain-flip-interruptible DMESG_WARN(1, M26)PASS(3, M26) PASS(4, M37) ILK igt_kms_flip_single-buffer-flip-vs-dpms-off-vs-modeset DMESG_WARN(1, M26) PASS(4, M37) ILK igt_kms_flip_vblank-vs-hang PASS(1, M26) TIMEOUT(1, M37)PASS(3, M37) SNB igt_drv_hangman_error-state-basic TIMEOUT(24, M35M22)PASS(1, M35) TIMEOUT(1, M22)PASS(3, M22) SNB igt_drv_hangman_error-state-capture-bsd TIMEOUT(24, M35M22)PASS(1, M35) TIMEOUT(1, M22)PASS(3, M22) SNB igt_drv_hangman_error-state-capture-render TIMEOUT(8, M35M22)PASS(1, M35) TIMEOUT(1, M22)PASS(3, M22) SNB igt_drv_missed_irq_hang PASS(1, M35) TIMEOUT(1, M22)PASS(3, M22) SNB igt_gem_reset_stats_reset-count-render PASS(1, M35) TIMEOUT(1, M22)PASS(3, M22) SNB igt_gem_reset_stats_unrelated-ctx-render PASS(1, M35) TIMEOUT(1, M22)PASS(3, M22) SNB igt_kms_pipe_crc_basic_hang-read-crc-pipe-A PASS(4, M35) TIMEOUT(1, M22)PASS(3, M22) SNB igt_kms_pipe_crc_basic_hang-read-crc-pipe-B PASS(1, M35) TIMEOUT(1, M22)PASS(3, M22) SNB igt_pm_rps_min-max-config-idle PASS(1, M35) FAIL(1, M22)PASS(3, M22) IVB igt_drv_hangman_error-state-basic TIMEOUT(15, M34M21M4)PASS(4, M21) TIMEOUT(1, M4)PASS(3, M4) IVB igt_drv_hangman_error-state-capture-blt TIMEOUT(15, M34M21M4)PASS(1, M21) TIMEOUT(1, M4)PASS(3, M4) IVB igt_drv_hangman_error-state-capture-bsd TIMEOUT(1, M34)PASS(1, M21) TIMEOUT(1, M4)PASS(3, M4) IVB igt_drv_hangman_error-state-capture-render PASS(1, M21) TIMEOUT(1, M4)PASS(3, M4) IVB igt_drv_missed_irq_hang PASS(1, M21) TIMEOUT(1, M4)PASS(3, M4) IVB igt_gem_bad_reloc_negative-reloc PASS(1, M21) NSPT(1, M4)PASS(3, M4) IVB igt_gem_reset_stats_ban-ctx-render DMESG_WARN(2, M21)PASS(2, M21) TIMEOUT(1, M4)PASS(3, M4) IVB igt_gem_reset_stats_ban-render DMESG_WARN(2, M21)PASS(2, M21) TIMEOUT(1, M4)PASS(3, M4) IVB igt_gem_reset_stats_close-pending-blt PASS(1, M21) TIMEOUT(1, M4)PASS(3, M4) IVB igt_gem_reset_stats_close-pending-bsd PASS(1, M21) TIMEOUT(1, M4)PASS(3, M4) IVB igt_gem_reset_stats_close-pending-ctx-render PASS(1, M21) TIMEOUT(1, M4)PASS(3, M4) IVB igt_gem_reset_stats_close-pending-fork-blt PASS(1, M21) TIMEOUT(1, M4)PASS(3, M4) IVB igt_gem_reset_stats_close-pending-fork-bsd PASS(1, M21) TIMEOUT(1, M4)PASS(3, M4) IVB igt_gem_reset_stats_close-pending-fork-render PASS(1, M21) TIMEOUT(1, M4)PASS(3, M4) IVB igt_gem_reset_stats_close-pending-fork-reverse-blt PASS(1, M21) TIMEOUT(1, M4)PASS(3, M4) IVB igt_gem_reset_stats_close-pending-fork-reverse-bsd PASS(1, M21) TIMEOUT(1, M4)PASS(3, M4) IVB igt_gem_reset_stats_close-pending-fork-reverse-render PASS(1, M21) TIMEOUT(1, M4)PASS(3, M4) IVB igt_gem_reset_stats_close-pending-render PASS(1, M21) TIMEOUT(1, M4)PASS(3, M4) IVB igt_gem_reset_stats_reset-count-blt PASS(1, M21) TIMEOUT(1, M4)PASS(3, M4) IVB igt_gem_reset_stats_reset-count-bsd PASS(1, M21) TIMEOUT(1, M4)PASS(3, M4) IVB igt_gem_reset_stats_reset-count-ctx-render PASS(1, M21) TIMEOUT(1, M4)PASS(3, M4) IVB igt_gem_reset_stats_reset-count-render PASS(1, M21) TIMEOUT(1, M4)PASS(3, M4) IVB igt_gem_reset_stats_reset-stats-blt PASS(1, M21) TIMEOUT(1, M4)PASS(3, M4) IVB igt_gem_reset_stats_reset-stats-bsd PASS(1, M21) TIMEOUT(1, M4)PASS(3, M4) IVB igt_gem_reset_stats_reset-stats-ctx-render PASS(1, M21) TIMEOUT(1, M4)PASS(3, M4) IVB igt_gem_reset_stats_reset-stats-render PASS(1, M21) TIMEOUT(1, M4)PASS(3, M4) IVB igt_gem_reset_stats_unrelated-ctx-render PASS(1, M21) TIMEOUT(1, M4)PASS(3, M4) IVB igt_gem_workarounds_reset PASS(4, M21) TIMEOUT(1, M4)PASS(3, M4) IVB igt_kms_pipe_crc_basic_hang-read-crc-pipe-A PASS(1, M21) TIMEOUT(1, M4)PASS(3, M4) IVB igt_kms_pipe_crc_basic_hang-read-crc-pipe-B PASS(1, M21) TIMEOUT(1, M4)PASS(3, M4) IVB igt_kms_pipe_crc_basic_hang-read-crc-pipe-C PASS(1, M21) TIMEOUT(1, M4)PASS(3, M4) IVB igt_pm_rps_min-max-config-idle PASS(1, M21) FAIL(1, M4)PASS(3, M4) BYT igt_drv_missed_irq_hang TIMEOUT(35, M36M31)PASS(2, M36M31) TIMEOUT(1, M36)PASS(3, M36) HSW igt_drv_hangman_error-state-basic TIMEOUT(11, M20M40)PASS(4, M19M40) TIMEOUT(1, M40)PASS(3, M40) HSW igt_drv_hangman_error-state-capture-blt TIMEOUT(7, M20M40)PASS(1, M19) TIMEOUT(1, M40)PASS(3, M40) HSW igt_drv_hangman_error-state-capture-bsd PASS(1, M19) TIMEOUT(1, M40)PASS(3, M40) HSW igt_drv_hangman_error-state-capture-render PASS(1, M19) TIMEOUT(1, M40)PASS(3, M40) HSW igt_drv_hangman_error-state-capture-vebox PASS(1, M19) TIMEOUT(1, M40)PASS(3, M40) HSW igt_drv_missed_irq_hang PASS(1, M19) TIMEOUT(1, M40)PASS(3, M40) HSW igt_gem_reset_stats_ban-bsd PASS(4, M19M40) TIMEOUT(1, M40)PASS(3, M40) HSW igt_gem_reset_stats_ban-ctx-render PASS(1, M19) TIMEOUT(1, M40)PASS(3, M40) HSW igt_gem_reset_stats_ban-render PASS(1, M19) TIMEOUT(1, M40)PASS(3, M40) HSW igt_gem_reset_stats_ban-vebox PASS(1, M19) TIMEOUT(1, M40)PASS(3, M40) HSW igt_gem_reset_stats_close-pending-blt PASS(1, M19) TIMEOUT(1, M40)PASS(3, M40) HSW igt_gem_reset_stats_close-pending-bsd PASS(1, M19) TIMEOUT(1, M40)PASS(3, M40) HSW igt_gem_reset_stats_close-pending-ctx-render PASS(1, M19) TIMEOUT(1, M40)PASS(3, M40) HSW igt_gem_reset_stats_close-pending-fork-blt PASS(1, M19) TIMEOUT(1, M40)PASS(3, M40) HSW igt_gem_reset_stats_close-pending-fork-bsd PASS(1, M19) TIMEOUT(1, M40)PASS(3, M40) HSW igt_gem_reset_stats_close-pending-fork-render PASS(1, M19) TIMEOUT(1, M40)PASS(3, M40) HSW igt_gem_reset_stats_close-pending-fork-reverse-blt PASS(1, M19) TIMEOUT(1, M40)PASS(3, M40) HSW igt_gem_reset_stats_close-pending-fork-reverse-bsd PASS(1, M19) TIMEOUT(1, M40)PASS(3, M40) HSW igt_gem_reset_stats_close-pending-fork-reverse-render PASS(1, M19) TIMEOUT(1, M40)PASS(3, M40) HSW igt_gem_reset_stats_close-pending-fork-reverse-vebox PASS(1, M19) TIMEOUT(1, M40)PASS(3, M40) BDW igt_drv_hangman_error-state-basic TIMEOUT(18, M28M30)PASS(4, M28M30) TIMEOUT(1, M30)PASS(3, M30) BDW igt_drv_hangman_error-state-capture-blt TIMEOUT(17, M28M30)PASS(1, M28) TIMEOUT(1, M30)PASS(3, M30) BDW igt_drv_hangman_error-state-capture-bsd TIMEOUT(1, M28)PASS(1, M28) TIMEOUT(1, M30)PASS(3, M30) BDW igt_drv_hangman_error-state-capture-render PASS(1, M28) TIMEOUT(1, M30)PASS(3, M30) BDW igt_drv_hangman_error-state-capture-vebox PASS(1, M28) TIMEOUT(1, M30)PASS(3, M30) BDW igt_gem_reset_stats_ban-blt PASS(1, M28) TIMEOUT(1, M30)PASS(3, M30) BDW igt_gem_reset_stats_ban-bsd PASS(1, M28) TIMEOUT(1, M30)PASS(3, M30) BDW igt_gem_reset_stats_ban-ctx-render PASS(1, M28) TIMEOUT(1, M30)PASS(3, M30) BDW igt_gem_reset_stats_ban-render PASS(1, M28) TIMEOUT(1, M30)PASS(3, M30) BDW igt_gem_reset_stats_ban-vebox PASS(1, M28) TIMEOUT(1, M30)PASS(3, M30) BDW igt_gem_reset_stats_close-pending-blt PASS(1, M28) TIMEOUT(1, M30)PASS(3, M30) BDW igt_gem_reset_stats_close-pending-bsd PASS(1, M28) TIMEOUT(1, M30)PASS(3, M30) BDW igt_gem_reset_stats_close-pending-ctx-render PASS(1, M28) TIMEOUT(1, M30)PASS(3, M30) BDW igt_gem_reset_stats_close-pending-fork-blt PASS(1, M28) TIMEOUT(1, M30)PASS(3, M30) BDW igt_gem_reset_stats_close-pending-fork-bsd PASS(1, M28) TIMEOUT(1, M30)PASS(3, M30) BDW igt_gem_reset_stats_close-pending-fork-render PASS(1, M28) TIMEOUT(1, M30)PASS(3, M30) BDW igt_gem_reset_stats_close-pending-fork-reverse-blt PASS(1, M28) TIMEOUT(1, M30)PASS(3, M30) BDW igt_gem_reset_stats_close-pending-fork-reverse-bsd PASS(1, M28) TIMEOUT(1, M30)PASS(3, M30) BDW igt_gem_reset_stats_close-pending-fork-reverse-render PASS(1, M28) TIMEOUT(1, M30)PASS(3, M30) BDW igt_gem_reset_stats_close-pending-fork-reverse-vebox PASS(1, M28) TIMEOUT(1, M30)PASS(3, M30)
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx