Skip to contentSkip to conversation

drm/i915/bxt: add support for setting backlight freq from vbt

PATCH In review Jani Nikula 3 participants 6 messages Dec 1, 2015 – Dec 2, 2015

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/3 drm/i915/bxt: add support for setting backlight freq from vbt

The only missing piece is the function to convert frequency to PWM register value. The PWM is based on 19.2 MHz clock, except for BXT A step, which is based on CDCLK, and which we ignore.

---
 drivers/gpu/drm/i915/intel_panel.c | 9 +++++++++
 1 file changed, 9 insertions(+)
drivers/gpu/drm/i915/intel_panel.c +9 -0
index a24df35e11e7..2d1696386b0d 100644
@@ -1264,6 +1264,14 @@ static void intel_backlight_device_unregister(struct intel_connector *connector)
 #endif /* CONFIG_BACKLIGHT_CLASS_DEVICE */
 
 /*
+ * BXT: PWM clock frequency = 19.2 MHz.
+ */
+static u32 bxt_hz_to_pwm(struct intel_connector *connector, u32 pwm_freq_hz)
+{
+	return KHz(19200) / pwm_freq_hz;
+}
+
+/*
  * SPT: This value represents the period of the PWM stream in clock periods
  * multiplied by 16 (default increment) or 128 (alternate increment selected in
  * SCHICKEN_1 bit 0). PWM clock is 24 MHz.
@@ -1750,6 +1758,7 @@ intel_panel_init_backlight_funcs(struct intel_panel *panel)
 		panel->backlight.disable = bxt_disable_backlight;
 		panel->backlight.set = bxt_set_backlight;
 		panel->backlight.get = bxt_get_backlight;
+		panel->backlight.hz_to_pwm = bxt_hz_to_pwm;
 	} else if (HAS_PCH_LPT(dev) || HAS_PCH_SPT(dev)) {
 		panel->backlight.setup = lpt_setup_backlight;
 		panel->backlight.enable = lpt_enable_backlight;
Signature · 6 lines
2.1.4

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw

PATCH 2/3 drm/i915: use default 200 Hz backlight frequency

If the backlight modulation frequency can't be extracted from the registers or from VBT, use 200 Hz as the default. This may enable backlight on some machines that previously failed.

---
 drivers/gpu/drm/i915/intel_panel.c | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)
drivers/gpu/drm/i915/intel_panel.c +9 -7
index 2d1696386b0d..2b25497333de 100644
@@ -1393,14 +1393,18 @@ static u32 get_backlight_max_vbt(struct intel_connector *connector)
 	u16 pwm_freq_hz = dev_priv->vbt.backlight.pwm_freq_hz;
 	u32 pwm;
 
-	if (!pwm_freq_hz) {
-		DRM_DEBUG_KMS("backlight frequency not specified in VBT\n");
+	if (!panel->backlight.hz_to_pwm) {
+		DRM_DEBUG_KMS("backlight frequency conversion not supported\n");
 		return 0;
 	}
 
-	if (!panel->backlight.hz_to_pwm) {
-		DRM_DEBUG_KMS("backlight frequency setting from VBT currently not supported on this platform\n");
-		return 0;
+	if (pwm_freq_hz) {
+		DRM_DEBUG_KMS("VBT defined backlight frequency %u Hz\n",
+			      pwm_freq_hz);
+	} else {
+		pwm_freq_hz = 200;
+		DRM_DEBUG_KMS("default backlight frequency %u Hz\n",
+			      pwm_freq_hz);
 	}
 
 	pwm = panel->backlight.hz_to_pwm(connector, pwm_freq_hz);
@@ -1409,8 +1413,6 @@ static u32 get_backlight_max_vbt(struct intel_connector *connector)
 		return 0;
 	}
 
-	DRM_DEBUG_KMS("backlight frequency %u Hz from VBT\n", pwm_freq_hz);
-
 	return pwm;
 }
 
Signature · 6 lines
2.1.4

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
#2 lore raw

PATCH 3/3 drm/i915/bxt: backlight clock gating workaround

In reply to Jani Nikula

From: Imre Deak <[email protected]>

Per bspec, "Backlight PWM may stop in the asserted state, causing backlight to stay fully on. WA: Before disabling PWM, set CLKGATE_DIS_0 0x46530 bit 13 PWM1 Gating Dis (for PWM1) or bit 14 PWM2 Gating Dis (for PWM2). The bits can remain set without harm." (There's no workaround name for this.)

This fixes some Broxton backlight issues.

[Jani: cleanup & commit message]
---
 drivers/gpu/drm/i915/i915_reg.h | 7 +++++++
 drivers/gpu/drm/i915/intel_pm.c | 8 ++++++++
 2 files changed, 15 insertions(+)
drivers/gpu/drm/i915/i915_reg.h +7 -0
index 487224572022..d87d545e0369 100644
@@ -2973,6 +2973,13 @@ enum skl_disp_power_wells {
 #define OGAMC0			_MMIO(0x30024)
 
 /*
+ * GEN9 clock gating regs
+ */
+#define GEN9_CLKGATE_DIS_0		_MMIO(0x46530)
+#define   PWM2_GATING_DIS		(1 << 14)
+#define   PWM1_GATING_DIS		(1 << 13)
+
+/*
  * Display engine regs
  */
 
