On Tue, 11 Nov 2014, Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> wrote:
> On Tue, Nov 11, 2014 at 04:48:03PM +0200, Jani Nikula wrote:
>> Don't save the panel power sequencer register on vlv/chv for two simple
>> reasons. First, these are the wrong registers to save to begin
>> with. Second, they are not restored anyway.
>
> Indeed. I also like how the display save/restore functions look nothing
> alike. Scary piece of code this, hopefully someone will kill it all at
> some point...
Yup, one patch at a time!
Jani.
>
> But anyways, patch is good, so:
> Reviewed-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
>
>>
>> Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx>
>> ---
>> drivers/gpu/drm/i915/i915_suspend.c | 3 +--
>> 1 file changed, 1 insertion(+), 2 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/i915_suspend.c b/drivers/gpu/drm/i915/i915_suspend.c
>> index 043123c77a1f..bd8adf2ca7d8 100644
>> --- a/drivers/gpu/drm/i915/i915_suspend.c
>> +++ b/drivers/gpu/drm/i915/i915_suspend.c
>> @@ -208,7 +208,6 @@ static void i915_save_display(struct drm_device *dev)
>> if (HAS_PCH_IBX(dev) || HAS_PCH_CPT(dev))
>> dev_priv->regfile.saveLVDS = I915_READ(PCH_LVDS);
>> } else if (IS_VALLEYVIEW(dev)) {
>> - dev_priv->regfile.savePP_CONTROL = I915_READ(PP_CONTROL);
>> dev_priv->regfile.savePFIT_PGM_RATIOS = I915_READ(PFIT_PGM_RATIOS);
>>
>> dev_priv->regfile.saveBLC_HIST_CTL =
>> @@ -230,7 +229,7 @@ static void i915_save_display(struct drm_device *dev)
>> dev_priv->regfile.savePP_ON_DELAYS = I915_READ(PCH_PP_ON_DELAYS);
>> dev_priv->regfile.savePP_OFF_DELAYS = I915_READ(PCH_PP_OFF_DELAYS);
>> dev_priv->regfile.savePP_DIVISOR = I915_READ(PCH_PP_DIVISOR);
>> - } else {
>> + } else if (!IS_VALLEYVIEW(dev)) {
>> dev_priv->regfile.savePP_ON_DELAYS = I915_READ(PP_ON_DELAYS);
>> dev_priv->regfile.savePP_OFF_DELAYS = I915_READ(PP_OFF_DELAYS);
>> dev_priv->regfile.savePP_DIVISOR = I915_READ(PP_DIVISOR);
>> --
>> 2.1.1
>>
>> _______________________________________________
>> Intel-gfx mailing list
>> Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
>> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
>
> --
> Ville Syrjälä
> Intel OTC
--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
