On Tue, Aug 09, 2016 at 02:34:08PM +0300, Imre Deak wrote: > These two flags mean the same thing, so remove the duplication. > > Signed-off-by: Imre Deak <[email protected]>
Reviewed-by: Ville Syrjälä <[email protected]> > --- > drivers/gpu/drm/i915/i915_reg.h | 1 - > drivers/gpu/drm/i915/intel_dp.c | 6 +++--- > drivers/gpu/drm/i915/intel_lvds.c | 4 ++-- > 3 files changed, 5 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h > index b65fe50..889508f 100644 > --- a/drivers/gpu/drm/i915/i915_reg.h > +++ b/drivers/gpu/drm/i915/i915_reg.h > @@ -3707,7 +3707,6 @@ enum { > #define PANEL_POWER_RESET (1 << 1) > #define PANEL_POWER_OFF (0 << 0) > #define PANEL_POWER_ON (1 << 0) > -#define POWER_TARGET_ON (1 << 0) > > #define _PP_ON_DELAYS 0x61208 > #define PP_ON_DELAYS(pps_idx) _MMIO_PPS(pps_idx, > _PP_ON_DELAYS) > diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c > index a5cef91..4796ad7 100644 > --- a/drivers/gpu/drm/i915/intel_dp.c > +++ b/drivers/gpu/drm/i915/intel_dp.c > @@ -1950,7 +1950,7 @@ static void edp_panel_vdd_off_sync(struct intel_dp > *intel_dp) > DRM_DEBUG_KMS("PP_STATUS: 0x%08x PP_CONTROL: 0x%08x\n", > I915_READ(pp_stat_reg), I915_READ(pp_ctrl_reg)); > > - if ((pp & POWER_TARGET_ON) == 0) > + if ((pp & PANEL_POWER_ON) == 0) > intel_dp->panel_power_off_time = ktime_get_boottime(); > > power_domain = intel_display_port_aux_power_domain(intel_encoder); > @@ -2037,7 +2037,7 @@ static void edp_panel_on(struct intel_dp *intel_dp) > POSTING_READ(pp_ctrl_reg); > } > > - pp |= POWER_TARGET_ON; > + pp |= PANEL_POWER_ON; > if (!IS_GEN5(dev)) > pp |= PANEL_POWER_RESET; > > @@ -2089,7 +2089,7 @@ static void edp_panel_off(struct intel_dp *intel_dp) > pp = ironlake_get_pp_control(intel_dp); > /* We need to switch off panel power _and_ force vdd, for otherwise some > * panels get very unhappy and cease to work. */ > - pp &= ~(POWER_TARGET_ON | PANEL_POWER_RESET | EDP_FORCE_VDD | > + pp &= ~(PANEL_POWER_ON | PANEL_POWER_RESET | EDP_FORCE_VDD | > EDP_BLC_ENABLE); > > pp_ctrl_reg = _pp_ctrl_reg(intel_dp); > diff --git a/drivers/gpu/drm/i915/intel_lvds.c > b/drivers/gpu/drm/i915/intel_lvds.c > index 413e729..c5739fc 100644 > --- a/drivers/gpu/drm/i915/intel_lvds.c > +++ b/drivers/gpu/drm/i915/intel_lvds.c > @@ -220,7 +220,7 @@ static void intel_enable_lvds(struct intel_encoder > *encoder) > > I915_WRITE(lvds_encoder->reg, I915_READ(lvds_encoder->reg) | > LVDS_PORT_EN); > > - I915_WRITE(PP_CONTROL(0), I915_READ(PP_CONTROL(0)) | POWER_TARGET_ON); > + I915_WRITE(PP_CONTROL(0), I915_READ(PP_CONTROL(0)) | PANEL_POWER_ON); > POSTING_READ(lvds_encoder->reg); > if (intel_wait_for_register(dev_priv, PP_STATUS(0), PP_ON, PP_ON, 1000)) > DRM_ERROR("timed out waiting for panel to power on\n"); > @@ -234,7 +234,7 @@ static void intel_disable_lvds(struct intel_encoder > *encoder) > struct intel_lvds_encoder *lvds_encoder = > to_lvds_encoder(&encoder->base); > struct drm_i915_private *dev_priv = to_i915(dev); > > - I915_WRITE(PP_CONTROL(0), I915_READ(PP_CONTROL(0)) & ~POWER_TARGET_ON); > + I915_WRITE(PP_CONTROL(0), I915_READ(PP_CONTROL(0)) & ~PANEL_POWER_ON); > if (intel_wait_for_register(dev_priv, PP_STATUS(0), PP_ON, 0, 1000)) > DRM_ERROR("timed out waiting for panel to power off\n"); > > -- > 2.5.0 > > _______________________________________________ > Intel-gfx mailing list > [email protected] > https://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
