Skip to content

Commit

Permalink
drm/i915: make backlight info per-connector
Browse files Browse the repository at this point in the history 
Move from dev_priv to connector->panel. We still don't allow multiple
sysfs interfaces, though.

There should be no functional changes, except for a slight reordering of
connector backlight and sysfs destroy calls. (This change happens now
that the backlight device is actually per-connector, even though the
destroy calls became per-connector earlier.)

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Imre Deak <imre.deak@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
  • Loading branch information
Jani Nikula authored and Daniel Vetter committed Nov 12, 2013
1 parent db31af1 commit 58c6877
Show file tree
Hide file tree
Showing 5 changed files with 61 additions and 50 deletions.
2 changes: 1 addition & 1 deletion drivers/gpu/drm/i915/i915_dma.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1486,7 +1486,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)

spin_lock_init(&dev_priv->irq_lock);
spin_lock_init(&dev_priv->gpu_error.lock);
spin_lock_init(&dev_priv->backlight.lock);
spin_lock_init(&dev_priv->backlight_lock);
spin_lock_init(&dev_priv->uncore.lock);
spin_lock_init(&dev_priv->mm.object_stat_lock);
mutex_init(&dev_priv->dpio_lock);
Expand Down
9 changes: 2 additions & 7 deletions drivers/gpu/drm/i915/i915_drv.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1368,13 +1368,8 @@ typedef struct drm_i915_private {
struct intel_overlay *overlay;
unsigned int sprite_scaling_enabled;

/* backlight */
struct {
int level;
bool enabled;
spinlock_t lock; /* bl registers and the above bl fields */
struct backlight_device *device;
} backlight;
/* backlight registers and fields in struct intel_panel */
spinlock_t backlight_lock;

/* LVDS info */
bool no_aux_handshake;
Expand Down
8 changes: 4 additions & 4 deletions drivers/gpu/drm/i915/i915_suspend.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ static void i915_save_display(struct drm_device *dev)
if (!drm_core_check_feature(dev, DRIVER_MODESET))
i915_save_display_reg(dev);

spin_lock_irqsave(&dev_priv->backlight.lock, flags);
spin_lock_irqsave(&dev_priv->backlight_lock, flags);

/* LVDS state */
if (HAS_PCH_SPLIT(dev)) {
Expand Down Expand Up @@ -241,7 +241,7 @@ static void i915_save_display(struct drm_device *dev)
dev_priv->regfile.saveLVDS = I915_READ(LVDS);
}

spin_unlock_irqrestore(&dev_priv->backlight.lock, flags);
spin_unlock_irqrestore(&dev_priv->backlight_lock, flags);

if (!IS_I830(dev) && !IS_845G(dev) && !HAS_PCH_SPLIT(dev))
dev_priv->regfile.savePFIT_CONTROL = I915_READ(PFIT_CONTROL);
Expand Down Expand Up @@ -287,7 +287,7 @@ static void i915_restore_display(struct drm_device *dev)
if (!drm_core_check_feature(dev, DRIVER_MODESET))
i915_restore_display_reg(dev);

spin_lock_irqsave(&dev_priv->backlight.lock, flags);
spin_lock_irqsave(&dev_priv->backlight_lock, flags);

/* LVDS state */
if (INTEL_INFO(dev)->gen >= 4 && !HAS_PCH_SPLIT(dev))
Expand Down Expand Up @@ -341,7 +341,7 @@ static void i915_restore_display(struct drm_device *dev)
I915_WRITE(PP_CONTROL, dev_priv->regfile.savePP_CONTROL);
}

spin_unlock_irqrestore(&dev_priv->backlight.lock, flags);
spin_unlock_irqrestore(&dev_priv->backlight_lock, flags);

/* only restore FBC info on the platform that supports FBC*/
intel_disable_fbc(dev);
Expand Down
7 changes: 7 additions & 0 deletions drivers/gpu/drm/i915/intel_drv.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,13 @@ struct intel_encoder {
struct intel_panel {
struct drm_display_mode *fixed_mode;
int fitting_mode;

/* backlight */
struct {
u32 level;
bool enabled;
struct backlight_device *device;
} backlight;
};

struct intel_connector {
Expand Down
85 changes: 47 additions & 38 deletions drivers/gpu/drm/i915/intel_panel.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ static u32 i915_read_blc_pwm_ctl(struct drm_device *dev, enum pipe pipe)
struct drm_i915_private *dev_priv = dev->dev_private;
u32 val;

WARN_ON_SMP(!spin_is_locked(&dev_priv->backlight.lock));
WARN_ON_SMP(!spin_is_locked(&dev_priv->backlight_lock));

/* Restore the CTL value if it lost, e.g. GPU reset */

Expand Down Expand Up @@ -449,7 +449,7 @@ static u32 intel_panel_get_backlight(struct drm_device *dev,
unsigned long flags;
int reg;

spin_lock_irqsave(&dev_priv->backlight.lock, flags);
spin_lock_irqsave(&dev_priv->backlight_lock, flags);

if (HAS_PCH_SPLIT(dev)) {
val = I915_READ(BLC_PWM_CPU_CTL) & BACKLIGHT_DUTY_CYCLE_MASK;
Expand All @@ -473,7 +473,7 @@ static u32 intel_panel_get_backlight(struct drm_device *dev,

val = intel_panel_compute_brightness(dev, pipe, val);

spin_unlock_irqrestore(&dev_priv->backlight.lock, flags);
spin_unlock_irqrestore(&dev_priv->backlight_lock, flags);

DRM_DEBUG_DRIVER("get backlight PWM = %d\n", val);
return val;
Expand Down Expand Up @@ -530,14 +530,15 @@ void intel_panel_set_backlight(struct intel_connector *connector, u32 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 freq;
unsigned long flags;

if (pipe == INVALID_PIPE)
return;

spin_lock_irqsave(&dev_priv->backlight.lock, flags);
spin_lock_irqsave(&dev_priv->backlight_lock, flags);

freq = intel_panel_get_max_backlight(dev, pipe);
if (!freq) {
Expand All @@ -551,20 +552,21 @@ void intel_panel_set_backlight(struct intel_connector *connector, u32 level,
else
level = freq / max * level;

dev_priv->backlight.level = level;
if (dev_priv->backlight.device)
dev_priv->backlight.device->props.brightness = level;
panel->backlight.level = level;
if (panel->backlight.device)
panel->backlight.device->props.brightness = level;

if (dev_priv->backlight.enabled)
if (panel->backlight.enabled)
intel_panel_actually_set_backlight(dev, pipe, level);
out:
spin_unlock_irqrestore(&dev_priv->backlight.lock, flags);
spin_unlock_irqrestore(&dev_priv->backlight_lock, flags);
}

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;

Expand All @@ -582,9 +584,9 @@ void intel_panel_disable_backlight(struct intel_connector *connector)
return;
}

spin_lock_irqsave(&dev_priv->backlight.lock, flags);
spin_lock_irqsave(&dev_priv->backlight_lock, flags);

dev_priv->backlight.enabled = false;
panel->backlight.enabled = false;
intel_panel_actually_set_backlight(dev, pipe, 0);

if (INTEL_INFO(dev)->gen >= 4) {
Expand All @@ -606,13 +608,14 @@ void intel_panel_disable_backlight(struct intel_connector *connector)
}
}

spin_unlock_irqrestore(&dev_priv->backlight.lock, flags);
spin_unlock_irqrestore(&dev_priv->backlight_lock, flags);
}

void intel_panel_enable_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);
enum transcoder cpu_transcoder =
intel_pipe_to_cpu_transcoder(dev_priv, pipe);
Expand All @@ -623,14 +626,14 @@ void intel_panel_enable_backlight(struct intel_connector *connector)

DRM_DEBUG_KMS("pipe %c\n", pipe_name(pipe));

spin_lock_irqsave(&dev_priv->backlight.lock, flags);
spin_lock_irqsave(&dev_priv->backlight_lock, flags);

if (dev_priv->backlight.level == 0) {
dev_priv->backlight.level = intel_panel_get_max_backlight(dev,
pipe);
if (dev_priv->backlight.device)
dev_priv->backlight.device->props.brightness =
dev_priv->backlight.level;
if (panel->backlight.level == 0) {
panel->backlight.level = intel_panel_get_max_backlight(dev,
pipe);
if (panel->backlight.device)
panel->backlight.device->props.brightness =
panel->backlight.level;
}

if (INTEL_INFO(dev)->gen >= 4) {
Expand Down Expand Up @@ -680,11 +683,11 @@ void intel_panel_enable_backlight(struct intel_connector *connector)
* BLC_PWM_CPU_CTL may be cleared to zero automatically when these
* registers are set.
*/
dev_priv->backlight.enabled = true;
panel->backlight.enabled = true;
intel_panel_actually_set_backlight(dev, pipe,
dev_priv->backlight.level);
panel->backlight.level);

spin_unlock_irqrestore(&dev_priv->backlight.lock, flags);
spin_unlock_irqrestore(&dev_priv->backlight_lock, flags);
}

/* FIXME: use VBT vals to init PWM_CTL and PWM_CTL2 correctly */
Expand Down Expand Up @@ -770,46 +773,52 @@ static int intel_backlight_device_register(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;
struct backlight_properties props;
unsigned long flags;

if (WARN_ON(dev_priv->backlight.device))
if (WARN_ON(panel->backlight.device))
return -ENODEV;

memset(&props, 0, sizeof(props));
props.type = BACKLIGHT_RAW;
props.brightness = dev_priv->backlight.level;
props.brightness = panel->backlight.level;

spin_lock_irqsave(&dev_priv->backlight.lock, flags);
spin_lock_irqsave(&dev_priv->backlight_lock, flags);
props.max_brightness = intel_panel_get_max_backlight(dev, 0);
spin_unlock_irqrestore(&dev_priv->backlight.lock, flags);
spin_unlock_irqrestore(&dev_priv->backlight_lock, flags);

if (props.max_brightness == 0) {
DRM_DEBUG_DRIVER("Failed to get maximum backlight value\n");
return -ENODEV;
}
dev_priv->backlight.device =

/*
* Note: using the same name independent of the connector prevents
* registration of multiple backlight devices in the driver.
*/
panel->backlight.device =
backlight_device_register("intel_backlight",
connector->base.kdev,
connector,
&intel_backlight_device_ops, &props);

if (IS_ERR(dev_priv->backlight.device)) {
if (IS_ERR(panel->backlight.device)) {
DRM_ERROR("Failed to register backlight: %ld\n",
PTR_ERR(dev_priv->backlight.device));
dev_priv->backlight.device = NULL;
PTR_ERR(panel->backlight.device));
panel->backlight.device = NULL;
return -ENODEV;
}
return 0;
}

static void intel_backlight_device_unregister(struct intel_connector *connector)
{
struct drm_device *dev = connector->base.dev;
struct drm_i915_private *dev_priv = dev->dev_private;
if (dev_priv->backlight.device) {
backlight_device_unregister(dev_priv->backlight.device);
dev_priv->backlight.device = NULL;
struct intel_panel *panel = &connector->panel;

if (panel->backlight.device) {
backlight_device_unregister(panel->backlight.device);
panel->backlight.device = NULL;
}
}
#else /* CONFIG_BACKLIGHT_CLASS_DEVICE */
Expand All @@ -825,13 +834,13 @@ static void intel_backlight_device_unregister(struct intel_connector *connector)
int intel_panel_setup_backlight(struct drm_connector *connector)
{
struct drm_device *dev = connector->dev;
struct drm_i915_private *dev_priv = dev->dev_private;
struct intel_connector *intel_connector = to_intel_connector(connector);
struct intel_panel *panel = &intel_connector->panel;

intel_panel_init_backlight_regs(dev);

dev_priv->backlight.level = intel_panel_get_backlight(dev, 0);
dev_priv->backlight.enabled = dev_priv->backlight.level != 0;
panel->backlight.level = intel_panel_get_backlight(dev, 0);
panel->backlight.enabled = panel->backlight.level != 0;

intel_backlight_device_register(intel_connector);

Expand Down

0 comments on commit 58c6877

Please sign in to comment.