]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
drm/i915: Remove duplicated dpcd write on hsw_psr_enable_sink.
authorRodrigo Vivi <rodrigo.vivi@intel.com>
Thu, 12 Nov 2015 22:46:05 +0000 (14:46 -0800)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 24 Nov 2015 12:27:43 +0000 (13:27 +0100)
Commit (89251b17) intended to remove this line and let only one
DP_PSR_EN_CFG set, but it was wrong and this call is now duplicated
at the code.

Also "& ~DP_PSR_MAIN_LINK_ACTIVE" doesn't do anything at all. It
was like that since I introduced this call but probably the idea
was to be informative and make clear statement that we were not using
the link standby. So it is better to remove this one here and let
the code a bit cleaner.

v2: Improve commit message as requested by Paulo.

Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
Tested-by: Brian Norris <briannorris@chromium.org>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: Damien Lespiau damien.lespiau@intel.com
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/intel_psr.c

index bc5ea2a6cf4c3d107fee3c92c88d92650e49b236..9c64807e88cf8905044c29b22ff6d0bcfb691aff 100644 (file)
@@ -191,9 +191,6 @@ static void hsw_psr_enable_sink(struct intel_dp *intel_dp)
 
        aux_clock_divider = intel_dp->get_aux_clock_divider(intel_dp, 0);
 
-       drm_dp_dpcd_writeb(&intel_dp->aux, DP_PSR_EN_CFG,
-                          DP_PSR_ENABLE & ~DP_PSR_MAIN_LINK_ACTIVE);
-
        /* Enable AUX frame sync at sink */
        if (dev_priv->psr.aux_frame_sync)
                drm_dp_dpcd_writeb(&intel_dp->aux,