[Intel-gfx] [PATCH] drm/i915: remove extraneous VGA power domain put calls

[Daniel Vetter]

On Fri, Apr 25, 2014 at 07:14:42PM +0300, Ville Syrjälä wrote:
> On Fri, Apr 25, 2014 at 05:28:00PM +0300, Imre Deak wrote:
> > In recent dmesg logs reported for unrelated issues I noticed some power
> > domain WARNs caused by the following.
> > 
> > The workaround
> > 
> > commit ce352550327b394f3072a07c9cd9d27af9276f15
> > Author: Ville Syrjälä <ville.syrjala at linux.intel.com>
> > Date:   Fri Sep 20 10:14:23 2013 +0300
> > 
> >     drm/i915: Fix unclaimed register access due to delayed VGA memory disable
> > 
> > and following fixup of it
> > 
> > commit a14853206517b0c8102accbc77401805a0dbdb9e
> > Author: Ville Syrjälä <ville.syrjala at linux.intel.com>
> > Date:   Mon Sep 16 17:38:34 2013 +0300
> > 
> >     drm/i915: Move power well init earlier during driver load
> > 
> > was partially reverted by
> > 
> > commit 7f16e5c1416070dc590dd333a2d677700046a4ab
> > Merge: 9d1cb91 5e01dc7
> > Author: Daniel Vetter <daniel.vetter at ffwll.ch>
> > Date:   Mon Nov 4 16:28:47 2013 +0100
> > 
> >     Merge tag 'v3.12' into drm-intel-next
> > 
> > but kept the power domain put calls on the error path.
> > 
> > I think for now we can keep things as-is (not reintroduce the w/a) and just fix
> > the error path, since
> > - nobody complained seeing this issue
> > - according to Ville someone is reworking the VGA arbitration scheme at the
> >   moment and when that's ready we have to rethink this part anyway
> > 
> > So fix this by just removing the put calls from the error path as well.
> > 
> > Signed-off-by: Imre Deak <imre.deak at intel.com>
> 
> Reviewed-by: Ville Syrjälä <ville.syrjala at linux.intel.com>

Oops, forgotten to mention that this one is merged to dinq.
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch