On Fri, Jan 14, 2011 at 2:24 PM, Matthew Garrett mjg@redhat.com wrote:

From: Michel Dänzer michel@daenzer.net

Allows e.g. power management daemons to control the backlight level. Inspired by the corresponding code in radeonfb.

(Updated to add backlight type and make the connector the parent device - mjg)

Signed-off-by: Michel Dänzer daenzer@vmware.com Signed-off-by: Matthew Garrett mjg@redhat.com

Acked-by: Alex Deucher alexdeucher@gmail.com

Cc: dri-devel@lists.freedesktop.org

drivers/gpu/drm/radeon/Kconfig                  |    1 +  drivers/gpu/drm/radeon/radeon_connectors.c      |   15 ++  drivers/gpu/drm/radeon/radeon_legacy_encoders.c |  257 ++++++++++++++++++++++-  drivers/gpu/drm/radeon/radeon_mode.h            |   10 +  4 files changed, 277 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/radeon/Kconfig b/drivers/gpu/drm/radeon/Kconfig index 1c02d23..9746fee 100644 --- a/drivers/gpu/drm/radeon/Kconfig +++ b/drivers/gpu/drm/radeon/Kconfig @@ -1,6 +1,7 @@  config DRM_RADEON_KMS        bool "Enable modesetting on radeon by default - NEW DRIVER"        depends on DRM_RADEON

• select BACKLIGHT_CLASS_DEVICE

help          Choose this option if you want kernel modesetting enabled by default.

diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c index 22b7e3d..e842fb5 100644 --- a/drivers/gpu/drm/radeon/radeon_connectors.c +++ b/drivers/gpu/drm/radeon/radeon_connectors.c @@ -40,6 +40,10 @@ radeon_atombios_connected_scratch_regs(struct drm_connector *connector,                                       struct drm_encoder *encoder,                                       bool connected);

+extern void +radeon_legacy_backlight_init(struct radeon_encoder *radeon_encoder,

• struct drm_connector *drm_connector);

