WebSVN – Kolibri OS – Diff – /drivers/video/drm/i915/intel_panel.c

 	/* defensive */
 	source_val = clamp(source_val, source_min, source_max);
-	/* avoid overflows */
-	target_val = (uint64_t)(source_val - source_min) *
+	/* avoid overflows */
-		(target_max - target_min);
+	target_val = DIV_ROUND_CLOSEST_ULL((uint64_t)(source_val - source_min) *
-	do_div(target_val, source_max - source_min);
+			(target_max - target_min), source_max - source_min);
 	target_val += target_min;
 static u32 _vlv_get_backlight(struct drm_device *dev, enum pipe pipe)
+{
+	struct drm_i915_private *dev_priv = dev->dev_private;
+	if (WARN_ON(pipe != PIPE_A && pipe != PIPE_B))
-	struct drm_i915_private *dev_priv = dev->dev_private;
+		return 0;
 	return I915_READ(VLV_BLC_PWM_CTL(pipe)) & BACKLIGHT_DUTY_CYCLE_MASK;
+}
 static u32 intel_panel_get_backlight(struct intel_connector *connector)
+{
 	struct drm_device *dev = connector->base.dev;
+	struct drm_i915_private *dev_priv = dev->dev_private;
-	struct drm_i915_private *dev_priv = dev->dev_private;
+	struct intel_panel *panel = &connector->panel;
-	u32 val;
-	unsigned long flags;
+	u32 val = 0;
 	mutex_lock(&dev_priv->backlight_lock);
 	spin_lock_irqsave(&dev_priv->backlight_lock, flags);
+	if (panel->backlight.enabled) {
+	val = dev_priv->display.get_backlight(connector);
-	val = dev_priv->display.get_backlight(connector);
+	val = intel_panel_compute_brightness(connector, val);
 	val = intel_panel_compute_brightness(connector, val);
 	struct drm_device *dev = connector->base.dev;
 	struct drm_i915_private *dev_priv = dev->dev_private;
 	enum pipe pipe = intel_get_pipe_from_connector(connector);
 	u32 tmp;
+	if (WARN_ON(pipe != PIPE_A && pipe != PIPE_B))
+		return;
 	tmp = I915_READ(VLV_BLC_PWM_CTL(pipe)) & ~BACKLIGHT_DUTY_CYCLE_MASK;
 	I915_WRITE(VLV_BLC_PWM_CTL(pipe), tmp | level);
+}
 				      u32 user_level, u32 user_max)
+{
 	struct drm_device *dev = connector->base.dev;
 	struct drm_i915_private *dev_priv = dev->dev_private;
 	struct intel_panel *panel = &connector->panel;
-	enum pipe pipe = intel_get_pipe_from_connector(connector);
 	u32 hw_level;
-	unsigned long flags;
-	if (!panel->backlight.present || pipe == INVALID_PIPE)
+	if (!panel->backlight.present)
 		return;
-	spin_lock_irqsave(&dev_priv->backlight_lock, flags);
+	mutex_lock(&dev_priv->backlight_lock);
 	WARN_ON(panel->backlight.max == 0);
 	hw_level = scale_user_to_hw(connector, user_level, user_max);
 	panel->backlight.level = hw_level;
 	if (panel->backlight.enabled)
 		intel_panel_actually_set_backlight(connector, hw_level);
 	struct drm_device *dev = connector->base.dev;
 	struct drm_i915_private *dev_priv = dev->dev_private;
 	struct intel_panel *panel = &connector->panel;
 	enum pipe pipe = intel_get_pipe_from_connector(connector);
 	u32 hw_level;
-	unsigned long flags;
+	/*
+	 * INVALID_PIPE may occur during driver init because
+	 * connection_mutex isn't held across the entire backlight
+	 * setup + modeset readout, and the BIOS can issue the
+	 * requests at any time.
 	 */
 	if (!panel->backlight.present || pipe == INVALID_PIPE)
 		return;
-	spin_lock_irqsave(&dev_priv->backlight_lock, flags);
+	mutex_lock(&dev_priv->backlight_lock);
 	WARN_ON(panel->backlight.max == 0);
 	hw_level = clamp_user_to_hw(connector, user_level, user_max);
 	panel->backlight.level = hw_level;
 	if (panel->backlight.enabled)
 	struct drm_device *dev = connector->base.dev;
 	struct drm_i915_private *dev_priv = dev->dev_private;
 	enum pipe pipe = intel_get_pipe_from_connector(connector);
 	u32 tmp;
+	if (WARN_ON(pipe != PIPE_A && pipe != PIPE_B))
+		return;
 	intel_panel_actually_set_backlight(connector, 0);
 	tmp = I915_READ(VLV_BLC_PWM_CTL2(pipe));
 void intel_panel_disable_backlight(struct intel_connector *connector)
+{
 	struct drm_device *dev = connector->base.dev;
 	struct drm_i915_private *dev_priv = dev->dev_private;
 	struct intel_panel *panel = &connector->panel;
-	enum pipe pipe = intel_get_pipe_from_connector(connector);
-	unsigned long flags;
-	if (!panel->backlight.present || pipe == INVALID_PIPE)
+	if (!panel->backlight.present)
 		return;
 	/*
 	if (dev->switch_power_state == DRM_SWITCH_POWER_CHANGING) {
 		DRM_DEBUG_DRIVER("Skipping backlight disable on vga switch\n");
 		return;
+	}
-	spin_lock_irqsave(&dev_priv->backlight_lock, flags);
+	mutex_lock(&dev_priv->backlight_lock);
 	panel->backlight.enabled = false;
 	dev_priv->display.disable_backlight(connector);
-	spin_unlock_irqrestore(&dev_priv->backlight_lock, flags);
+	mutex_unlock(&dev_priv->backlight_lock);
+}
 	pch_ctl1 = 0;
 	if (panel->backlight.active_low_pwm)
 		pch_ctl1 |= BLM_PCH_POLARITY;
 	/* After LPT, override is the default. */
-	/* BDW always uses the pch pwm controls. */
+	if (HAS_PCH_LPT(dev_priv))
 	pch_ctl1 |= BLM_PCH_OVERRIDE_ENABLE;
 	struct drm_i915_private *dev_priv = dev->dev_private;
 	struct intel_panel *panel = &connector->panel;
 	enum pipe pipe = intel_get_pipe_from_connector(connector);
 	u32 ctl, ctl2;
+	if (WARN_ON(pipe != PIPE_A && pipe != PIPE_B))
+		return;
 	ctl2 = I915_READ(VLV_BLC_PWM_CTL2(pipe));
 	if (ctl2 & BLM_PWM_ENABLE) {
 		DRM_DEBUG_KMS("backlight already enabled\n");
 		ctl2 &= ~BLM_PWM_ENABLE;
+{
 	struct drm_device *dev = connector->base.dev;
 	struct drm_i915_private *dev_priv = dev->dev_private;
 	struct intel_panel *panel = &connector->panel;
 	enum pipe pipe = intel_get_pipe_from_connector(connector);
-	unsigned long flags;
-	if (!panel->backlight.present || pipe == INVALID_PIPE)
+	if (!panel->backlight.present)
 		return;
 	DRM_DEBUG_KMS("pipe %c\n", pipe_name(pipe));
-	spin_lock_irqsave(&dev_priv->backlight_lock, flags);
+	mutex_lock(&dev_priv->backlight_lock);
 	WARN_ON(panel->backlight.max == 0);
 	if (panel->backlight.level == 0) {
 		panel->backlight.level = panel->backlight.max;
+	}
 	dev_priv->display.enable_backlight(connector);
 	panel->backlight.enabled = true;
 	mutex_unlock(&dev_priv->backlight_lock);
 	spin_unlock_irqrestore(&dev_priv->backlight_lock, flags);
 #if IS_ENABLED(CONFIG_BACKLIGHT_CLASS_DEVICE)
 	struct backlight_properties props;
 	if (WARN_ON(panel->backlight.device))
+		return -ENODEV;
+	if (!panel->backlight.present)
-		return -ENODEV;
+		return 0;
 	WARN_ON(panel->backlight.max == 0);
 	props.max_brightness = panel->backlight.max;
 	props.brightness = scale_hw_to_user(connector,
 					    panel->backlight.level,
 					    props.max_brightness);
+	if (panel->backlight.enabled)
+		props.power = FB_BLANK_UNBLANK;
+	else
+		props.power = FB_BLANK_POWERDOWN;
 	/*
 	 * Note: using the same name independent of the connector prevents
 	 * registration of multiple backlight devices in the driver.
 	 */
 		DRM_ERROR("Failed to register backlight: %ld\n",
 			  PTR_ERR(panel->backlight.device));
 		panel->backlight.device = NULL;
 		return -ENODEV;
+	}
+	DRM_DEBUG_KMS("Connector %s backlight sysfs interface registered\n",
+		      connector->base.name);
 	return 0;
+}
 static void intel_backlight_device_unregister(struct intel_connector *connector)
 static u32 get_backlight_min_vbt(struct intel_connector *connector)
+{
 	struct drm_device *dev = connector->base.dev;
 	struct drm_i915_private *dev_priv = dev->dev_private;
 	struct intel_panel *panel = &connector->panel;
+	int min;
+	WARN_ON(panel->backlight.max == 0);
+	/*
+	 * 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
+	 * interpretation is wrong or the vbt has bogus data. Or both. Safeguard
+	 * against this by letting the minimum be at most (arbitrarily chosen)
+	 * 25% of the max.
+	 */
+	min = clamp_t(int, dev_priv->vbt.backlight.min_brightness, 0, 64);
+	if (min != dev_priv->vbt.backlight.min_brightness) {
+		DRM_DEBUG_KMS("clamping VBT min backlight %d/255 to %d/255\n",
+			      dev_priv->vbt.backlight.min_brightness, min);
 	WARN_ON(panel->backlight.max == 0);
-	/* vbt value is a coefficient in range [0..255] */
-	return scale(dev_priv->vbt.backlight.min_brightness, 0, 255,
+	/* vbt value is a coefficient in range [0..255] */
-, panel->backlight.max);
+	return scale(min, 0, 255, 0, panel->backlight.max);
+}
-static int bdw_setup_backlight(struct intel_connector *connector)
+static int bdw_setup_backlight(struct intel_connector *connector, enum pipe unused)
+{
 	struct drm_device *dev = connector->base.dev;
 		panel->backlight.level != 0;
 	return 0;
 }
-static int pch_setup_backlight(struct intel_connector *connector)
+static int pch_setup_backlight(struct intel_connector *connector, enum pipe unused)
+{
 	struct drm_device *dev = connector->base.dev;
 	struct drm_i915_private *dev_priv = dev->dev_private;
 		(pch_ctl1 & BLM_PCH_PWM_ENABLE) && panel->backlight.level != 0;
 	return 0;
 }
-static int i9xx_setup_backlight(struct intel_connector *connector)
+static int i9xx_setup_backlight(struct intel_connector *connector, enum pipe unused)
+{
 	struct drm_device *dev = connector->base.dev;
 	struct drm_i915_private *dev_priv = dev->dev_private;
 	panel->backlight.enabled = panel->backlight.level != 0;
 	return 0;
 }
-static int i965_setup_backlight(struct intel_connector *connector)
+static int i965_setup_backlight(struct intel_connector *connector, enum pipe unused)
+{
 	struct drm_device *dev = connector->base.dev;
 	struct drm_i915_private *dev_priv = dev->dev_private;
 		panel->backlight.level != 0;
 	return 0;
 }
-static int vlv_setup_backlight(struct intel_connector *connector)
+static int vlv_setup_backlight(struct intel_connector *connector, enum pipe pipe)
+{
 	struct drm_device *dev = connector->base.dev;
 	struct drm_i915_private *dev_priv = dev->dev_private;
 	struct intel_panel *panel = &connector->panel;
-	enum pipe pipe;
+	enum pipe p;
 	u32 ctl, ctl2, val;
-	for_each_pipe(pipe) {
+	for_each_pipe(dev_priv, p) {
-		u32 cur_val = I915_READ(VLV_BLC_PWM_CTL(pipe));
+		u32 cur_val = I915_READ(VLV_BLC_PWM_CTL(p));
 		/* Skip if the modulation freq is already set */
 		if (cur_val & ~BACKLIGHT_DUTY_CYCLE_MASK)
 			continue;
+		cur_val &= BACKLIGHT_DUTY_CYCLE_MASK;
+		I915_WRITE(VLV_BLC_PWM_CTL(p), (0xf42 << 16) |
+			   cur_val);
 		cur_val &= BACKLIGHT_DUTY_CYCLE_MASK;
-		I915_WRITE(VLV_BLC_PWM_CTL(pipe), (0xf42 << 16) |
-			   cur_val);
+	if (WARN_ON(pipe != PIPE_A && pipe != PIPE_B))
 		return -ENODEV;
-	ctl2 = I915_READ(VLV_BLC_PWM_CTL2(PIPE_A));
+	ctl2 = I915_READ(VLV_BLC_PWM_CTL2(pipe));
 	panel->backlight.active_low_pwm = ctl2 & BLM_POLARITY_I965;
-	ctl = I915_READ(VLV_BLC_PWM_CTL(PIPE_A));
+	ctl = I915_READ(VLV_BLC_PWM_CTL(pipe));
 	panel->backlight.max = ctl >> 16;
 	if (!panel->backlight.max)
 		return -ENODEV;
 	panel->backlight.min = get_backlight_min_vbt(connector);
-	val = _vlv_get_backlight(dev, PIPE_A);
+	val = _vlv_get_backlight(dev, pipe);
 	panel->backlight.level = intel_panel_compute_brightness(connector, val);
-	panel->backlight.enabled = (ctl2 & BLM_PWM_ENABLE) &&
-		panel->backlight.level != 0;
+	panel->backlight.enabled = (ctl2 & BLM_PWM_ENABLE) &&
 		panel->backlight.level != 0;
 	return 0;
 	return 0;
 		return 0;
+	}
+	}
 	/* set level and max in panel struct */
-	spin_lock_irqsave(&dev_priv->backlight_lock, flags);
+	mutex_lock(&dev_priv->backlight_lock);
-	ret = dev_priv->display.setup_backlight(intel_connector);
+	ret = dev_priv->display.setup_backlight(intel_connector, pipe);
-	spin_unlock_irqrestore(&dev_priv->backlight_lock, flags);
+	mutex_unlock(&dev_priv->backlight_lock);
 	if (ret) {
 		DRM_DEBUG_KMS("failed to setup backlight for connector %s\n",
 			      connector->name);
-		return ret;
-	}
 		return ret;
-	intel_backlight_device_register(intel_connector);
+	}
 	panel->backlight.present = true;
-	DRM_DEBUG_KMS("backlight initialized, %s, brightness %u/%u, "
-		      "sysfs interface %sregistered\n",
+	DRM_DEBUG_KMS("Connector %s backlight initialized, %s, brightness %u/%u\n",
-		      panel->backlight.enabled ? "enabled" : "disabled",
+		      connector->name,
-		      panel->backlight.level, panel->backlight.max,
+		      panel->backlight.enabled ? "enabled" : "disabled",
-		      panel->backlight.device ? "" : "not ");
+		      panel->backlight.level, panel->backlight.max);
 	return 0;
+}
 void intel_panel_destroy_backlight(struct drm_connector *connector)
 void intel_panel_destroy_backlight(struct drm_connector *connector)
 	struct intel_connector *intel_connector = to_intel_connector(connector);
-	struct intel_panel *panel = &intel_connector->panel;
+	struct intel_connector *intel_connector = to_intel_connector(connector);
 	struct intel_panel *panel = &intel_connector->panel;
-	panel->backlight.present = false;
-	intel_backlight_device_unregister(intel_connector);
+	panel->backlight.present = false;
+}
 /* Set up chip specific backlight functions */
 void intel_panel_init_backlight_funcs(struct drm_device *dev)
 	if (panel->downclock_mode)
 		drm_mode_destroy(intel_connector->base.dev,
 				panel->downclock_mode);
+}
+void intel_backlight_register(struct drm_device *dev)
+{
+	struct intel_connector *connector;
+	list_for_each_entry(connector, &dev->mode_config.connector_list, base.head)
+		intel_backlight_device_register(connector);
+}
+void intel_backlight_unregister(struct drm_device *dev)
+{
+	struct intel_connector *connector;
+	list_for_each_entry(connector, &dev->mode_config.connector_list, base.head)
+		intel_backlight_device_unregister(connector);

Subversion Repositories Kolibri OS

(root)/drivers/video/drm/i915/intel_panel.c – Rev 5097 → 5354