| Message ID | 7987938a7950853ac3ee43c82fb9cbb0cd59a2fa.1547726792.git.jani.nikula@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915: introduce macros to define register contents | expand |
Jani Nikula <jani.nikula@intel.com> writes: > It's superfluous. One could argue that it has a minor documentative purpose. But there is comment for that. Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com> > > Signed-off-by: Jani Nikula <jani.nikula@intel.com> > --- > drivers/gpu/drm/i915/i915_reg.h | 1 - > drivers/gpu/drm/i915/intel_dp.c | 3 +-- > 2 files changed, 1 insertion(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h > index 9a1340cfda6c..93cbd057c07a 100644 > --- a/drivers/gpu/drm/i915/i915_reg.h > +++ b/drivers/gpu/drm/i915/i915_reg.h > @@ -4687,7 +4687,6 @@ enum { > #define EDP_FORCE_VDD (1 << 3) > #define EDP_BLC_ENABLE (1 << 2) > #define PANEL_POWER_RESET (1 << 1) > -#define PANEL_POWER_OFF (0 << 0) > #define PANEL_POWER_ON (1 << 0) > > #define _PP_ON_DELAYS 0x61208 > diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c > index 808ccdae15b8..f7d5314e3395 100644 > --- a/drivers/gpu/drm/i915/intel_dp.c > +++ b/drivers/gpu/drm/i915/intel_dp.c > @@ -1000,8 +1000,7 @@ static int edp_notify_handler(struct notifier_block *this, unsigned long code, > > /* 0x1F write to PP_DIV_REG sets max cycle delay */ > I915_WRITE(pp_div_reg, pp_div | 0x1F); > - I915_WRITE(pp_ctrl_reg, > - PANEL_UNLOCK_REGS | PANEL_POWER_OFF); > + I915_WRITE(pp_ctrl_reg, PANEL_UNLOCK_REGS); > msleep(intel_dp->panel_power_cycle_delay); > } > } > -- > 2.20.1
On Thu, 17 Jan 2019, Mika Kuoppala <mika.kuoppala@linux.intel.com> wrote: > Jani Nikula <jani.nikula@intel.com> writes: > >> It's superfluous. > > One could argue that it has a minor documentative purpose. > But there is comment for that. > > Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com> Thanks, pushed this one. BR, Jani. > >> >> Signed-off-by: Jani Nikula <jani.nikula@intel.com> >> --- >> drivers/gpu/drm/i915/i915_reg.h | 1 - >> drivers/gpu/drm/i915/intel_dp.c | 3 +-- >> 2 files changed, 1 insertion(+), 3 deletions(-) >> >> diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h >> index 9a1340cfda6c..93cbd057c07a 100644 >> --- a/drivers/gpu/drm/i915/i915_reg.h >> +++ b/drivers/gpu/drm/i915/i915_reg.h >> @@ -4687,7 +4687,6 @@ enum { >> #define EDP_FORCE_VDD (1 << 3) >> #define EDP_BLC_ENABLE (1 << 2) >> #define PANEL_POWER_RESET (1 << 1) >> -#define PANEL_POWER_OFF (0 << 0) >> #define PANEL_POWER_ON (1 << 0) >> >> #define _PP_ON_DELAYS 0x61208 >> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c >> index 808ccdae15b8..f7d5314e3395 100644 >> --- a/drivers/gpu/drm/i915/intel_dp.c >> +++ b/drivers/gpu/drm/i915/intel_dp.c >> @@ -1000,8 +1000,7 @@ static int edp_notify_handler(struct notifier_block *this, unsigned long code, >> >> /* 0x1F write to PP_DIV_REG sets max cycle delay */ >> I915_WRITE(pp_div_reg, pp_div | 0x1F); >> - I915_WRITE(pp_ctrl_reg, >> - PANEL_UNLOCK_REGS | PANEL_POWER_OFF); >> + I915_WRITE(pp_ctrl_reg, PANEL_UNLOCK_REGS); >> msleep(intel_dp->panel_power_cycle_delay); >> } >> } >> -- >> 2.20.1 > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index 9a1340cfda6c..93cbd057c07a 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h @@ -4687,7 +4687,6 @@ enum { #define EDP_FORCE_VDD (1 << 3) #define EDP_BLC_ENABLE (1 << 2) #define PANEL_POWER_RESET (1 << 1) -#define PANEL_POWER_OFF (0 << 0) #define PANEL_POWER_ON (1 << 0) #define _PP_ON_DELAYS 0x61208 diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index 808ccdae15b8..f7d5314e3395 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -1000,8 +1000,7 @@ static int edp_notify_handler(struct notifier_block *this, unsigned long code, /* 0x1F write to PP_DIV_REG sets max cycle delay */ I915_WRITE(pp_div_reg, pp_div | 0x1F); - I915_WRITE(pp_ctrl_reg, - PANEL_UNLOCK_REGS | PANEL_POWER_OFF); + I915_WRITE(pp_ctrl_reg, PANEL_UNLOCK_REGS); msleep(intel_dp->panel_power_cycle_delay); } }
It's superfluous. Signed-off-by: Jani Nikula <jani.nikula@intel.com> --- drivers/gpu/drm/i915/i915_reg.h | 1 - drivers/gpu/drm/i915/intel_dp.c | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-)