drm/i915: vlv: reserve GT power context early
Subsystems (2)
PATCH 1/1 drm/i915: vlv: reserve GT power context early
We reserve the space for the power context in stolen memory at a fixed address from a delayed work. This races with the subsequent driver init/resume code which could allocate something at that address, so the reservation for the power context fails. Reserve the space up-front, so this can't happen. This also adds a missing struct_mutex lock around the stolen allocation, which wasn't taken in the delayed work path.
--- drivers/gpu/drm/i915/intel_pm.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +4 -2
@@ -3554,6 +3554,8 @@ static void valleyview_setup_pctx(struct drm_device *dev)u32 pcbr;int pctx_size =24 *1024 ; +WARN_ON (!mutex_is_locked (&dev->struct_mutex)); + pcbr =I915_READ (VLV_PCBR );if (pcbr) {/* BIOS set it up already, grab the pre-alloc'd space */
@@ -3603,8 +3605,6 @@ static void valleyview_enable_rps(struct drm_device *dev)I915_WRITE (GTFIFODBG , gtfifodbg); } -valleyview_setup_pctx (dev); -/* If VLV, Forcewake all wells, else re-direct to regular path */ gen6_gt_force_wake_get (dev_priv,FORCEWAKE_ALL );
@@ -4471,6 +4471,8 @@ void intel_enable_gt_powersave(struct drm_device *dev)ironlake_enable_rc6 (dev);intel_init_emon (dev); }else if (IS_GEN6 (dev) ||IS_GEN7 (dev)) { +if (IS_VALLEYVIEW (dev)) +valleyview_setup_pctx (dev);/* * PCU communication is slow and this doesn't need to be * done at any specific time, so do this out of our fast path
Signature · 1 line
1.8.4
Quoted 8 lines · Imre Deak
We reserve the space for the power context in stolen memory at a fixed address from a delayed work. This races with the subsequent driver init/resume code which could allocate something at that address, so the reservation for the power context fails. Reserve the space up-front, so this can't happen. This also adds a missing
struct_mutexlock around the stolen allocation, which wasn't taken in the delayed work path.Signed-off-by Imre Deak <[email protected]>
Pushed to -fixes with Jesse's IRC R-b. Thanks for the patch and review.
BR,
Jani.
Quoted 42 lines
--- drivers/gpu/drm/i915/intel_pm.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/intel_pm.c +4
-2@@ -3554,6 +3554,8 @@ static void valleyview_setup_pctx(struct drm_device *dev)u32 pcbr;int pctx_size =24 *1024 ; +WARN_ON (!mutex_is_locked (&dev->struct_mutex)); + pcbr =I915_READ (VLV_PCBR );if (pcbr) {/* BIOS set it up already, grab the pre-alloc'd space */ @@ -3603,8 +3605,6 @@ static void valleyview_enable_rps(struct drm_device *dev)I915_WRITE (GTFIFODBG , gtfifodbg); } -valleyview_setup_pctx (dev); -/* If VLV, Forcewake all wells, else re-direct to regular path */ gen6_gt_force_wake_get (dev_priv,FORCEWAKE_ALL );@@ -4471,6 +4471,8 @@ void intel_enable_gt_powersave(struct drm_device *dev)ironlake_enable_rc6 (dev);intel_init_emon (dev); }else if (IS_GEN6 (dev) ||IS_GEN7 (dev)) { +if (IS_VALLEYVIEW (dev)) +valleyview_setup_pctx (dev);/* * PCU communication is slow and this doesn't need to be * done at any specific time, so do this out of our fast path Signature · 6 lines
1.8.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 1 line
Jani Nikula, Intel Open Source Technology Center