Skip to contentSkip to conversation

FOR_UPSTREAM [VPG]: drm/i915: Parse panel BL controller from VBT

PATCH New Vidya Srinivas 5 participants 9 messages Dec 7, 2016 – Dec 12, 2016

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

PATCH 1/1 FOR_UPSTREAM [VPG]: drm/i915: Parse panel BL controller from VBT

Currently the backlight controller is taken as 0. It needs to derive value from the VBT. Adding the necessary changes.

---
 drivers/gpu/drm/i915/i915_drv.h    | 1 +
 drivers/gpu/drm/i915/intel_bios.c  | 5 +++++
 drivers/gpu/drm/i915/intel_panel.c | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_drv.h +1 -0
index 8daa4fb..6a85fdf 100644
@@ -1633,6 +1633,7 @@ struct intel_vbt_data {
 		bool present;
 		bool active_low_pwm;
 		u8 min_brightness;	/* min_brightness/255 of max */
+		u8 controller;		/* brightness controller number */
 		enum intel_backlight_type type;
 	} backlight;
 
drivers/gpu/drm/i915/intel_bios.c +5 -0
index eaade27..130db0f 100644
@@ -330,6 +330,8 @@ static u32 get_blocksize(const void *block_data)
 
 		method = &backlight_data->backlight_control[panel_type];
 		dev_priv->vbt.backlight.type = method->type;
+		dev_priv->vbt.backlight.controller = 0;
+		dev_priv->vbt.backlight.controller = method->controller;
 	}
 
 	dev_priv->vbt.backlight.pwm_freq_hz = entry->pwm_freq_hz;
@@ -341,6 +343,9 @@ static u32 get_blocksize(const void *block_data)
 		      dev_priv->vbt.backlight.active_low_pwm ? "low" : "high",
 		      dev_priv->vbt.backlight.min_brightness,
 		      backlight_data->level[panel_type]);
+
+	DRM_DEBUG_KMS("VBT BL controller %u\n",
+			dev_priv->vbt.backlight.controller);
 }
 
 /* Try to find sdvo panel data */
drivers/gpu/drm/i915/intel_panel.c +1 -1
index 3578b40..6a7d4c3 100644
@@ -1612,7 +1612,7 @@ static int vlv_setup_backlight(struct intel_connector *connector, enum pipe pipe
 	 * For BXT hard coding the Backlight controller to 0.
 	 * TODO : Read the controller value from VBT and generalize
 	 */
-	panel->backlight.controller = 0;
+	panel->backlight.controller = dev_priv->vbt.backlight.controller;
 
 	pwm_ctl = I915_READ(BXT_BLC_PWM_CTL(panel->backlight.controller));
 
Signature · 6 lines
1.9.1

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

PATCH 1/1 FOR_UPSTREAM [VPG]: drm/i915: Parse panel BL controller from VBT

Currently the backlight controller is taken as 0. It needs to derive value from the VBT. Adding the necessary changes.

---
 drivers/gpu/drm/i915/i915_drv.h    | 1 +
 drivers/gpu/drm/i915/intel_bios.c  | 5 +++++
 drivers/gpu/drm/i915/intel_panel.c | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_drv.h +1 -0
index 8daa4fb..6a85fdf 100644
@@ -1633,6 +1633,7 @@ struct intel_vbt_data {
 		bool present;
 		bool active_low_pwm;
 		u8 min_brightness;	/* min_brightness/255 of max */
+		u8 controller;		/* brightness controller number */
 		enum intel_backlight_type type;
 	} backlight;
 
drivers/gpu/drm/i915/intel_bios.c +5 -0
index eaade27..130db0f 100644
@@ -330,6 +330,8 @@ static u32 get_blocksize(const void *block_data)
 
 		method = &backlight_data->backlight_control[panel_type];
 		dev_priv->vbt.backlight.type = method->type;
+		dev_priv->vbt.backlight.controller = 0;
+		dev_priv->vbt.backlight.controller = method->controller;
 	}
 
 	dev_priv->vbt.backlight.pwm_freq_hz = entry->pwm_freq_hz;
