drm/i915: vlv: fix save/restore of MAX_REQ_COUNT reg
Subsystems (2)
PATCH 1/1 drm/i915: vlv: fix save/restore of MAX_REQ_COUNT reg
Due this typo we don't save/restore the MAX_REQ_COUNT register across suspend/resume, so fix this.
This was introduced in
commit ddeea5b0c36f3665446518c609be91f9336ef674
Author: Imre Deak <[email protected]> Date: Mon May 5 15:19:56 2014 +0300
drm/i915: vlv: add runtime PM support
I noticed this only by reading the code. To my knowledge it shouldn't cause any real problems at the moment, since the power well backing this register remains on across a runtime s/r. This may change once system-wide s0ix functionality is enabled in the kernel.
--- drivers/gpu/drm/i915/i915_drv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +2 -2
@@ -1031,7 +1031,7 @@ static void vlv_save_gunit_s0ix_state(struct drm_i915_private *dev_priv) s->lra_limits[i] =I915_READ (GEN7_LRA_LIMITS_BASE + i *4 ); s->media_max_req_count =I915_READ (GEN7_MEDIA_MAX_REQ_COUNT ); - s->gfx_max_req_count =I915_READ (GEN7_MEDIA_MAX_REQ_COUNT ); + s->gfx_max_req_count =I915_READ (GEN7_MAX_REQ_COUNT ); s->render_hwsp =I915_READ (RENDER_HWS_PGA_GEN7 ); s->ecochk =I915_READ (GAM_ECOCHK );
@@ -1112,7 +1112,7 @@ static void vlv_restore_gunit_s0ix_state(struct drm_i915_private *dev_priv)I915_WRITE (GEN7_LRA_LIMITS_BASE + i *4 , s->lra_limits[i]);I915_WRITE (GEN7_MEDIA_MAX_REQ_COUNT , s->media_max_req_count); -I915_WRITE (GEN7_MEDIA_MAX_REQ_COUNT , s->gfx_max_req_count); +I915_WRITE (GEN7_MAX_REQ_COUNT , s->gfx_max_req_count);I915_WRITE (RENDER_HWS_PGA_GEN7 , s->render_hwsp);I915_WRITE (GAM_ECOCHK , s->ecochk);
Signature · 6 lines
1.8.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 1/1 drm/i915: vlv: fix save/restore of GFX_MAX_REQ_COUNT reg
Due this typo we don't save/restore the GFX_MAX_REQ_COUNT register across suspend/resume, so fix this.
This was introduced in
commit ddeea5b0c36f3665446518c609be91f9336ef674
Author: Imre Deak <[email protected]> Date: Mon May 5 15:19:56 2014 +0300
drm/i915: vlv: add runtime PM support
I noticed this only by reading the code. To my knowledge it shouldn't cause any real problems at the moment, since the power well backing this register remains on across a runtime s/r. This may change once system-wide s0ix functionality is enabled in the kernel.
v2:
- resend after a missing git add -u :/
--- drivers/gpu/drm/i915/i915_drv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +2 -2
@@ -1031,7 +1031,7 @@ static void vlv_save_gunit_s0ix_state(struct drm_i915_private *dev_priv) s->lra_limits[i] =I915_READ (GEN7_LRA_LIMITS_BASE + i *4 ); s->media_max_req_count =I915_READ (GEN7_MEDIA_MAX_REQ_COUNT ); - s->gfx_max_req_count =I915_READ (GEN7_MEDIA_MAX_REQ_COUNT ); + s->gfx_max_req_count =I915_READ (GEN7_GFX_MAX_REQ_COUNT ); s->render_hwsp =I915_READ (RENDER_HWS_PGA_GEN7 ); s->ecochk =I915_READ (GAM_ECOCHK );
@@ -1112,7 +1112,7 @@ static void vlv_restore_gunit_s0ix_state(struct drm_i915_private *dev_priv)I915_WRITE (GEN7_LRA_LIMITS_BASE + i *4 , s->lra_limits[i]);I915_WRITE (GEN7_MEDIA_MAX_REQ_COUNT , s->media_max_req_count); -I915_WRITE (GEN7_MEDIA_MAX_REQ_COUNT , s->gfx_max_req_count); +I915_WRITE (GEN7_GFX_MAX_REQ_COUNT , s->gfx_max_req_count);I915_WRITE (RENDER_HWS_PGA_GEN7 , s->render_hwsp);I915_WRITE (GAM_ECOCHK , s->ecochk);
Signature · 6 lines
1.8.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2] drm/i915: vlv: fix save/restore of
-------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
PNV -1 364/364 363/364
ILK +1-3 365/366 363/366
SNB 450/450 450/450 IVB 498/498 498/498 BYT 289/289 289/289 HSW 564/564 564/564 BDW 417/417 417/417 -------------------------------------Detailed------------------------------------- Platform Test drm-intel-nightly Series Applied *PNV igt_kms_sysfs_edid_timing PASS(2, M25M7) FAIL(1, M7) ILK igt_kms_flip_bcs-flip-vs-modeset-interruptible DMESG_WARN(1, M26)PASS(3, M26) DMESG_WARN(1, M26) ILK igt_kms_flip_busy-flip-interruptible DMESG_WARN(1, M26)PASS(3, M26) DMESG_WARN(1, M26) *ILK igt_kms_flip_rcs-flip-vs-dpms PASS(3, M26) DMESG_WARN(1, M26) ILK igt_kms_flip_wf_vblank-ts-check DMESG_WARN(2, M26)PASS(5, M26M37) PASS(1, M26)
Note: You need to pay more attention to line start with '*'
_______________________________________________
Intel-gfx mailing list [email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx