drm/i915: Eliminate lots of WARNs when there's no backlight present
My 855gm doesn't register the intel backlight but it still ends up calling the backlight code to enable/disable the backlight via the LVDS code. This leads to some WARNs due to backlight.max being 0. Let's have intel_panel_enable_backlight() and intel_panel_disable_backlight() check whether there's a backlight present or not. Also move the backlight.present check from asle_set_backlight() into intel_panel_set_backlight() for some extra symmetry. Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Reviewed-by: Jani Nikula <jani.nikula@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
parent
bfbdb420f5
commit
dc5a43636c
|
@ -396,9 +396,7 @@ int intel_opregion_notify_adapter(struct drm_device *dev, pci_power_t state)
|
||||||
static u32 asle_set_backlight(struct drm_device *dev, u32 bclp)
|
static u32 asle_set_backlight(struct drm_device *dev, u32 bclp)
|
||||||
{
|
{
|
||||||
struct drm_i915_private *dev_priv = dev->dev_private;
|
struct drm_i915_private *dev_priv = dev->dev_private;
|
||||||
struct drm_connector *connector;
|
|
||||||
struct intel_connector *intel_connector;
|
struct intel_connector *intel_connector;
|
||||||
struct intel_panel *panel;
|
|
||||||
struct opregion_asle __iomem *asle = dev_priv->opregion.asle;
|
struct opregion_asle __iomem *asle = dev_priv->opregion.asle;
|
||||||
|
|
||||||
DRM_DEBUG_DRIVER("bclp = 0x%08x\n", bclp);
|
DRM_DEBUG_DRIVER("bclp = 0x%08x\n", bclp);
|
||||||
|
@ -417,12 +415,8 @@ static u32 asle_set_backlight(struct drm_device *dev, u32 bclp)
|
||||||
* only one).
|
* only one).
|
||||||
*/
|
*/
|
||||||
DRM_DEBUG_KMS("updating opregion backlight %d/255\n", bclp);
|
DRM_DEBUG_KMS("updating opregion backlight %d/255\n", bclp);
|
||||||
list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
|
list_for_each_entry(intel_connector, &dev->mode_config.connector_list, base.head)
|
||||||
intel_connector = to_intel_connector(connector);
|
intel_panel_set_backlight(intel_connector, bclp, 255);
|
||||||
panel = &intel_connector->panel;
|
|
||||||
if (panel->backlight.present)
|
|
||||||
intel_panel_set_backlight(intel_connector, bclp, 255);
|
|
||||||
}
|
|
||||||
iowrite32(DIV_ROUND_UP(bclp * 100, 255) | ASLE_CBLV_VALID, &asle->cblv);
|
iowrite32(DIV_ROUND_UP(bclp * 100, 255) | ASLE_CBLV_VALID, &asle->cblv);
|
||||||
|
|
||||||
mutex_unlock(&dev->mode_config.mutex);
|
mutex_unlock(&dev->mode_config.mutex);
|
||||||
|
|
|
@ -502,7 +502,7 @@ void intel_panel_set_backlight(struct intel_connector *connector, u32 level,
|
||||||
u32 freq;
|
u32 freq;
|
||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
|
|
||||||
if (pipe == INVALID_PIPE)
|
if (!panel->backlight.present || pipe == INVALID_PIPE)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
spin_lock_irqsave(&dev_priv->backlight_lock, flags);
|
spin_lock_irqsave(&dev_priv->backlight_lock, flags);
|
||||||
|
@ -579,7 +579,7 @@ void intel_panel_disable_backlight(struct intel_connector *connector)
|
||||||
enum pipe pipe = intel_get_pipe_from_connector(connector);
|
enum pipe pipe = intel_get_pipe_from_connector(connector);
|
||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
|
|
||||||
if (pipe == INVALID_PIPE)
|
if (!panel->backlight.present || pipe == INVALID_PIPE)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -782,7 +782,7 @@ void intel_panel_enable_backlight(struct intel_connector *connector)
|
||||||
enum pipe pipe = intel_get_pipe_from_connector(connector);
|
enum pipe pipe = intel_get_pipe_from_connector(connector);
|
||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
|
|
||||||
if (pipe == INVALID_PIPE)
|
if (!panel->backlight.present || pipe == INVALID_PIPE)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
DRM_DEBUG_KMS("pipe %c\n", pipe_name(pipe));
|
DRM_DEBUG_KMS("pipe %c\n", pipe_name(pipe));
|
||||||
|
|
Loading…
Reference in a new issue