@@ -341,6 +343,9 @@ static u32 get_blocksize(const void *block_data)
 		      dev_priv->vbt.backlight.active_low_pwm ? "low" : "high",
 		      dev_priv->vbt.backlight.min_brightness,
 		      backlight_data->level[panel_type]);
+
+	DRM_DEBUG_KMS("VBT BL controller %u\n",
+			dev_priv->vbt.backlight.controller);
 }
 
 /* Try to find sdvo panel data */
drivers/gpu/drm/i915/intel_panel.c +1 -1
index 3578b40..6a7d4c3 100644
@@ -1612,7 +1612,7 @@ static int vlv_setup_backlight(struct intel_connector *connector, enum pipe pipe
 	 * For BXT hard coding the Backlight controller to 0.
 	 * TODO : Read the controller value from VBT and generalize
 	 */
-	panel->backlight.controller = 0;
+	panel->backlight.controller = dev_priv->vbt.backlight.controller;
 
 	pwm_ctl = I915_READ(BXT_BLC_PWM_CTL(panel->backlight.controller));
 
Signature · 6 lines
1.9.1

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

PATCH 1/1 drm/i915: Parse panel BL controller from VBT

In reply to Vidya Srinivas

Currently the backlight controller is taken as 0. It needs to derive value from the VBT. Adding the necessary changes.

v2: Updated the commit header

---
 drivers/gpu/drm/i915/i915_drv.h    | 1 +
 drivers/gpu/drm/i915/intel_bios.c  | 5 +++++
 drivers/gpu/drm/i915/intel_panel.c | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_drv.h +1 -0
index 8daa4fb..6a85fdf 100644
@@ -1633,6 +1633,7 @@ struct intel_vbt_data {
 		bool present;
 		bool active_low_pwm;
 		u8 min_brightness;	/* min_brightness/255 of max */
+		u8 controller;		/* brightness controller number */
 		enum intel_backlight_type type;
 	} backlight;
 
drivers/gpu/drm/i915/intel_bios.c +5 -0
index eaade27..130db0f 100644
@@ -330,6 +330,8 @@ static u32 get_blocksize(const void *block_data)
 
 		method = &backlight_data->backlight_control[panel_type];
 		dev_priv->vbt.backlight.type = method->type;
+		dev_priv->vbt.backlight.controller = 0;
+		dev_priv->vbt.backlight.controller = method->controller;
 	}
 
 	dev_priv->vbt.backlight.pwm_freq_hz = entry->pwm_freq_hz;
@@ -341,6 +343,9 @@ static u32 get_blocksize(const void *block_data)
 		      dev_priv->vbt.backlight.active_low_pwm ? "low" : "high",
 		      dev_priv->vbt.backlight.min_brightness,
 		      backlight_data->level[panel_type]);
+
+	DRM_DEBUG_KMS("VBT BL controller %u\n",
+			dev_priv->vbt.backlight.controller);
 }
 
 /* Try to find sdvo panel data */
drivers/gpu/drm/i915/intel_panel.c +1 -1
index 3578b40..6a7d4c3 100644
@@ -1612,7 +1612,7 @@ static int vlv_setup_backlight(struct intel_connector *connector, enum pipe pipe
 	 * For BXT hard coding the Backlight controller to 0.
 	 * TODO : Read the controller value from VBT and generalize
 	 */
-	panel->backlight.controller = 0;
+	panel->backlight.controller = dev_priv->vbt.backlight.controller;
 
 	pwm_ctl = I915_READ(BXT_BLC_PWM_CTL(panel->backlight.controller));
 
Signature · 6 lines
1.9.1

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

Re: [PATCH] drm/i915: Parse panel BL controller from VBT

I currently have this same patch in my tree (well with the two changes below) and have been testing it so with the changes.

Quoted 30 lines · On Wed, 7 Dec 2016 20:32:18 +0530 Vidya Srinivas <[email protected]>…

Currently the backlight controller is taken as 0. It needs to derive value from the VBT. Adding the necessary changes.

v2: Updated the commit header

---
 drivers/gpu/drm/i915/i915_drv.h    | 1 +
 drivers/gpu/drm/i915/intel_bios.c  | 5 +++++
 drivers/gpu/drm/i915/intel_panel.c | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_drv.h +1 -0
index 8daa4fb..6a85fdf 100644
@@ -1633,6 +1633,7 @@ struct intel_vbt_data {
 		bool present;
 		bool active_low_pwm;
 		u8 min_brightness;	/* min_brightness/255 of max */
+		u8 controller;		/* brightness controller number */
 		enum intel_backlight_type type;
 	} backlight;
 
drivers/gpu/drm/i915/intel_bios.c +0 -0
index eaade27..130db0f 100644

drivers/gpu/drm/i915/intel_bios.c static u32 get_blocksize(const void *block_data) · line 333

Quoted 4 lines
drivers/gpu/drm/i915/intel_bios.c +1 -0
@@ -330,6 +330,8 @@ static u32 get_blocksize(const void *block_data)
 
 		method = &backlight_data->backlight_control[panel_type];
 		dev_priv->vbt.backlight.type = method->type;
+		dev_priv->vbt.backlight.controller = 0;

Setting it to zero first seems redundant. Is there a reason you do this?

Quoted 19 lines
drivers/gpu/drm/i915/intel_bios.c +4 -0
+		dev_priv->vbt.backlight.controller = method->controller;
 	}
 
 	dev_priv->vbt.backlight.pwm_freq_hz = entry->pwm_freq_hz;
@@ -341,6 +343,9 @@ static u32 get_blocksize(const void *block_data)
 		      dev_priv->vbt.backlight.active_low_pwm ? "low" : "high",
 		      dev_priv->vbt.backlight.min_brightness,
 		      backlight_data->level[panel_type]);
+
+	DRM_DEBUG_KMS("VBT BL controller %u\n",
+			dev_priv->vbt.backlight.controller);
 }
 
 /* Try to find sdvo panel data */
drivers/gpu/drm/i915/intel_panel.c +0 -0
index 3578b40..6a7d4c3 100644

drivers/gpu/drm/i915/intel_panel.c static int vlv_setup_backlight(struct intel_connector *connector, enum pipe pipe · line 1615

Quoted 5 lines
drivers/gpu/drm/i915/intel_panel.c +1 -1
@@ -1612,7 +1612,7 @@ static int vlv_setup_backlight(struct intel_connector *connector, enum pipe pipe
 	 * For BXT hard coding the Backlight controller to 0.
 	 * TODO : Read the controller value from VBT and generalize
 	 */
-	panel->backlight.controller = 0;
+	panel->backlight.controller = dev_priv->vbt.backlight.controller;

You should remove the comment above now that it's not hard coded.

Quoted 3 lines
drivers/gpu/drm/i915/intel_panel.c +0 -0
 	pwm_ctl = I915_READ(BXT_BLC_PWM_CTL(panel->backlight.controller));
 
Signature · 11 lines
--
Bob Paauwe                  
[email protected]
IOTG / PED Software Organization
Intel Corp.  Folsom, CA
(916) 356-6193    

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Tested-by on v1 1/1
#4 lore raw

Re: [PATCH] drm/i915: Parse panel BL controller from VBT

In reply to Vidya Srinivas
Quoted 72 lines · Vidya Srinivas

Currently the backlight controller is taken as 0. It needs to derive value from the VBT. Adding the necessary changes.

v2: Updated the commit header

---
 drivers/gpu/drm/i915/i915_drv.h    | 1 +
 drivers/gpu/drm/i915/intel_bios.c  | 5 +++++
 drivers/gpu/drm/i915/intel_panel.c | 2 +-

 3 files changed, 7 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_drv.h +0 -0
index 8daa4fb..6a85fdf 100644
@@ -1633,6 +1633,7 @@ struct intel_vbt_data {
  		bool present;
  		bool active_low_pwm;

  u8 min_brightness; /* min_brightness/255 of
max */

drivers/gpu/drm/i915/i915_drv.h +1 -0
+		u8 controller;		/* brightness

controller number */
  enum intel_backlight_type type;
  } backlight;

drivers/gpu/drm/i915/intel_bios.c +0 -0
index eaade27..130db0f 100644
@@ -330,6 +330,8 @@ static u32 get_blocksize(const void *block_data)


  method = &backlight_data-

Quoted 1 line

backlight_control[panel_type];

  dev_priv->vbt.backlight.type = method->type;

drivers/gpu/drm/i915/intel_bios.c +2 -0
+		dev_priv->vbt.backlight.controller = 0;
+		dev_priv->vbt.backlight.controller = method-
Quoted 1 line

controller;

  }

  dev_priv->vbt.backlight.pwm_freq_hz = entry->pwm_freq_hz;

drivers/gpu/drm/i915/intel_bios.c +0 -0
@@ -341,6 +343,9 @@ static u32 get_blocksize(const void *block_data)

        dev_priv->vbt.backlight.active_low_pwm ? "low" : "high",
        dev_priv->vbt.backlight.min_brightness, backlight_data->level[panel_type]);

drivers/gpu/drm/i915/intel_bios.c +3 -0
+
+	DRM_DEBUG_KMS("VBT BL controller %u\n",
+			dev_priv->vbt.backlight.controller);

 }

 /* Try to find sdvo panel data */

drivers/gpu/drm/i915/intel_panel.c +0 -0
index 3578b40..6a7d4c3 100644
@@ -1612,7 +1612,7 @@ static int vlv_setup_backlight(struct

intel_connector *connector, enum pipe pipe
   * For BXT hard coding the Backlight controller to 0.
   * TODO : Read the controller value from VBT and generalize */

drivers/gpu/drm/i915/intel_panel.c +1 -1
-	panel->backlight.controller = 0;
+	panel->backlight.controller = dev_priv-
Quoted 1 line

vbt.backlight.controller;


  pwm_ctl = I915_READ(BXT_BLC_PWM_CTL(panel-

Quoted 1 line

backlight.controller));

Signature · 6 lines
Mika Kahola - Intel OTC

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

✓ Fi.CI.BAT: success for FOR_UPSTREAM [VPG]: drm/i915: Parse panel BL controller from VBT (rev3)

In reply to Vidya Srinivas
== Series Details ==

== Series Details ==

Series: FOR_UPSTREAM [VPG]: drm/i915: Parse panel BL controller from VBT (rev3)
URL : https://patchwork.freedesktop.org/series/16489/
State : success

== Summary ==

Series 16489v3 FOR_UPSTREAM [VPG]: drm/i915: Parse panel BL controller from VBT
https://patchwork.freedesktop.org/api/1.0/series/16489/revisions/3/mbox/

fi-bdw-5557u     total:247  pass:219  dwarn:0   dfail:0   fail:0   skip:28 
fi-bsw-n3050     total:247  pass:195  dwarn:0   dfail:0   fail:0   skip:52 
fi-byt-j1900     total:247  pass:206  dwarn:0   dfail:0   fail:0   skip:41 
fi-byt-n2820     total:247  pass:202  dwarn:0   dfail:0   fail:0   skip:45 
fi-hsw-4770      total:247  pass:214  dwarn:0   dfail:0   fail:0   skip:33 
fi-hsw-4770r     total:247  pass:214  dwarn:0   dfail:0   fail:0   skip:33 
fi-ilk-650       total:247  pass:181  dwarn:0   dfail:0   fail:0   skip:66 
fi-ivb-3520m     total:247  pass:213  dwarn:0   dfail:0   fail:0   skip:34 
fi-ivb-3770      total:247  pass:212  dwarn:0   dfail:0   fail:0   skip:35 
fi-kbl-7500u     total:247  pass:212  dwarn:0   dfail:0   fail:0   skip:35 
fi-skl-6260u     total:247  pass:220  dwarn:0   dfail:0   fail:0   skip:27 
fi-skl-6700hq    total:247  pass:214  dwarn:0   dfail:0   fail:0   skip:33 
fi-skl-6700k     total:247  pass:210  dwarn:3   dfail:0   fail:0   skip:34 
fi-skl-6770hq    total:247  pass:220  dwarn:0   dfail:0   fail:0   skip:27 
fi-snb-2520m     total:247  pass:202  dwarn:0   dfail:0   fail:0   skip:45 
fi-snb-2600      total:247  pass:201  dwarn:0   dfail:0   fail:0   skip:46 

e46c97f4cfb63328f5bbbc0fb85c3f53703792f2 drm-tip: 2016y-12m-07d-17h-47m-18s UTC integration manifest 452ecd0 drm/i915: Parse panel BL controller from VBT

== Logs ==

For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_3221/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#6 lore raw

PATCH v2 1/1 drm/i915: Parse panel backlight controller from VBT

In reply to Vidya Srinivas

From: Vidya Srinivas <[email protected]>

Currently the backlight controller is taken as 0. It needs to derive value from the VBT. Adding the necessary changes.

v2 by Jani:
- drop obsolete comments, drop redundant initialization (Bob)
- merge debug logging into one

---
 drivers/gpu/drm/i915/i915_drv.h    |  1 +
 drivers/gpu/drm/i915/intel_bios.c  |  6 ++++--
 drivers/gpu/drm/i915/intel_panel.c | 17 +++--------------
 3 files changed, 8 insertions(+), 16 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +1 -0
index 1480e733312a..786e3bb8eecf 100644
@@ -1716,6 +1716,7 @@ struct intel_vbt_data {
 		bool present;
 		bool active_low_pwm;
 		u8 min_brightness;	/* min_brightness/255 of max */
+		u8 controller;		/* brightness controller number */
 		enum intel_backlight_type type;
 	} backlight;
 
drivers/gpu/drm/i915/intel_bios.c +4 -2
index eaade27af386..1cf2fa6ec28f 100644
@@ -330,17 +330,19 @@ parse_lfp_backlight(struct drm_i915_private *dev_priv,
 
 		method = &backlight_data->backlight_control[panel_type];
 		dev_priv->vbt.backlight.type = method->type;
+		dev_priv->vbt.backlight.controller = method->controller;
 	}
 
 	dev_priv->vbt.backlight.pwm_freq_hz = entry->pwm_freq_hz;
 	dev_priv->vbt.backlight.active_low_pwm = entry->active_low_pwm;
 	dev_priv->vbt.backlight.min_brightness = entry->min_brightness;
 	DRM_DEBUG_KMS("VBT backlight PWM modulation frequency %u Hz, "
-		      "active %s, min brightness %u, level %u\n",
+		      "active %s, min brightness %u, level %u, controller %u\n",
 		      dev_priv->vbt.backlight.pwm_freq_hz,
 		      dev_priv->vbt.backlight.active_low_pwm ? "low" : "high",
 		      dev_priv->vbt.backlight.min_brightness,
-		      backlight_data->level[panel_type]);
+		      backlight_data->level[panel_type],
+		      dev_priv->vbt.backlight.controller);
 }
 
 /* Try to find sdvo panel data */
drivers/gpu/drm/i915/intel_panel.c +3 -14
index 3578b402d412..b01edceac650 100644
@@ -1039,10 +1039,7 @@ static void bxt_enable_backlight(struct intel_connector *connector)
 	enum pipe pipe = intel_get_pipe_from_connector(connector);
 	u32 pwm_ctl, val;
 
-	/* To use 2nd set of backlight registers, utility pin has to be
-	 * enabled with PWM mode.
-	 * The field should only be changed when the utility pin is disabled
-	 */
+	/* Controller 1 uses the utility pin. */
 	if (panel->backlight.controller == 1) {
 		val = I915_READ(UTIL_PIN_CTL);
 		if (val & UTIL_PIN_ENABLE) {
@@ -1608,19 +1605,11 @@ bxt_setup_backlight(struct intel_connector *connector, enum pipe unused)
 	struct intel_panel *panel = &connector->panel;
 	u32 pwm_ctl, val;
 
-	/*
-	 * For BXT hard coding the Backlight controller to 0.
-	 * TODO : Read the controller value from VBT and generalize
-	 */
-	panel->backlight.controller = 0;
+	panel->backlight.controller = dev_priv->vbt.backlight.controller;
 
 	pwm_ctl = I915_READ(BXT_BLC_PWM_CTL(panel->backlight.controller));
 
-	/* Keeping the check if controller 1 is to be programmed.
-	 * This will come into affect once the VBT parsing
-	 * is fixed for controller selection, and controller 1 is used
-	 * for a prticular display configuration.
-	 */
+	/* Controller 1 uses the utility pin. */
 	if (panel->backlight.controller == 1) {
 		val = I915_READ(UTIL_PIN_CTL);
 		panel->backlight.util_pin_active_low =
Signature · 6 lines
2.1.4

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

Re: [PATCH v2] drm/i915: Parse panel backlight controller from VBT

Quoted 9 lines · Jani Nikula

From: Vidya Srinivas <[email protected]>

Currently the backlight controller is taken as 0. It needs to derive value from the VBT. Adding the necessary changes.

v2 by Jani:
- drop obsolete comments, drop redundant initialization (Bob)
- merge debug logging into one

Quoted 6 lines

Pushed to dinq, thanks for the patch.

BR,
Jani.

Quoted 82 lines
---
 drivers/gpu/drm/i915/i915_drv.h    |  1 +
 drivers/gpu/drm/i915/intel_bios.c  |  6 ++++--
 drivers/gpu/drm/i915/intel_panel.c | 17 +++--------------
 3 files changed, 8 insertions(+), 16 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +1 -0
index 1480e733312a..786e3bb8eecf 100644
@@ -1716,6 +1716,7 @@ struct intel_vbt_data {
 		bool present;
 		bool active_low_pwm;
 		u8 min_brightness;	/* min_brightness/255 of max */
+		u8 controller;		/* brightness controller number */
 		enum intel_backlight_type type;
 	} backlight;
 
drivers/gpu/drm/i915/intel_bios.c +4 -2
index eaade27af386..1cf2fa6ec28f 100644
@@ -330,17 +330,19 @@ parse_lfp_backlight(struct drm_i915_private *dev_priv,
 
 		method = &backlight_data->backlight_control[panel_type];
 		dev_priv->vbt.backlight.type = method->type;
+		dev_priv->vbt.backlight.controller = method->controller;
 	}
 
 	dev_priv->vbt.backlight.pwm_freq_hz = entry->pwm_freq_hz;
 	dev_priv->vbt.backlight.active_low_pwm = entry->active_low_pwm;
 	dev_priv->vbt.backlight.min_brightness = entry->min_brightness;
 	DRM_DEBUG_KMS("VBT backlight PWM modulation frequency %u Hz, "
-		      "active %s, min brightness %u, level %u\n",
+		      "active %s, min brightness %u, level %u, controller %u\n",
 		      dev_priv->vbt.backlight.pwm_freq_hz,
 		      dev_priv->vbt.backlight.active_low_pwm ? "low" : "high",
 		      dev_priv->vbt.backlight.min_brightness,
-		      backlight_data->level[panel_type]);
+		      backlight_data->level[panel_type],
+		      dev_priv->vbt.backlight.controller);
 }
 
 /* Try to find sdvo panel data */
drivers/gpu/drm/i915/intel_panel.c +3 -14
index 3578b402d412..b01edceac650 100644
@@ -1039,10 +1039,7 @@ static void bxt_enable_backlight(struct intel_connector *connector)
 	enum pipe pipe = intel_get_pipe_from_connector(connector);
 	u32 pwm_ctl, val;
 
-	/* To use 2nd set of backlight registers, utility pin has to be
-	 * enabled with PWM mode.
-	 * The field should only be changed when the utility pin is disabled
-	 */
+	/* Controller 1 uses the utility pin. */
 	if (panel->backlight.controller == 1) {
 		val = I915_READ(UTIL_PIN_CTL);
 		if (val & UTIL_PIN_ENABLE) {
@@ -1608,19 +1605,11 @@ bxt_setup_backlight(struct intel_connector *connector, enum pipe unused)
 	struct intel_panel *panel = &connector->panel;
 	u32 pwm_ctl, val;
 
-	/*
-	 * For BXT hard coding the Backlight controller to 0.
-	 * TODO : Read the controller value from VBT and generalize
-	 */
-	panel->backlight.controller = 0;
+	panel->backlight.controller = dev_priv->vbt.backlight.controller;
 
 	pwm_ctl = I915_READ(BXT_BLC_PWM_CTL(panel->backlight.controller));
 
-	/* Keeping the check if controller 1 is to be programmed.
-	 * This will come into affect once the VBT parsing
-	 * is fixed for controller selection, and controller 1 is used
-	 * for a prticular display configuration.
-	 */
+	/* Controller 1 uses the utility pin. */
 	if (panel->backlight.controller == 1) {
 		val = I915_READ(UTIL_PIN_CTL);
 		panel->backlight.util_pin_active_low =
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#8 lore raw

✓ Fi.CI.BAT: success for FOR_UPSTREAM [VPG]: drm/i915: Parse panel BL controller from VBT (rev4)

In reply to Vidya Srinivas
== Series Details ==

== Series Details ==

Series: FOR_UPSTREAM [VPG]: drm/i915: Parse panel BL controller from VBT (rev4)
URL : https://patchwork.freedesktop.org/series/16489/
State : success

== Summary ==

Series 16489v4 FOR_UPSTREAM [VPG]: drm/i915: Parse panel BL controller from VBT
https://patchwork.freedesktop.org/api/1.0/series/16489/revisions/4/mbox/

Test kms_pipe_crc_basic:

        Subgroup hang-read-crc-pipe-a:
                pass       -> FAIL       (fi-ctg-l9400) UNSTABLE
        Subgroup read-crc-pipe-a-frame-sequence:
                fail       -> PASS       (fi-ctg-l9400) UNSTABLE
fi-bdw-5557u     total:247  pass:233  dwarn:0   dfail:0   fail:0   skip:14 
fi-bsw-n3050     total:247  pass:208  dwarn:0   dfail:0   fail:0   skip:39 
fi-bxt-t5700     total:247  pass:220  dwarn:0   dfail:0   fail:0   skip:27 
fi-byt-j1900     total:247  pass:220  dwarn:0   dfail:0   fail:0   skip:27 
fi-byt-n2820     total:247  pass:216  dwarn:0   dfail:0   fail:0   skip:31 
fi-ctg-l9400     total:210  pass:165  dwarn:0   dfail:0   fail:1   skip:43 
fi-hsw-4770      total:247  pass:228  dwarn:0   dfail:0   fail:0   skip:19 
fi-hsw-4770r     total:247  pass:228  dwarn:0   dfail:0   fail:0   skip:19 
fi-ilk-650       total:247  pass:195  dwarn:0   dfail:0   fail:0   skip:52 
fi-ivb-3520m     total:247  pass:226  dwarn:0   dfail:0   fail:0   skip:21 
fi-ivb-3770      total:247  pass:226  dwarn:0   dfail:0   fail:0   skip:21 
fi-kbl-7500u     total:247  pass:226  dwarn:0   dfail:0   fail:0   skip:21 
fi-skl-6260u     total:247  pass:234  dwarn:0   dfail:0   fail:0   skip:13 
fi-skl-6700hq    total:247  pass:227  dwarn:0   dfail:0   fail:0   skip:20 
fi-skl-6700k     total:247  pass:224  dwarn:3   dfail:0   fail:0   skip:20 
fi-skl-6770hq    total:247  pass:234  dwarn:0   dfail:0   fail:0   skip:13 
fi-snb-2520m     total:247  pass:216  dwarn:0   dfail:0   fail:0   skip:31 
fi-snb-2600      total:247  pass:215  dwarn:0   dfail:0   fail:0   skip:32 

e705da1e357d4db0db0b21bc6a2ea96df4453e05 drm-tip: 2016y-12m-08d-09h-02m-15s UTC integration manifest 1a6fcb9 drm/i915: Parse panel backlight controller from VBT

== Logs ==

For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_3232/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx