Fixed to merge against drm-tip branch
Signed-off-by: Alex Ivanov <gnidorah@xxxxx>
---
drivers/gpu/drm/i915/i915_params.c | 6 ++++++
drivers/gpu/drm/i915/i915_params.h | 2 ++
drivers/gpu/drm/i915/intel_panel.c | 17 +++++++++++++++++
3 files changed, 25 insertions(+)
diff --git a/drivers/gpu/drm/i915/i915_params.c b/drivers/gpu/drm/i915/i915_params.c
index b5f3eb4fa8a3..2a7b0c20f1d0 100644
--- a/drivers/gpu/drm/i915/i915_params.c
+++ b/drivers/gpu/drm/i915/i915_params.c
@@ -175,6 +175,12 @@ i915_param_named(enable_dpcd_backlight, bool, 0600,
i915_param_named(enable_gvt, bool, 0400,
"Enable support for Intel GVT-g graphics virtualization host support(default:false)");
+i915_param_named_unsafe(backlight_freq, uint, 0400,
+ "Override PWM backlight frequency (set in Hz, 0=ignore [default])");
+
+i915_param_named_unsafe(backlight_min_level, uint, 0400,
+ "Override PWM backlight minimum level (duty cycle, 0=ignore [default])");
+
static __always_inline void _print_param(struct drm_printer *p,
const char *name,
const char *type,
diff --git a/drivers/gpu/drm/i915/i915_params.h b/drivers/gpu/drm/i915/i915_params.h
index c96360398072..5e2c077c6f2c 100644
--- a/drivers/gpu/drm/i915/i915_params.h
+++ b/drivers/gpu/drm/i915/i915_params.h
@@ -55,6 +55,8 @@ struct drm_printer;
param(int, edp_vswing, 0) \
param(int, reset, 2) \
param(unsigned int, inject_load_failure, 0) \
+ param(unsigned int, backlight_freq, 0) \
+ param(unsigned int, backlight_min_level, 0) \
/* leave bools at the end to not create holes */ \
param(bool, alpha_support, IS_ENABLED(CONFIG_DRM_I915_ALPHA_SUPPORT)) \
param(bool, enable_cmd_parser, true) \
diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c
index fa6831f8c004..eb5f0665b5f9 100644
--- a/drivers/gpu/drm/i915/intel_panel.c
+++ b/drivers/gpu/drm/i915/intel_panel.c
@@ -1479,6 +1479,12 @@ static u32 get_backlight_min_vbt(struct intel_connector *connector)
WARN_ON(panel->backlight.max == 0);
+ if (i915_modparams.backlight_min_level) {
+ DRM_DEBUG_KMS("Override backlight duty cycle %u\n",
+ i915_modparams.backlight_min_level);
+ return i915_modparams.backlight_min_level;
+ }
+
/*
* XXX: If the vbt value is 255, it makes min equal to max, which leads
* to problems. There are such machines out there. Either our
@@ -1795,6 +1801,7 @@ int intel_panel_setup_backlight(struct drm_connector *connector, enum pipe pipe)
struct intel_connector *intel_connector = to_intel_connector(connector);
struct intel_panel *panel = &intel_connector->panel;
int ret;
+ u32 pwm;
if (!dev_priv->vbt.backlight.present) {
if (dev_priv->quirks & QUIRK_BACKLIGHT_PRESENT) {
@@ -1812,6 +1819,16 @@ int intel_panel_setup_backlight(struct drm_connector *connector, enum pipe pipe)
/* set level and max in panel struct */
mutex_lock(&dev_priv->backlight_lock);
ret = panel->backlight.setup(intel_connector, pipe);
+ if (i915_modparams.backlight_freq) {
+ if (panel->backlight.hz_to_pwm &&
+ (pwm = panel->backlight.hz_to_pwm(intel_connector, i915_modparams.backlight_freq))) {
+ panel->backlight.max = pwm;
+ DRM_DEBUG_KMS("Override backlight frequency %u Hz\n",
+ i915_modparams.backlight_freq);
+ } else {
+ DRM_DEBUG_KMS("failed to override backlight frequency\n");
+ }
+ }
mutex_unlock(&dev_priv->backlight_lock);
if (ret) {
--
2.15.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
