| Message ID | 20200221172927.510027-1-hdegoede@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [resend,1/2] drm/i915: panel: Use intel_panel_compute_brightness() from pwm_setup_backlight() | expand |
Hi All, On 2/21/20 6:29 PM, Hans de Goede wrote: > Use intel_panel_compute_brightness() from pwm_setup_backlight() so that > we correctly take i915_modparams.invert_brightness and/or > QUIRK_INVERT_BRIGHTNESS into account when setting + getting the initial > brightness value. > > Signed-off-by: Hans de Goede <hdegoede@redhat.com> ping? Any chance I can get a review from someone on this series? Both patches are pretty trivial really... Regards, Hans > --- > drivers/gpu/drm/i915/display/intel_panel.c | 18 +++++++++++------- > 1 file changed, 11 insertions(+), 7 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_panel.c b/drivers/gpu/drm/i915/display/intel_panel.c > index 7b3ec6eb3382..9ebee7d93414 100644 > --- a/drivers/gpu/drm/i915/display/intel_panel.c > +++ b/drivers/gpu/drm/i915/display/intel_panel.c > @@ -1843,6 +1843,7 @@ static int pwm_setup_backlight(struct intel_connector *connector, > struct drm_i915_private *dev_priv = to_i915(dev); > struct intel_panel *panel = &connector->panel; > const char *desc; > + u32 level, ns; > int retval; > > /* Get the right PWM chip for DSI backlight according to VBT */ > @@ -1866,8 +1867,12 @@ static int pwm_setup_backlight(struct intel_connector *connector, > */ > pwm_apply_args(panel->backlight.pwm); > > - retval = pwm_config(panel->backlight.pwm, CRC_PMIC_PWM_PERIOD_NS, > - CRC_PMIC_PWM_PERIOD_NS); > + panel->backlight.min = 0; /* 0% */ > + panel->backlight.max = 100; /* 100% */ > + level = intel_panel_compute_brightness(connector, 100); > + ns = DIV_ROUND_UP(level * CRC_PMIC_PWM_PERIOD_NS, 100); > + > + retval = pwm_config(panel->backlight.pwm, ns, CRC_PMIC_PWM_PERIOD_NS); > if (retval < 0) { > DRM_ERROR("Failed to configure the pwm chip\n"); > pwm_put(panel->backlight.pwm); > @@ -1875,11 +1880,10 @@ static int pwm_setup_backlight(struct intel_connector *connector, > return retval; > } > > - panel->backlight.min = 0; /* 0% */ > - panel->backlight.max = 100; /* 100% */ > - panel->backlight.level = DIV_ROUND_UP( > - pwm_get_duty_cycle(panel->backlight.pwm) * 100, > - CRC_PMIC_PWM_PERIOD_NS); > + level = DIV_ROUND_UP(pwm_get_duty_cycle(panel->backlight.pwm) * 100, > + CRC_PMIC_PWM_PERIOD_NS); > + panel->backlight.level = > + intel_panel_compute_brightness(connector, level); > panel->backlight.enabled = panel->backlight.level != 0; > > DRM_INFO("Using %s PWM for LCD backlight control\n", desc); >
On Tue, 03 Mar 2020, Hans de Goede <hdegoede@redhat.com> wrote: > Hi All, > > On 2/21/20 6:29 PM, Hans de Goede wrote: >> Use intel_panel_compute_brightness() from pwm_setup_backlight() so that >> we correctly take i915_modparams.invert_brightness and/or >> QUIRK_INVERT_BRIGHTNESS into account when setting + getting the initial >> brightness value. >> >> Signed-off-by: Hans de Goede <hdegoede@redhat.com> > > ping? Any chance I can get a review from someone on this series? > > Both patches are pretty trivial really... For both, Reviewed-by: Jani Nikula <jani.nikula@intel.com> And sad trombone, I was hoping I could nuke the whole module parameter one of these days. It used to be something associated with gen4 only. BR, Jani. > > Regards, > > Hans > > > >> --- >> drivers/gpu/drm/i915/display/intel_panel.c | 18 +++++++++++------- >> 1 file changed, 11 insertions(+), 7 deletions(-) >> >> diff --git a/drivers/gpu/drm/i915/display/intel_panel.c b/drivers/gpu/drm/i915/display/intel_panel.c >> index 7b3ec6eb3382..9ebee7d93414 100644 >> --- a/drivers/gpu/drm/i915/display/intel_panel.c >> +++ b/drivers/gpu/drm/i915/display/intel_panel.c >> @@ -1843,6 +1843,7 @@ static int pwm_setup_backlight(struct intel_connector *connector, >> struct drm_i915_private *dev_priv = to_i915(dev); >> struct intel_panel *panel = &connector->panel; >> const char *desc; >> + u32 level, ns; >> int retval; >> >> /* Get the right PWM chip for DSI backlight according to VBT */ >> @@ -1866,8 +1867,12 @@ static int pwm_setup_backlight(struct intel_connector *connector, >> */ >> pwm_apply_args(panel->backlight.pwm); >> >> - retval = pwm_config(panel->backlight.pwm, CRC_PMIC_PWM_PERIOD_NS, >> - CRC_PMIC_PWM_PERIOD_NS); >> + panel->backlight.min = 0; /* 0% */ >> + panel->backlight.max = 100; /* 100% */ >> + level = intel_panel_compute_brightness(connector, 100); >> + ns = DIV_ROUND_UP(level * CRC_PMIC_PWM_PERIOD_NS, 100); >> + >> + retval = pwm_config(panel->backlight.pwm, ns, CRC_PMIC_PWM_PERIOD_NS); >> if (retval < 0) { >> DRM_ERROR("Failed to configure the pwm chip\n"); >> pwm_put(panel->backlight.pwm); >> @@ -1875,11 +1880,10 @@ static int pwm_setup_backlight(struct intel_connector *connector, >> return retval; >> } >> >> - panel->backlight.min = 0; /* 0% */ >> - panel->backlight.max = 100; /* 100% */ >> - panel->backlight.level = DIV_ROUND_UP( >> - pwm_get_duty_cycle(panel->backlight.pwm) * 100, >> - CRC_PMIC_PWM_PERIOD_NS); >> + level = DIV_ROUND_UP(pwm_get_duty_cycle(panel->backlight.pwm) * 100, >> + CRC_PMIC_PWM_PERIOD_NS); >> + panel->backlight.level = >> + intel_panel_compute_brightness(connector, level); >> panel->backlight.enabled = panel->backlight.level != 0; >> >> DRM_INFO("Using %s PWM for LCD backlight control\n", desc); >> >
diff --git a/drivers/gpu/drm/i915/display/intel_panel.c b/drivers/gpu/drm/i915/display/intel_panel.c index 7b3ec6eb3382..9ebee7d93414 100644 --- a/drivers/gpu/drm/i915/display/intel_panel.c +++ b/drivers/gpu/drm/i915/display/intel_panel.c @@ -1843,6 +1843,7 @@ static int pwm_setup_backlight(struct intel_connector *connector, struct drm_i915_private *dev_priv = to_i915(dev); struct intel_panel *panel = &connector->panel; const char *desc; + u32 level, ns; int retval; /* Get the right PWM chip for DSI backlight according to VBT */ @@ -1866,8 +1867,12 @@ static int pwm_setup_backlight(struct intel_connector *connector, */ pwm_apply_args(panel->backlight.pwm); - retval = pwm_config(panel->backlight.pwm, CRC_PMIC_PWM_PERIOD_NS, - CRC_PMIC_PWM_PERIOD_NS); + panel->backlight.min = 0; /* 0% */ + panel->backlight.max = 100; /* 100% */ + level = intel_panel_compute_brightness(connector, 100); + ns = DIV_ROUND_UP(level * CRC_PMIC_PWM_PERIOD_NS, 100); + + retval = pwm_config(panel->backlight.pwm, ns, CRC_PMIC_PWM_PERIOD_NS); if (retval < 0) { DRM_ERROR("Failed to configure the pwm chip\n"); pwm_put(panel->backlight.pwm); @@ -1875,11 +1880,10 @@ static int pwm_setup_backlight(struct intel_connector *connector, return retval; } - panel->backlight.min = 0; /* 0% */ - panel->backlight.max = 100; /* 100% */ - panel->backlight.level = DIV_ROUND_UP( - pwm_get_duty_cycle(panel->backlight.pwm) * 100, - CRC_PMIC_PWM_PERIOD_NS); + level = DIV_ROUND_UP(pwm_get_duty_cycle(panel->backlight.pwm) * 100, + CRC_PMIC_PWM_PERIOD_NS); + panel->backlight.level = + intel_panel_compute_brightness(connector, level); panel->backlight.enabled = panel->backlight.level != 0; DRM_INFO("Using %s PWM for LCD backlight control\n", desc);
Use intel_panel_compute_brightness() from pwm_setup_backlight() so that we correctly take i915_modparams.invert_brightness and/or QUIRK_INVERT_BRIGHTNESS into account when setting + getting the initial brightness value. Signed-off-by: Hans de Goede <hdegoede@redhat.com> --- drivers/gpu/drm/i915/display/intel_panel.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-)