• Imre Deak's avatar
    drm/i915: remove extraneous VGA power domain put calls · 713028b3
    Imre Deak authored
    In recent dmesg logs reported for unrelated issues I noticed some power
    domain WARNs caused by the following.
    
    The workaround
    
    commit ce352550
    Author: Ville Syrjälä <ville.syrjala@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 a1485320
    Author: Ville Syrjälä <ville.syrjala@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 7f16e5c1
    Merge: 9d1cb914 5e01dc7b
    Author: Daniel Vetter <daniel.vetter@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: default avatarImre Deak <imre.deak@intel.com>
    Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
    Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
    713028b3
i915_dma.c 54.6 KB