drivers/gpu/drm/i915/intel_pm.c +8 -0
index 96f45d7b3e4b..612a8b462294 100644
@@ -66,6 +66,14 @@ static void bxt_init_clock_gating(struct drm_device *dev)
 	 */
 	I915_WRITE(GEN8_UCGCTL6, I915_READ(GEN8_UCGCTL6) |
 		   GEN8_HDCUNIT_CLOCK_GATE_DISABLE_HDCREQ);
+
+	/*
+	 * Wa: Backlight PWM may stop in the asserted state, causing backlight
+	 * to stay fully on.
+	 */
+	if (IS_BXT_REVID(dev_priv, BXT_REVID_B0, REVID_FOREVER))
+		I915_WRITE(GEN9_CLKGATE_DIS_0, I915_READ(GEN9_CLKGATE_DIS_0) |
+			   PWM1_GATING_DIS | PWM2_GATING_DIS);
 }
 
 static void i915_pineview_get_mem_freq(struct drm_device *dev)
Signature · 6 lines
2.1.4

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Reviewed-by on v1 3/3
#3 lore raw

Re: [PATCH 3/3] drm/i915/bxt: backlight clock gating workaround

Quoted 8 lines · Jani Nikula

From: Imre Deak <[email protected]>

Per bspec, "Backlight PWM may stop in the asserted state, causing backlight to stay fully on. WA: Before disabling PWM, set CLKGATE_DIS_0 0x46530 bit 13 PWM1 Gating Dis (for PWM1) or bit 14 PWM2 Gating Dis (for PWM2). The bits can remain set without harm." (There's no workaround name for this.)

Quoted 5 lines

This fixes some Broxton backlight issues.

[Jani: cleanup & commit message]

Nice and easy due to the "without harm" part.

Quoted 49 lines
---
 drivers/gpu/drm/i915/i915_reg.h | 7 +++++++
 drivers/gpu/drm/i915/intel_pm.c | 8 ++++++++
 2 files changed, 15 insertions(+)
drivers/gpu/drm/i915/i915_reg.h +7 -0
index 487224572022..d87d545e0369 100644
@@ -2973,6 +2973,13 @@ enum skl_disp_power_wells {
 #define OGAMC0			_MMIO(0x30024)
 
 /*
+ * GEN9 clock gating regs
+ */
+#define GEN9_CLKGATE_DIS_0		_MMIO(0x46530)
+#define   PWM2_GATING_DIS		(1 << 14)
+#define   PWM1_GATING_DIS		(1 << 13)
+
+/*
  * Display engine regs
  */
 
drivers/gpu/drm/i915/intel_pm.c +8 -0
index 96f45d7b3e4b..612a8b462294 100644
@@ -66,6 +66,14 @@ static void bxt_init_clock_gating(struct drm_device *dev)
 	 */
 	I915_WRITE(GEN8_UCGCTL6, I915_READ(GEN8_UCGCTL6) |
 		   GEN8_HDCUNIT_CLOCK_GATE_DISABLE_HDCREQ);
+
+	/*
+	 * Wa: Backlight PWM may stop in the asserted state, causing backlight
+	 * to stay fully on.
+	 */
+	if (IS_BXT_REVID(dev_priv, BXT_REVID_B0, REVID_FOREVER))
+		I915_WRITE(GEN9_CLKGATE_DIS_0, I915_READ(GEN9_CLKGATE_DIS_0) |
+			   PWM1_GATING_DIS | PWM2_GATING_DIS);
 }
 
 static void i915_pineview_get_mem_freq(struct drm_device *dev)
Signature · 6 lines
2.1.4

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Reviewed-by on v1 1/3
#4 lore raw
In reply to Jani Nikula
Quoted 5 lines · Jani Nikula

The only missing piece is the function to convert frequency to PWM register value. The PWM is based on 19.2 MHz clock, except for BXT A step, which is based on CDCLK, and which we ignore.

On patch 1 and 2:

For patch 3 we need an another reviewer.

I also tested all three patches and they fix the backlight on BXT, before it was practically unusable: there was either no backlight at all or the backlight was flashing rapidly depending on the current backlight level.

Quoted 36 lines

---
 drivers/gpu/drm/i915/intel_panel.c | 9 +++++++++

 1 file changed, 9 insertions(+)
drivers/gpu/drm/i915/intel_panel.c +0 -0
index a24df35e11e7..2d1696386b0d 100644
@@ -1264,6 +1264,14 @@ static void
 intel_backlight_device_unregister(struct intel_connector *connector)
  #endif /* CONFIG_BACKLIGHT_CLASS_DEVICE */


 /*
+ * BXT: PWM clock frequency = 19.2 MHz.
+ */
+static u32 bxt_hz_to_pwm(struct intel_connector *connector, u32 pwm_freq_hz)

drivers/gpu/drm/i915/intel_panel.c +5 -0
+{
+	return KHz(19200) / pwm_freq_hz;
+}
+
+/*

  * SPT: This value represents the period of the PWM stream in clock periods
  * multiplied by 16 (default increment) or 128 (alternate increment selected in
  * SCHICKEN_1 bit 0). PWM clock is 24 MHz.

drivers/gpu/drm/i915/intel_panel.c +1 -0
@@ -1750,6 +1758,7 @@ intel_panel_init_backlight_funcs(struct
 intel_panel *panel)
  		panel->backlight.disable = bxt_disable_backlight;
  		panel->backlight.set = bxt_set_backlight;
  		panel->backlight.get = bxt_get_backlight;
+		panel->backlight.hz_to_pwm = bxt_hz_to_pwm;
  	} else if (HAS_PCH_LPT(dev) || HAS_PCH_SPT(dev)) {
  		panel->backlight.setup = lpt_setup_backlight;
Quoted 1 line

  panel->backlight.enable = lpt_enable_backlight;

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

#5 lore raw
Quoted 8 lines · Imre Deak
Quoted 5 lines · Jani Nikula

The only missing piece is the function to convert frequency to PWM register value. The PWM is based on 19.2 MHz clock, except for BXT A step, which is based on CDCLK, and which we ignore.

On patch 1 and 2:

Quoted 8 lines

For patch 3 we need an another reviewer.

I also tested all three patches and they fix the backlight on BXT, before it was practically unusable: there was either no backlight at all or the backlight was flashing rapidly depending on the current backlight level.

Pushed all three to drm-intel-next-queued, thanks for the reviews, and patch 3.

BR,
Jani.

Quoted 38 lines
Quoted 38 lines

---
 drivers/gpu/drm/i915/intel_panel.c | 9 +++++++++

 1 file changed, 9 insertions(+)
drivers/gpu/drm/i915/intel_panel.c +0 -0
index a24df35e11e7..2d1696386b0d 100644
@@ -1264,6 +1264,14 @@ static void
 intel_backlight_device_unregister(struct intel_connector *connector)
  #endif /* CONFIG_BACKLIGHT_CLASS_DEVICE */


 /*
+ * BXT: PWM clock frequency = 19.2 MHz.
+ */
+static u32 bxt_hz_to_pwm(struct intel_connector *connector, u32 pwm_freq_hz)

drivers/gpu/drm/i915/intel_panel.c +5 -0
+{
+	return KHz(19200) / pwm_freq_hz;
+}
+
+/*

  * SPT: This value represents the period of the PWM stream in clock periods
  * multiplied by 16 (default increment) or 128 (alternate increment selected in
  * SCHICKEN_1 bit 0). PWM clock is 24 MHz.

drivers/gpu/drm/i915/intel_panel.c +1 -0
@@ -1750,6 +1758,7 @@ intel_panel_init_backlight_funcs(struct
 intel_panel *panel)
  		panel->backlight.disable = bxt_disable_backlight;
  		panel->backlight.set = bxt_set_backlight;
  		panel->backlight.get = bxt_get_backlight;
+		panel->backlight.hz_to_pwm = bxt_hz_to_pwm;
  	} else if (HAS_PCH_LPT(dev) || HAS_PCH_SPT(dev)) {
  		panel->backlight.setup = lpt_setup_backlight;

  panel->backlight.enable = lpt_enable_backlight;

Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx