|
@@ -654,19 +654,15 @@ static int
|
|
|
bxt_power_sequencer_idx(struct intel_dp *intel_dp)
|
|
|
{
|
|
|
struct drm_i915_private *dev_priv = to_i915(intel_dp_to_dev(intel_dp));
|
|
|
+ int backlight_controller = dev_priv->vbt.backlight.controller;
|
|
|
|
|
|
lockdep_assert_held(&dev_priv->pps_mutex);
|
|
|
|
|
|
/* We should never land here with regular DP ports */
|
|
|
WARN_ON(!intel_dp_is_edp(intel_dp));
|
|
|
|
|
|
- /*
|
|
|
- * TODO: BXT has 2 PPS instances. The correct port->PPS instance
|
|
|
- * mapping needs to be retrieved from VBT, for now just hard-code to
|
|
|
- * use instance #0 always.
|
|
|
- */
|
|
|
if (!intel_dp->pps_reset)
|
|
|
- return 0;
|
|
|
+ return backlight_controller;
|
|
|
|
|
|
intel_dp->pps_reset = false;
|
|
|
|
|
@@ -676,7 +672,7 @@ bxt_power_sequencer_idx(struct intel_dp *intel_dp)
|
|
|
*/
|
|
|
intel_dp_init_panel_power_sequencer_registers(intel_dp, false);
|
|
|
|
|
|
- return 0;
|
|
|
+ return backlight_controller;
|
|
|
}
|
|
|
|
|
|
typedef bool (*vlv_pipe_check)(struct drm_i915_private *dev_priv,
|