void radeon_connector_hotplug(struct drm_connector *connector)  {        struct drm_device *dev = connector->dev; @@ -1517,6 +1521,17 @@ radeon_add_legacy_connector(struct drm_device *dev,                connector->polled = DRM_CONNECTOR_POLL_HPD;        connector->display_info.subpixel_order = subpixel_order;        drm_sysfs_connector_add(connector);

• if (connector_type == DRM_MODE_CONNECTOR_LVDS) {
• struct drm_encoder *drm_encoder;
• list_for_each_entry(drm_encoder, &dev->mode_config.encoder_list, head) {
• struct radeon_encoder *radeon_encoder;
• radeon_encoder = to_radeon_encoder(drm_encoder);
• if (radeon_encoder->encoder_id == ENCODER_OBJECT_ID_INTERNAL_LVDS)
• radeon_legacy_backlight_init(radeon_encoder, connector);
• }
• }

return;

failed: diff --git a/drivers/gpu/drm/radeon/radeon_legacy_encoders.c b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c index 59f834b..ba7dcc6 100644 --- a/drivers/gpu/drm/radeon/radeon_legacy_encoders.c +++ b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c @@ -28,6 +28,10 @@  #include "radeon_drm.h"  #include "radeon.h"  #include "atom.h" +#include <linux/backlight.h> +#ifdef CONFIG_PMAC_BACKLIGHT +#include <asm/backlight.h> +#endif

static void radeon_legacy_encoder_disable(struct drm_encoder *encoder)  { @@ -39,7 +43,7 @@ static void radeon_legacy_encoder_disable(struct drm_encoder *encoder)        radeon_encoder->active_device = 0;  }

-static void radeon_legacy_lvds_dpms(struct drm_encoder *encoder, int mode) +static void radeon_legacy_lvds_update(struct drm_encoder *encoder, int mode)  {        struct drm_device *dev = encoder->dev;        struct radeon_device *rdev = dev->dev_private; @@ -47,15 +51,23 @@ static void radeon_legacy_lvds_dpms(struct drm_encoder *encoder, int mode)        uint32_t lvds_gen_cntl, lvds_pll_cntl, pixclks_cntl, disp_pwr_man;        int panel_pwr_delay = 2000;        bool is_mac = false;

• uint8_t backlight_level;

DRM_DEBUG_KMS("\n");

• lvds_gen_cntl = RREG32(RADEON_LVDS_GEN_CNTL);
• backlight_level = (lvds_gen_cntl >> RADEON_LVDS_BL_MOD_LEVEL_SHIFT) & 0xff;

if (radeon_encoder->enc_priv) {                if (rdev->is_atom_bios) {                        struct radeon_encoder_atom_dig *lvds = radeon_encoder->enc_priv;                        panel_pwr_delay = lvds->panel_pwr_delay;

• if (lvds->bl_dev)
• backlight_level = lvds->backlight_level;

} else {                        struct radeon_encoder_lvds *lvds = radeon_encoder->enc_priv;                        panel_pwr_delay = lvds->panel_pwr_delay;

• if (lvds->bl_dev)
• backlight_level = lvds->backlight_level;

}        }

@@ -82,11 +94,13 @@ static void radeon_legacy_lvds_dpms(struct drm_encoder *encoder, int mode)                lvds_pll_cntl &= ~RADEON_LVDS_PLL_RESET;                WREG32(RADEON_LVDS_PLL_CNTL, lvds_pll_cntl);

• lvds_gen_cntl = RREG32(RADEON_LVDS_GEN_CNTL);
• lvds_gen_cntl |= (RADEON_LVDS_ON | RADEON_LVDS_EN | RADEON_LVDS_DIGON | RADEON_LVDS_BLON);

• lvds_gen_cntl &= ~(RADEON_LVDS_DISPLAY_DIS |
• RADEON_LVDS_BL_MOD_LEVEL_MASK);
• lvds_gen_cntl |= (RADEON_LVDS_ON | RADEON_LVDS_EN |
• RADEON_LVDS_DIGON | RADEON_LVDS_BLON |
• (backlight_level << RADEON_LVDS_BL_MOD_LEVEL_SHIFT));

if (is_mac)                        lvds_gen_cntl |= RADEON_LVDS_BL_MOD_EN;

• lvds_gen_cntl &= ~(RADEON_LVDS_DISPLAY_DIS);

udelay(panel_pwr_delay * 1000);                WREG32(RADEON_LVDS_GEN_CNTL, lvds_gen_cntl);                break; @@ -95,7 +109,6 @@ static void radeon_legacy_lvds_dpms(struct drm_encoder *encoder, int mode)        case DRM_MODE_DPMS_OFF:                pixclks_cntl = RREG32_PLL(RADEON_PIXCLKS_CNTL);                WREG32_PLL_P(RADEON_PIXCLKS_CNTL, 0, ~RADEON_PIXCLK_LVDS_ALWAYS_ONb);

• lvds_gen_cntl = RREG32(RADEON_LVDS_GEN_CNTL);

lvds_gen_cntl |= RADEON_LVDS_DISPLAY_DIS;                if (is_mac) {                        lvds_gen_cntl &= ~RADEON_LVDS_BL_MOD_EN; @@ -119,6 +132,25 @@ static void radeon_legacy_lvds_dpms(struct drm_encoder *encoder, int mode)

}

+static void radeon_legacy_lvds_dpms(struct drm_encoder *encoder, int mode) +{

• struct radeon_device *rdev = encoder->dev->dev_private;
• struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
• DRM_DEBUG("\n");
• if (radeon_encoder->enc_priv) {
• if (rdev->is_atom_bios) {
• struct radeon_encoder_atom_dig *lvds = radeon_encoder->enc_priv;
• lvds->dpms_mode = mode;
• } else {
• struct radeon_encoder_lvds *lvds = radeon_encoder->enc_priv;
• lvds->dpms_mode = mode;
• }
• }
• radeon_legacy_lvds_update(encoder, mode);

+}

static void radeon_legacy_lvds_prepare(struct drm_encoder *encoder)  {        struct radeon_device *rdev = encoder->dev->dev_private; @@ -237,9 +269,222 @@ static const struct drm_encoder_helper_funcs radeon_legacy_lvds_helper_funcs = {        .disable = radeon_legacy_encoder_disable,  };

+#ifdef CONFIG_BACKLIGHT_CLASS_DEVICE

+#define MAX_RADEON_LEVEL 0xFF

+struct radeon_backlight_privdata {

• struct radeon_encoder *encoder;
• uint8_t negative;

+};

+static uint8_t radeon_legacy_lvds_level(struct backlight_device *bd) +{

• struct radeon_backlight_privdata *pdata = bl_get_data(bd);
• uint8_t level;
• /* Convert brightness to hardware level */
• if (bd->props.brightness < 0)
• level = 0;
• else if (bd->props.brightness > MAX_RADEON_LEVEL)
• level = MAX_RADEON_LEVEL;
• else
• level = bd->props.brightness;
• if (pdata->negative)
• level = MAX_RADEON_LEVEL - level;
• return level;

+}

+static int radeon_legacy_backlight_update_status(struct backlight_device *bd) +{

• struct radeon_backlight_privdata *pdata = bl_get_data(bd);
• struct radeon_encoder *radeon_encoder = pdata->encoder;
• struct drm_device *dev = radeon_encoder->base.dev;
• struct radeon_device *rdev = dev->dev_private;
• int dpms_mode = DRM_MODE_DPMS_ON;
• if (radeon_encoder->enc_priv) {
• if (rdev->is_atom_bios) {
• struct radeon_encoder_atom_dig *lvds = radeon_encoder->enc_priv;
• dpms_mode = lvds->dpms_mode;
• lvds->backlight_level = radeon_legacy_lvds_level(bd);
• } else {
• struct radeon_encoder_lvds *lvds = radeon_encoder->enc_priv;
• dpms_mode = lvds->dpms_mode;
• lvds->backlight_level = radeon_legacy_lvds_level(bd);
• }
• }
• if (bd->props.brightness > 0)
• radeon_legacy_lvds_update(&radeon_encoder->base, dpms_mode);
• else
• radeon_legacy_lvds_update(&radeon_encoder->base, DRM_MODE_DPMS_OFF);
• return 0;

+}

+static int radeon_legacy_backlight_get_brightness(struct backlight_device *bd) +{

• struct radeon_backlight_privdata *pdata = bl_get_data(bd);
• struct radeon_encoder *radeon_encoder = pdata->encoder;
• struct drm_device *dev = radeon_encoder->base.dev;
• struct radeon_device *rdev = dev->dev_private;
• uint8_t backlight_level;
• backlight_level = (RREG32(RADEON_LVDS_GEN_CNTL) >>
• RADEON_LVDS_BL_MOD_LEVEL_SHIFT) & 0xff;
• return pdata->negative ? MAX_RADEON_LEVEL - backlight_level : backlight_level;

+}

+static const struct backlight_ops radeon_backlight_ops = {

• .get_brightness = radeon_legacy_backlight_get_brightness,
• .update_status  = radeon_legacy_backlight_update_status,

+};

+void radeon_legacy_backlight_init(struct radeon_encoder *radeon_encoder,

• struct drm_connector *drm_connector)

+{

• struct drm_device *dev = radeon_encoder->base.dev;
• struct radeon_device *rdev = dev->dev_private;
• struct backlight_device *bd;
• struct backlight_properties props;
• struct radeon_backlight_privdata *pdata;
• uint8_t backlight_level;
• if (!radeon_encoder->enc_priv)
• return;

+#ifdef CONFIG_PMAC_BACKLIGHT

• if (!pmac_has_backlight_type("ati") &&
• !pmac_has_backlight_type("mnca"))
• return;

+#endif

• pdata = kmalloc(sizeof(struct radeon_backlight_privdata), GFP_KERNEL);
• if (!pdata) {
• DRM_ERROR("Memory allocation failed\n");
• goto error;
• }
• props.max_brightness = MAX_RADEON_LEVEL;
• props.type = BACKLIGHT_RAW;
• bd = backlight_device_register("radeon_bl", &drm_connector->kdev,
• pdata, &radeon_backlight_ops, &props);
• if (IS_ERR(bd)) {
• DRM_ERROR("Backlight registration failed\n");
• goto error;
• }
• pdata->encoder = radeon_encoder;
• backlight_level = (RREG32(RADEON_LVDS_GEN_CNTL) >>
• RADEON_LVDS_BL_MOD_LEVEL_SHIFT) & 0xff;
• /* First, try to detect backlight level sense based on the assumption
• * that firmware set it up at full brightness
• */
• if (backlight_level == 0)
• pdata->negative = true;
• else if (backlight_level == 0xff)
• pdata->negative = false;
• else {
• /* XXX hack... maybe some day we can figure out in what direction
• * backlight should work on a given panel?
• */
• pdata->negative = (rdev->family != CHIP_RV200 &&
• rdev->family != CHIP_RV250 &&
• rdev->family != CHIP_RV280 &&
• rdev->family != CHIP_RV350);

+#ifdef CONFIG_PMAC_BACKLIGHT

• pdata->negative = (pdata->negative ||
• of_machine_is_compatible("PowerBook4,3") ||
• of_machine_is_compatible("PowerBook6,3") ||
• of_machine_is_compatible("PowerBook6,5"));

+#endif

• }
• if (rdev->is_atom_bios) {
• struct radeon_encoder_atom_dig *lvds = radeon_encoder->enc_priv;
• lvds->bl_dev = bd;
• } else {
• struct radeon_encoder_lvds *lvds = radeon_encoder->enc_priv;
• lvds->bl_dev = bd;
• }
• bd->props.brightness = radeon_legacy_backlight_get_brightness(bd);
• bd->props.power = FB_BLANK_UNBLANK;
• backlight_update_status(bd);
• DRM_INFO("radeon legacy LVDS backlight initialized\n");
• return;

+error:

• kfree(pdata);
• return;

+}

+static void radeon_legacy_backlight_exit(struct radeon_encoder *radeon_encoder) +{

• struct drm_device *dev = radeon_encoder->base.dev;
• struct radeon_device *rdev = dev->dev_private;
• struct backlight_device *bd = NULL;
• if (!radeon_encoder->enc_priv)
• return;
• if (rdev->is_atom_bios) {
• struct radeon_encoder_atom_dig *lvds = radeon_encoder->enc_priv;
• bd = lvds->bl_dev;
• lvds->bl_dev = NULL;
• } else {
• struct radeon_encoder_lvds *lvds = radeon_encoder->enc_priv;
• bd = lvds->bl_dev;
• lvds->bl_dev = NULL;
• }
• if (bd) {
• struct radeon_legacy_backlight_privdata *pdata;
• pdata = bl_get_data(bd);
• backlight_device_unregister(bd);
• kfree(pdata);
• DRM_INFO("radeon legacy LVDS backlight unloaded\n");
• }

+}

+#else /* !CONFIG_BACKLIGHT_CLASS_DEVICE */

+static void radeon_legacy_backlight_init(struct radeon_encoder *encoder) +{ +}

+static void radeon_legacy_backlight_exit(struct radeon_encoder *encoder) +{ +}

+#endif

+static void radeon_lvds_enc_destroy(struct drm_encoder *encoder) +{

• struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
• if (radeon_encoder->enc_priv) {
• radeon_legacy_backlight_exit(radeon_encoder);
• kfree(radeon_encoder->enc_priv);
• }
• drm_encoder_cleanup(encoder);
• kfree(radeon_encoder);

+}

static const struct drm_encoder_funcs radeon_legacy_lvds_enc_funcs = {

• .destroy = radeon_enc_destroy,

• .destroy = radeon_lvds_enc_destroy,

};

static void radeon_legacy_primary_dac_dpms(struct drm_encoder *encoder, int mode) diff --git a/drivers/gpu/drm/radeon/radeon_mode.h b/drivers/gpu/drm/radeon/radeon_mode.h index 12bdeab..32c6257 100644 --- a/drivers/gpu/drm/radeon/radeon_mode.h +++ b/drivers/gpu/drm/radeon/radeon_mode.h @@ -300,6 +300,11 @@ struct radeon_encoder_lvds {        uint32_t lvds_gen_cntl;        /* panel mode */        struct drm_display_mode native_mode; +#ifdef CONFIG_BACKLIGHT_CLASS_DEVICE

• struct backlight_device *bl_dev;
• int      dpms_mode;
• uint8_t  backlight_level;

+#endif  };

struct radeon_encoder_tv_dac { @@ -353,6 +358,11 @@ struct radeon_encoder_atom_dig {        uint32_t lcd_ss_id;        /* panel mode */        struct drm_display_mode native_mode; +#ifdef CONFIG_BACKLIGHT_CLASS_DEVICE

• struct backlight_device *bl_dev;
• int dpms_mode;
• uint8_t backlight_level;

+#endif  };

struct radeon_encoder_atom_dac {

1.7.3.4

---

dri-devel mailing list dri-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/dri-devel

From: Michel Dänzer daenzer@vmware.com

Allows e.g. power management daemons to control the backlight level. Inspired by the corresponding code in radeonfb.

v2: Fix problems when CONFIG_BACKLIGHT_CLASS_DEVICE isn't defined.

(Updated to add backlight type and make the connector the parent device - mjg)

Signed-off-by: Michel Dänzer daenzer@vmware.com Signed-off-by: Matthew Garrett mjg@redhat.com --- drivers/gpu/drm/radeon/Kconfig | 1 + drivers/gpu/drm/radeon/radeon_connectors.c | 15 ++ drivers/gpu/drm/radeon/radeon_legacy_encoders.c | 257 ++++++++++++++++++++++- drivers/gpu/drm/radeon/radeon_mode.h | 6 + 4 files changed, 273 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/radeon/Kconfig b/drivers/gpu/drm/radeon/Kconfig index 1c02d23..9746fee 100644 --- a/drivers/gpu/drm/radeon/Kconfig +++ b/drivers/gpu/drm/radeon/Kconfig @@ -1,6 +1,7 @@ config DRM_RADEON_KMS bool "Enable modesetting on radeon by default - NEW DRIVER" depends on DRM_RADEON + select BACKLIGHT_CLASS_DEVICE help Choose this option if you want kernel modesetting enabled by default.

diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c index 5b00f92..c474d78 100644 --- a/drivers/gpu/drm/radeon/radeon_connectors.c +++ b/drivers/gpu/drm/radeon/radeon_connectors.c @@ -40,6 +40,10 @@ radeon_atombios_connected_scratch_regs(struct drm_connector *connector, struct drm_encoder *encoder, bool connected);

+extern void +radeon_legacy_backlight_init(struct radeon_encoder *radeon_encoder, + struct drm_connector *drm_connector); + void radeon_connector_hotplug(struct drm_connector *connector) { struct drm_device *dev = connector->dev; @@ -1517,6 +1521,17 @@ radeon_add_legacy_connector(struct drm_device *dev, connector->polled = DRM_CONNECTOR_POLL_HPD; connector->display_info.subpixel_order = subpixel_order; drm_sysfs_connector_add(connector); + if (connector_type == DRM_MODE_CONNECTOR_LVDS) { + struct drm_encoder *drm_encoder; + + list_for_each_entry(drm_encoder, &dev->mode_config.encoder_list, head) { + struct radeon_encoder *radeon_encoder; + + radeon_encoder = to_radeon_encoder(drm_encoder); + if (radeon_encoder->encoder_id == ENCODER_OBJECT_ID_INTERNAL_LVDS) + radeon_legacy_backlight_init(radeon_encoder, connector); + } + } return;

failed: diff --git a/drivers/gpu/drm/radeon/radeon_legacy_encoders.c b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c index 59f834b..5b54268 100644 --- a/drivers/gpu/drm/radeon/radeon_legacy_encoders.c +++ b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c @@ -28,6 +28,10 @@ #include "radeon_drm.h" #include "radeon.h" #include "atom.h" +#include <linux/backlight.h> +#ifdef CONFIG_PMAC_BACKLIGHT +#include <asm/backlight.h> +#endif

static void radeon_legacy_encoder_disable(struct drm_encoder *encoder) { @@ -39,7 +43,7 @@ static void radeon_legacy_encoder_disable(struct drm_encoder *encoder) radeon_encoder->active_device = 0; }

-static void radeon_legacy_lvds_dpms(struct drm_encoder *encoder, int mode) +static void radeon_legacy_lvds_update(struct drm_encoder *encoder, int mode) { struct drm_device *dev = encoder->dev; struct radeon_device *rdev = dev->dev_private; @@ -47,15 +51,23 @@ static void radeon_legacy_lvds_dpms(struct drm_encoder *encoder, int mode) uint32_t lvds_gen_cntl, lvds_pll_cntl, pixclks_cntl, disp_pwr_man; int panel_pwr_delay = 2000; bool is_mac = false; + uint8_t backlight_level; DRM_DEBUG_KMS("\n");

+ lvds_gen_cntl = RREG32(RADEON_LVDS_GEN_CNTL); + backlight_level = (lvds_gen_cntl >> RADEON_LVDS_BL_MOD_LEVEL_SHIFT) & 0xff; + if (radeon_encoder->enc_priv) { if (rdev->is_atom_bios) { struct radeon_encoder_atom_dig *lvds = radeon_encoder->enc_priv; panel_pwr_delay = lvds->panel_pwr_delay; + if (lvds->bl_dev) + backlight_level = lvds->backlight_level; } else { struct radeon_encoder_lvds *lvds = radeon_encoder->enc_priv; panel_pwr_delay = lvds->panel_pwr_delay; + if (lvds->bl_dev) + backlight_level = lvds->backlight_level; } }

@@ -82,11 +94,13 @@ static void radeon_legacy_lvds_dpms(struct drm_encoder *encoder, int mode) lvds_pll_cntl &= ~RADEON_LVDS_PLL_RESET; WREG32(RADEON_LVDS_PLL_CNTL, lvds_pll_cntl);

- lvds_gen_cntl = RREG32(RADEON_LVDS_GEN_CNTL); - lvds_gen_cntl |= (RADEON_LVDS_ON | RADEON_LVDS_EN | RADEON_LVDS_DIGON | RADEON_LVDS_BLON); + lvds_gen_cntl &= ~(RADEON_LVDS_DISPLAY_DIS | + RADEON_LVDS_BL_MOD_LEVEL_MASK); + lvds_gen_cntl |= (RADEON_LVDS_ON | RADEON_LVDS_EN | + RADEON_LVDS_DIGON | RADEON_LVDS_BLON | + (backlight_level << RADEON_LVDS_BL_MOD_LEVEL_SHIFT)); if (is_mac) lvds_gen_cntl |= RADEON_LVDS_BL_MOD_EN; - lvds_gen_cntl &= ~(RADEON_LVDS_DISPLAY_DIS); udelay(panel_pwr_delay * 1000); WREG32(RADEON_LVDS_GEN_CNTL, lvds_gen_cntl); break; @@ -95,7 +109,6 @@ static void radeon_legacy_lvds_dpms(struct drm_encoder *encoder, int mode) case DRM_MODE_DPMS_OFF: pixclks_cntl = RREG32_PLL(RADEON_PIXCLKS_CNTL); WREG32_PLL_P(RADEON_PIXCLKS_CNTL, 0, ~RADEON_PIXCLK_LVDS_ALWAYS_ONb); - lvds_gen_cntl = RREG32(RADEON_LVDS_GEN_CNTL); lvds_gen_cntl |= RADEON_LVDS_DISPLAY_DIS; if (is_mac) { lvds_gen_cntl &= ~RADEON_LVDS_BL_MOD_EN; @@ -119,6 +132,25 @@ static void radeon_legacy_lvds_dpms(struct drm_encoder *encoder, int mode)

}

+static void radeon_legacy_lvds_dpms(struct drm_encoder *encoder, int mode) +{ + struct radeon_device *rdev = encoder->dev->dev_private; + struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder); + DRM_DEBUG("\n"); + + if (radeon_encoder->enc_priv) { + if (rdev->is_atom_bios) { + struct radeon_encoder_atom_dig *lvds = radeon_encoder->enc_priv; + lvds->dpms_mode = mode; + } else { + struct radeon_encoder_lvds *lvds = radeon_encoder->enc_priv; + lvds->dpms_mode = mode; + } + } + + radeon_legacy_lvds_update(encoder, mode); +} + static void radeon_legacy_lvds_prepare(struct drm_encoder *encoder) { struct radeon_device *rdev = encoder->dev->dev_private; @@ -237,9 +269,222 @@ static const struct drm_encoder_helper_funcs radeon_legacy_lvds_helper_funcs = { .disable = radeon_legacy_encoder_disable, };

+#ifdef CONFIG_BACKLIGHT_CLASS_DEVICE + +#define MAX_RADEON_LEVEL 0xFF + +struct radeon_backlight_privdata { + struct radeon_encoder *encoder; + uint8_t negative; +}; + +static uint8_t radeon_legacy_lvds_level(struct backlight_device *bd) +{ + struct radeon_backlight_privdata *pdata = bl_get_data(bd); + uint8_t level; + + /* Convert brightness to hardware level */ + if (bd->props.brightness < 0) + level = 0; + else if (bd->props.brightness > MAX_RADEON_LEVEL) + level = MAX_RADEON_LEVEL; + else + level = bd->props.brightness; + + if (pdata->negative) + level = MAX_RADEON_LEVEL - level; + + return level; +} + +static int radeon_legacy_backlight_update_status(struct backlight_device *bd) +{ + struct radeon_backlight_privdata *pdata = bl_get_data(bd); + struct radeon_encoder *radeon_encoder = pdata->encoder; + struct drm_device *dev = radeon_encoder->base.dev; + struct radeon_device *rdev = dev->dev_private; + int dpms_mode = DRM_MODE_DPMS_ON; + + if (radeon_encoder->enc_priv) { + if (rdev->is_atom_bios) { + struct radeon_encoder_atom_dig *lvds = radeon_encoder->enc_priv; + dpms_mode = lvds->dpms_mode; + lvds->backlight_level = radeon_legacy_lvds_level(bd); + } else { + struct radeon_encoder_lvds *lvds = radeon_encoder->enc_priv; + dpms_mode = lvds->dpms_mode; + lvds->backlight_level = radeon_legacy_lvds_level(bd); + } + } + + if (bd->props.brightness > 0) + radeon_legacy_lvds_update(&radeon_encoder->base, dpms_mode); + else + radeon_legacy_lvds_update(&radeon_encoder->base, DRM_MODE_DPMS_OFF); + + return 0; +} + +static int radeon_legacy_backlight_get_brightness(struct backlight_device *bd) +{ + struct radeon_backlight_privdata *pdata = bl_get_data(bd); + struct radeon_encoder *radeon_encoder = pdata->encoder; + struct drm_device *dev = radeon_encoder->base.dev; + struct radeon_device *rdev = dev->dev_private; + uint8_t backlight_level; + + backlight_level = (RREG32(RADEON_LVDS_GEN_CNTL) >> + RADEON_LVDS_BL_MOD_LEVEL_SHIFT) & 0xff; + + return pdata->negative ? MAX_RADEON_LEVEL - backlight_level : backlight_level; +} + +static const struct backlight_ops radeon_backlight_ops = { + .get_brightness = radeon_legacy_backlight_get_brightness, + .update_status = radeon_legacy_backlight_update_status, +}; + +void radeon_legacy_backlight_init(struct radeon_encoder *radeon_encoder, + struct drm_connector *drm_connector) +{ + struct drm_device *dev = radeon_encoder->base.dev; + struct radeon_device *rdev = dev->dev_private; + struct backlight_device *bd; + struct backlight_properties props; + struct radeon_backlight_privdata *pdata; + uint8_t backlight_level; + + if (!radeon_encoder->enc_priv) + return; + +#ifdef CONFIG_PMAC_BACKLIGHT + if (!pmac_has_backlight_type("ati") && + !pmac_has_backlight_type("mnca")) + return; +#endif + + pdata = kmalloc(sizeof(struct radeon_backlight_privdata), GFP_KERNEL); + if (!pdata) { + DRM_ERROR("Memory allocation failed\n"); + goto error; + } + + props.max_brightness = MAX_RADEON_LEVEL; + props.type = BACKLIGHT_RAW; + bd = backlight_device_register("radeon_bl", &drm_connector->kdev, + pdata, &radeon_backlight_ops, &props); + if (IS_ERR(bd)) { + DRM_ERROR("Backlight registration failed\n"); + goto error; + } + + pdata->encoder = radeon_encoder; + + backlight_level = (RREG32(RADEON_LVDS_GEN_CNTL) >> + RADEON_LVDS_BL_MOD_LEVEL_SHIFT) & 0xff; + + /* First, try to detect backlight level sense based on the assumption + * that firmware set it up at full brightness + */ + if (backlight_level == 0) + pdata->negative = true; + else if (backlight_level == 0xff) + pdata->negative = false; + else { + /* XXX hack... maybe some day we can figure out in what direction + * backlight should work on a given panel? + */ + pdata->negative = (rdev->family != CHIP_RV200 && + rdev->family != CHIP_RV250 && + rdev->family != CHIP_RV280 && + rdev->family != CHIP_RV350); + +#ifdef CONFIG_PMAC_BACKLIGHT + pdata->negative = (pdata->negative || + of_machine_is_compatible("PowerBook4,3") || + of_machine_is_compatible("PowerBook6,3") || + of_machine_is_compatible("PowerBook6,5")); +#endif + } + + if (rdev->is_atom_bios) { + struct radeon_encoder_atom_dig *lvds = radeon_encoder->enc_priv; + lvds->bl_dev = bd; + } else { + struct radeon_encoder_lvds *lvds = radeon_encoder->enc_priv; + lvds->bl_dev = bd; + } + + bd->props.brightness = radeon_legacy_backlight_get_brightness(bd); + bd->props.power = FB_BLANK_UNBLANK; + backlight_update_status(bd); + + DRM_INFO("radeon legacy LVDS backlight initialized\n"); + + return; + +error: + kfree(pdata); + return; +} + +static void radeon_legacy_backlight_exit(struct radeon_encoder *radeon_encoder) +{ + struct drm_device *dev = radeon_encoder->base.dev; + struct radeon_device *rdev = dev->dev_private; + struct backlight_device *bd = NULL; + + if (!radeon_encoder->enc_priv) + return; + + if (rdev->is_atom_bios) { + struct radeon_encoder_atom_dig *lvds = radeon_encoder->enc_priv; + bd = lvds->bl_dev; + lvds->bl_dev = NULL; + } else { + struct radeon_encoder_lvds *lvds = radeon_encoder->enc_priv; + bd = lvds->bl_dev; + lvds->bl_dev = NULL; + } + + if (bd) { + struct radeon_legacy_backlight_privdata *pdata; + + pdata = bl_get_data(bd); + backlight_device_unregister(bd); + kfree(pdata); + + DRM_INFO("radeon legacy LVDS backlight unloaded\n"); + } +} + +#else /* !CONFIG_BACKLIGHT_CLASS_DEVICE */ + +void radeon_legacy_backlight_init(struct radeon_encoder *encoder) +{ +} + +static void radeon_legacy_backlight_exit(struct radeon_encoder *encoder) +{ +} + +#endif + + +static void radeon_lvds_enc_destroy(struct drm_encoder *encoder) +{ + struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder); + + if (radeon_encoder->enc_priv) { + radeon_legacy_backlight_exit(radeon_encoder); + kfree(radeon_encoder->enc_priv); + } + drm_encoder_cleanup(encoder); + kfree(radeon_encoder); +}

static const struct drm_encoder_funcs radeon_legacy_lvds_enc_funcs = { - .destroy = radeon_enc_destroy, + .destroy = radeon_lvds_enc_destroy, };

static void radeon_legacy_primary_dac_dpms(struct drm_encoder *encoder, int mode) diff --git a/drivers/gpu/drm/radeon/radeon_mode.h b/drivers/gpu/drm/radeon/radeon_mode.h index fd185f7..0aa6007 100644 --- a/drivers/gpu/drm/radeon/radeon_mode.h +++ b/drivers/gpu/drm/radeon/radeon_mode.h @@ -300,6 +300,9 @@ struct radeon_encoder_lvds { uint32_t lvds_gen_cntl; /* panel mode */ struct drm_display_mode native_mode; + struct backlight_device *bl_dev; + int dpms_mode; + uint8_t backlight_level; };

struct radeon_encoder_tv_dac { @@ -353,6 +356,9 @@ struct radeon_encoder_atom_dig { uint32_t lcd_ss_id; /* panel mode */ struct drm_display_mode native_mode; + struct backlight_device *bl_dev; + int dpms_mode; + uint8_t backlight_level; };

struct radeon_encoder_atom_dac {

On Fri, Jan 14, 2011 at 9:24 PM, Matthew Garrett mjg@redhat.com wrote:

We may eventually end up with per-connector backlights, especially with ddcci devices. Make sure that the parent node for the backlight device is the connector rather than the PCI device.

Signed-off-by: Matthew Garrett mjg@redhat.com

drivers/gpu/drm/nouveau/nouveau_backlight.c |   24 ++++++++++++++----------  drivers/gpu/drm/nouveau/nouveau_connector.c |    9 +++++++++  drivers/gpu/drm/nouveau/nouveau_drv.h       |    8 ++++----  drivers/gpu/drm/nouveau/nouveau_state.c     |    6 ------  4 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/drivers/gpu/drm/nouveau/nouveau_backlight.c b/drivers/gpu/drm/nouveau/nouveau_backlight.c index 18d7bcc..00a55df 100644 --- a/drivers/gpu/drm/nouveau/nouveau_backlight.c +++ b/drivers/gpu/drm/nouveau/nouveau_backlight.c @@ -88,10 +88,11 @@ static const struct backlight_ops nv50_bl_ops = {        .update_status = nv50_set_intensity,  };

-static int nouveau_nv40_backlight_init(struct drm_device *dev) +static int nouveau_nv40_backlight_init(struct drm_connector *connector)  {

• struct backlight_properties props;

• struct drm_device *dev = connector->dev;

struct drm_nouveau_private *dev_priv = dev->dev_private;

• struct backlight_properties props;

struct backlight_device *bd;

if (!(nv_rd32(dev, NV40_PMC_BACKLIGHT) & NV40_PMC_BACKLIGHT_MASK)) @@ -100,7 +101,7 @@ static int nouveau_nv40_backlight_init(struct drm_device *dev)        memset(&props, 0, sizeof(struct backlight_properties));        props.type = BACKLIGHT_RAW;        props.max_brightness = 31;

• bd = backlight_device_register("nv_backlight", &dev->pdev->dev, dev,

• bd = backlight_device_register("nv_backlight", &connector->kdev, dev,

&nv40_bl_ops, &props);        if (IS_ERR(bd))                return PTR_ERR(bd); @@ -112,10 +113,11 @@ static int nouveau_nv40_backlight_init(struct drm_device *dev)        return 0;  }

-static int nouveau_nv50_backlight_init(struct drm_device *dev) +static int nouveau_nv50_backlight_init(struct drm_connector *connector)  {

• struct backlight_properties props;

• struct drm_device *dev = connector->dev;

struct drm_nouveau_private *dev_priv = dev->dev_private;

• struct backlight_properties props;

struct backlight_device *bd;

if (!nv_rd32(dev, NV50_PDISPLAY_SOR_BACKLIGHT)) @@ -124,7 +126,7 @@ static int nouveau_nv50_backlight_init(struct drm_device *dev)        memset(&props, 0, sizeof(struct backlight_properties));        props.type = BACKLIGHT_RAW;        props.max_brightness = 1025;

• bd = backlight_device_register("nv_backlight", &dev->pdev->dev, dev,

• bd = backlight_device_register("nv_backlight", &connector->kdev, dev,

&nv50_bl_ops, &props);        if (IS_ERR(bd))                return PTR_ERR(bd); @@ -135,8 +137,9 @@ static int nouveau_nv50_backlight_init(struct drm_device *dev)        return 0;  }

-int nouveau_backlight_init(struct drm_device *dev) +int nouveau_backlight_init(struct drm_connector *connector)  {

• struct drm_device *dev = connector->dev;

struct drm_nouveau_private *dev_priv = dev->dev_private;

#ifdef CONFIG_ACPI @@ -149,9 +152,9 @@ int nouveau_backlight_init(struct drm_device *dev)

switch (dev_priv->card_type) {        case NV_40:

• return nouveau_nv40_backlight_init(dev);

• return nouveau_nv40_backlight_init(connector);

case NV_50:

• return nouveau_nv50_backlight_init(dev);

• return nouveau_nv50_backlight_init(connector);

default:                break;        } @@ -159,8 +162,9 @@ int nouveau_backlight_init(struct drm_device *dev)        return 0;  }

-void nouveau_backlight_exit(struct drm_device *dev) +void nouveau_backlight_exit(struct drm_connector *connector)  {

• struct drm_device *dev = connector->dev;

struct drm_nouveau_private *dev_priv = dev->dev_private;

if (dev_priv->backlight) { diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c index a21e000..3a1ecc7 100644 --- a/drivers/gpu/drm/nouveau/nouveau_connector.c +++ b/drivers/gpu/drm/nouveau/nouveau_connector.c @@ -116,6 +116,10 @@ nouveau_connector_destroy(struct drm_connector *connector)                                      nouveau_connector_hotplug, connector);        }

• if (connector->connector_type == DRM_MODE_CONNECTOR_LVDS ||
• connector->connector_type == DRM_MODE_CONNECTOR_eDP)
• nouveau_backlight_exit(connector);

kfree(nv_connector->edid);        drm_sysfs_connector_remove(connector);        drm_connector_cleanup(connector); @@ -893,6 +897,11 @@ nouveau_connector_create(struct drm_device *dev, int index)        }

drm_sysfs_connector_add(connector);

• if (connector->connector_type == DRM_MODE_CONNECTOR_LVDS ||
• connector->connector_type == DRM_MODE_CONNECTOR_eDP)
• nouveau_backlight_init(connector);

dcb->drm = connector;        return dcb->drm;

diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h index 46e3257..1918ed1 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drv.h +++ b/drivers/gpu/drm/nouveau/nouveau_drv.h @@ -999,15 +999,15 @@ static inline int nouveau_acpi_edid(struct drm_device *dev, struct drm_connector

/* nouveau_backlight.c */  #ifdef CONFIG_DRM_NOUVEAU_BACKLIGHT -extern int nouveau_backlight_init(struct drm_device *); -extern void nouveau_backlight_exit(struct drm_device *); +extern int nouveau_backlight_init(struct drm_connector *); +extern void nouveau_backlight_exit(struct drm_connector *);  #else -static inline int nouveau_backlight_init(struct drm_device *dev) +static inline int nouveau_backlight_init(struct drm_connector *dev)  {        return 0;  }

-static inline void nouveau_backlight_exit(struct drm_device *dev) { } +static inline void nouveau_backlight_exit(struct drm_connector *dev) { }  #endif

/* nouveau_bios.c */ diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c index a54fc43..f688f04 100644 --- a/drivers/gpu/drm/nouveau/nouveau_state.c +++ b/drivers/gpu/drm/nouveau/nouveau_state.c @@ -738,10 +738,6 @@ nouveau_card_init(struct drm_device *dev)                        goto out_fence;        }

• ret = nouveau_backlight_init(dev);
• if (ret)
• NV_ERROR(dev, "Error %d registering backlight\n", ret);

nouveau_fbcon_init(dev);        drm_kms_helper_poll_init(dev);        return 0; @@ -793,8 +789,6 @@ static void nouveau_card_takedown(struct drm_device *dev)        struct drm_nouveau_private *dev_priv = dev->dev_private;        struct nouveau_engine *engine = &dev_priv->engine;

• nouveau_backlight_exit(dev);

if (!engine->graph.accel_blocked) {                nouveau_fence_fini(dev);                nouveau_channel_put_unlocked(&dev_priv->channel); -- 1.7.3.4

-- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at  http://vger.kernel.org/majordomo-info.html Please read the FAQ at  http://www.tux.org/lkml/

Hi Matthew Garrett, I have problems with nouveau. Do you know ?

On Fri, 2011-01-14 at 14:24 -0500, Matthew Garrett wrote:

We may eventually end up with per-connector backlights, especially with ddcci devices. Make sure that the parent node for the backlight device is the connector rather than the PCI device.

Signed-off-by: Matthew Garrett mjg@redhat.com

Acked-by: Ben Skeggs bskeggs@redhat.com

---

drivers/gpu/drm/nouveau/nouveau_backlight.c | 24 ++++++++++++++---------- drivers/gpu/drm/nouveau/nouveau_connector.c | 9 +++++++++ drivers/gpu/drm/nouveau/nouveau_drv.h | 8 ++++---- drivers/gpu/drm/nouveau/nouveau_state.c | 6 ------ 4 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/drivers/gpu/drm/nouveau/nouveau_backlight.c b/drivers/gpu/drm/nouveau/nouveau_backlight.c index 18d7bcc..00a55df 100644 --- a/drivers/gpu/drm/nouveau/nouveau_backlight.c +++ b/drivers/gpu/drm/nouveau/nouveau_backlight.c @@ -88,10 +88,11 @@ static const struct backlight_ops nv50_bl_ops = { .update_status = nv50_set_intensity, };

-static int nouveau_nv40_backlight_init(struct drm_device *dev) +static int nouveau_nv40_backlight_init(struct drm_connector *connector) {

• struct backlight_properties props;

• struct drm_device *dev = connector->dev; struct drm_nouveau_private *dev_priv = dev->dev_private;

• struct backlight_properties props; struct backlight_device *bd;

  if (!(nv_rd32(dev, NV40_PMC_BACKLIGHT) & NV40_PMC_BACKLIGHT_MASK))

@@ -100,7 +101,7 @@ static int nouveau_nv40_backlight_init(struct drm_device *dev) memset(&props, 0, sizeof(struct backlight_properties)); props.type = BACKLIGHT_RAW; props.max_brightness = 31;

• bd = backlight_device_register("nv_backlight", &dev->pdev->dev, dev,

• bd = backlight_device_register("nv_backlight", &connector->kdev, dev, &nv40_bl_ops, &props); if (IS_ERR(bd)) return PTR_ERR(bd);

@@ -112,10 +113,11 @@ static int nouveau_nv40_backlight_init(struct drm_device *dev) return 0; }

-static int nouveau_nv50_backlight_init(struct drm_device *dev) +static int nouveau_nv50_backlight_init(struct drm_connector *connector) {

• struct backlight_properties props;

• struct drm_device *dev = connector->dev; struct drm_nouveau_private *dev_priv = dev->dev_private;

• struct backlight_properties props; struct backlight_device *bd;

  if (!nv_rd32(dev, NV50_PDISPLAY_SOR_BACKLIGHT))

@@ -124,7 +126,7 @@ static int nouveau_nv50_backlight_init(struct drm_device *dev) memset(&props, 0, sizeof(struct backlight_properties)); props.type = BACKLIGHT_RAW; props.max_brightness = 1025;

• bd = backlight_device_register("nv_backlight", &dev->pdev->dev, dev,

• bd = backlight_device_register("nv_backlight", &connector->kdev, dev, &nv50_bl_ops, &props); if (IS_ERR(bd)) return PTR_ERR(bd);

@@ -135,8 +137,9 @@ static int nouveau_nv50_backlight_init(struct drm_device *dev) return 0; }

-int nouveau_backlight_init(struct drm_device *dev) +int nouveau_backlight_init(struct drm_connector *connector) {

• struct drm_device *dev = connector->dev; struct drm_nouveau_private *dev_priv = dev->dev_private;

#ifdef CONFIG_ACPI @@ -149,9 +152,9 @@ int nouveau_backlight_init(struct drm_device *dev)

switch (dev_priv->card_type) { case NV_40:

• return nouveau_nv40_backlight_init(dev);
  

• return nouveau_nv40_backlight_init(connector);
  

  case NV_50:

• return nouveau_nv50_backlight_init(dev);
  

• return nouveau_nv50_backlight_init(connector);
  

  default: break; }

@@ -159,8 +162,9 @@ int nouveau_backlight_init(struct drm_device *dev) return 0; }

-void nouveau_backlight_exit(struct drm_device *dev) +void nouveau_backlight_exit(struct drm_connector *connector) {

• struct drm_device *dev = connector->dev; struct drm_nouveau_private *dev_priv = dev->dev_private;

  if (dev_priv->backlight) {

diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c index a21e000..3a1ecc7 100644 --- a/drivers/gpu/drm/nouveau/nouveau_connector.c +++ b/drivers/gpu/drm/nouveau/nouveau_connector.c @@ -116,6 +116,10 @@ nouveau_connector_destroy(struct drm_connector *connector) nouveau_connector_hotplug, connector); }

• if (connector->connector_type == DRM_MODE_CONNECTOR_LVDS ||

•    connector->connector_type == DRM_MODE_CONNECTOR_eDP)
  

• nouveau_backlight_exit(connector);
  

• kfree(nv_connector->edid); drm_sysfs_connector_remove(connector); drm_connector_cleanup(connector);

@@ -893,6 +897,11 @@ nouveau_connector_create(struct drm_device *dev, int index) }

drm_sysfs_connector_add(connector);

• if (connector->connector_type == DRM_MODE_CONNECTOR_LVDS ||

•    connector->connector_type == DRM_MODE_CONNECTOR_eDP)
  

• nouveau_backlight_init(connector);
  

• dcb->drm = connector; return dcb->drm;

diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h index 46e3257..1918ed1 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drv.h +++ b/drivers/gpu/drm/nouveau/nouveau_drv.h @@ -999,15 +999,15 @@ static inline int nouveau_acpi_edid(struct drm_device *dev, struct drm_connector

/* nouveau_backlight.c */ #ifdef CONFIG_DRM_NOUVEAU_BACKLIGHT -extern int nouveau_backlight_init(struct drm_device *); -extern void nouveau_backlight_exit(struct drm_device *); +extern int nouveau_backlight_init(struct drm_connector *); +extern void nouveau_backlight_exit(struct drm_connector *); #else -static inline int nouveau_backlight_init(struct drm_device *dev) +static inline int nouveau_backlight_init(struct drm_connector *dev) { return 0; }

-static inline void nouveau_backlight_exit(struct drm_device *dev) { } +static inline void nouveau_backlight_exit(struct drm_connector *dev) { } #endif

/* nouveau_bios.c */ diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c index a54fc43..f688f04 100644 --- a/drivers/gpu/drm/nouveau/nouveau_state.c +++ b/drivers/gpu/drm/nouveau/nouveau_state.c @@ -738,10 +738,6 @@ nouveau_card_init(struct drm_device *dev) goto out_fence; }

• ret = nouveau_backlight_init(dev);
• if (ret)

• NV_ERROR(dev, "Error %d registering backlight\n", ret);
  

• nouveau_fbcon_init(dev); drm_kms_helper_poll_init(dev); return 0;

@@ -793,8 +789,6 @@ static void nouveau_card_takedown(struct drm_device *dev) struct drm_nouveau_private *dev_priv = dev->dev_private; struct nouveau_engine *engine = &dev_priv->engine;

• nouveau_backlight_exit(dev);
• if (!engine->graph.accel_blocked) { nouveau_fence_fini(dev); nouveau_channel_put_unlocked(&dev_priv->channel);

On Friday, January 14, 2011, Matthew Garrett wrote:

Dual-GPU machines may provide more than one ACPI backlight interface. Tie the backlight device to the GPU in order to allow userspace to identify the correct interface.

Signed-off-by: Matthew Garrett mjg@redhat.com

Sorry for the late response, but I've just realized there's a problem with this patch.

---

drivers/acpi/video.c | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c index a9eec8c..a18e497 100644 --- a/drivers/acpi/video.c +++ b/drivers/acpi/video.c @@ -782,6 +782,9 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device)

if (acpi_video_backlight_support()) { struct backlight_properties props;

• struct pci_dev *pdev;
  

• acpi_handle acpi_parent;
  

• struct device *parent = NULL;
  

  int result; static int count = 0; char *name;

@@ -794,10 +797,20 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device) return; count++;

• acpi_get_parent(device->dev->handle, &acpi_parent);
  

• pdev = acpi_get_pci_dev(acpi_parent);
  

• if (pdev) {
  

• 	parent = &pdev->dev;
  

• 	pci_dev_put(pdev);
  

• }
  

I'm afraid you can't do that or suspend problems will happen.

Namely, the PM core assumes that parents will be registered before their children and it is a very strong assumption. If violated, it may lead to a suspend sequence deadlock.

Unfortunately, it looks like the ACPI video device is registered before the PCI device that's becoming it's parent, so the above assumption will be violated.

Thanks, Rafael