Backlight: Add backlight type
Subsystems (29)
PATCH 1/1 Backlight: Add backlight type
There may be multiple ways of controlling the backlight on a given machine. Allow drivers to expose the type of interface they are providing, making it possible for userspace to make appropriate policy decisions.
--- Documentation/ABI/stable/sysfs-class-backlight | 20 ++++++++++++++++++++ drivers/acpi/video.c | 1 + drivers/gpu/drm/nouveau/nouveau_backlight.c | 2 ++ drivers/hid/hid-picolcd.c | 1 + drivers/macintosh/via-pmu-backlight.c | 1 + drivers/platform/x86/acer-wmi.c | 1 + drivers/platform/x86/asus-laptop.c | 1 + drivers/platform/x86/asus_acpi.c | 1 + drivers/platform/x86/classmate-laptop.c | 1 + drivers/platform/x86/compal-laptop.c | 1 + drivers/platform/x86/dell-laptop.c | 1 + drivers/platform/x86/eeepc-laptop.c | 1 + drivers/platform/x86/fujitsu-laptop.c | 1 + drivers/platform/x86/msi-laptop.c | 1 + drivers/platform/x86/msi-wmi.c | 1 + drivers/platform/x86/panasonic-laptop.c | 1 + drivers/platform/x86/sony-laptop.c | 1 + drivers/platform/x86/thinkpad_acpi.c | 1 + drivers/platform/x86/toshiba_acpi.c | 1 + drivers/staging/samsung-laptop/samsung-laptop.c | 1 + drivers/usb/misc/appledisplay.c | 1 + drivers/video/atmel_lcdfb.c | 1 + drivers/video/aty/aty128fb.c | 1 + drivers/video/aty/atyfb_base.c | 1 + drivers/video/aty/radeon_backlight.c | 1 + drivers/video/backlight/88pm860x_bl.c | 1 + drivers/video/backlight/adp5520_bl.c | 1 + drivers/video/backlight/adp8860_bl.c | 1 + drivers/video/backlight/adx_bl.c | 1 + drivers/video/backlight/atmel-pwm-bl.c | 1 + drivers/video/backlight/backlight.c | 15 +++++++++++++++ drivers/video/backlight/corgi_lcd.c | 1 + drivers/video/backlight/cr_bllcd.c | 1 + drivers/video/backlight/da903x_bl.c | 1 + drivers/video/backlight/ep93xx_bl.c | 1 + drivers/video/backlight/generic_bl.c | 1 + drivers/video/backlight/hp680_bl.c | 1 + drivers/video/backlight/jornada720_bl.c | 1 + drivers/video/backlight/kb3886_bl.c | 1 + drivers/video/backlight/locomolcd.c | 1 + drivers/video/backlight/max8925_bl.c | 1 + drivers/video/backlight/mbp_nvidia_bl.c | 1 + drivers/video/backlight/omap1_bl.c | 1 + drivers/video/backlight/pcf50633-backlight.c | 1 + drivers/video/backlight/progear_bl.c | 1 + drivers/video/backlight/pwm_bl.c | 1 + drivers/video/backlight/tosa_bl.c | 1 + drivers/video/backlight/wm831x_bl.c | 1 + drivers/video/bf54x-lq043fb.c | 1 + drivers/video/bfin-t350mcqb-fb.c | 1 + drivers/video/nvidia/nv_backlight.c | 1 + drivers/video/omap2/displays/panel-acx565akm.c | 1 + drivers/video/omap2/displays/panel-taal.c | 2 ++ drivers/video/riva/fbdev.c | 1 + include/linux/backlight.h | 8 ++++++++ 55 files changed, 97 insertions(+), 0 deletions(-)
Documentation/ABI/stable/sysfs-class-backlight +20 -0
@@ -34,3 +34,23 @@ Contact: Richard Purdie <[email protected]> Description: Maximum brightness for <backlight>. Users: HAL + +What: /sys/class/backlight/<backlight>/type +Date: September 2010 +KernelVersion: 2.6.37 +Contact: Matthew Garrett <[email protected]> +Description: + The type of interface controlled by <backlight>. + "firmware": The driver uses a standard firmware interface + "platform": The driver uses a platform-specific interface + "raw": The driver controls hardware registers directly + + In the general case, when multiple backlight + interfaces are available for a single device, firmware + control should be preferred to platform control should + be preferred to raw control. Using a firmware + interface reduces the probability of confusion with + the hardware and the OS independently updating the + backlight state. Platform interfaces are mostly a + holdover from pre-standardisation of firmware + interfaces.
drivers/acpi/video.c +1 -0
@@ -963,6 +963,7 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device) count++;memset (&props,0 ,sizeof (struct backlight_properties )); + props.type =BACKLIGHT_FIRMWARE ; props.max_brightness = device->brightness->count -3 ; device->backlight = backlight_device_register(name, NULL, device, &acpi_backlight_ops,
drivers/gpu/drm/nouveau/nouveau_backlight.c +2 -0
@@ -97,6 +97,7 @@ static int nouveau_nv40_backlight_init(struct drm_device *dev)return 0 ;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, &nv40_bl_ops, &props);
@@ -120,6 +121,7 @@ static int nouveau_nv50_backlight_init(struct drm_device *dev)return 0 ;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, &nv50_bl_ops, &props);
drivers/hid/hid-picolcd.c +1 -0
@@ -944,6 +944,7 @@ static int picolcd_init_backlight(struct picolcd_data *data, struct hid_report * }memset (&props,0 ,sizeof (props)); + props.type =BACKLIGHT_RAW ; props.max_brightness =0xff ; bdev =backlight_device_register (dev_name (dev), dev, data, &picolcd_blops, &props);
drivers/macintosh/via-pmu-backlight.c +1 -0
@@ -163,6 +163,7 @@ void __init pmu_backlight_init()snprintf (name,sizeof (name),"pmubl" );memset (&props,0 ,sizeof (struct backlight_properties )); + props.type =BACKLIGHT_PLATFORM ; props.max_brightness =FB_BACKLIGHT_LEVELS -1 ; bd =backlight_device_register (name,NULL ,NULL , &pmu_backlight_data, &props);
drivers/platform/x86/acer-wmi.c +1 -0
@@ -926,6 +926,7 @@ static int __devinit acer_backlight_init(struct device *dev)struct backlight_device *bd;memset (&props,0 ,sizeof (struct backlight_properties )); + props.type =BACKLIGHT_PLATFORM ; props.max_brightness = max_brightness; bd =backlight_device_register ("acer-wmi" , dev,NULL , &acer_bl_ops, &props);
drivers/platform/x86/asus-laptop.c +1 -0
@@ -646,6 +646,7 @@ static int asus_backlight_init(struct asus_laptop *asus) !acpi_check_handle(asus->handle, METHOD_BRIGHTNESS_SET, NULL) && lcd_switch_handle) {memset (&props,0 ,sizeof (struct backlight_properties )); + props.type =BACKLIGHT_PLATFORM ; props.max_brightness =15 ; bd = backlight_device_register(ASUS_LAPTOP_FILE, dev,
drivers/platform/x86/asus_acpi.c +1 -0
@@ -1513,6 +1513,7 @@ static int __init asus_acpi_init(void) }memset (&props,0 ,sizeof (struct backlight_properties )); + props.type =BACKLIGHT_PLATFORM ; props.max_brightness =15 ; asus_backlight_device = backlight_device_register("asus", NULL, NULL, &asus_backlight_data,
drivers/platform/x86/classmate-laptop.c +1 -0
@@ -562,6 +562,7 @@ static int cmpc_ipml_add(struct acpi_device *acpi)return -ENOMEM ;memset (&props,0 ,sizeof (struct backlight_properties )); + props.type =BACKLIGHT_PLATFORM ; props.max_brightness =7 ; ipml->bd = backlight_device_register("cmpc_bl", &acpi->dev, acpi->handle, &cmpc_bl_ops,
drivers/platform/x86/compal-laptop.c +1 -0
@@ -962,6 +962,7 @@ static int __init compal_init(void)if (!acpi_video_backlight_support ()) {struct backlight_properties props;memset (&props,0 ,sizeof (struct backlight_properties )); + props.type =BACKLIGHT_PLATFORM ; props.max_brightness =BACKLIGHT_LEVEL_MAX ; compalbl_device = backlight_device_register(DRIVER_NAME, NULL, NULL,
drivers/platform/x86/dell-laptop.c +1 -0
@@ -575,6 +575,7 @@ static int __init dell_init(void)if (max_intensity) {struct backlight_properties props;memset (&props,0 ,sizeof (struct backlight_properties )); + props.type =BACKLIGHT_PLATFORM ; props.max_brightness = max_intensity; dell_backlight_device = backlight_device_register("dell_backlight", &platform_device->dev,
drivers/platform/x86/eeepc-laptop.c +1 -0
@@ -1135,6 +1135,7 @@ static int eeepc_backlight_init(struct eeepc_laptop *eeepc)struct backlight_device *bd;memset (&props,0 ,sizeof (struct backlight_properties )); + props.type =BACKLIGHT_PLATFORM ; props.max_brightness =15 ; bd = backlight_device_register(EEEPC_LAPTOP_FILE, &eeepc->platform_device->dev, eeepc,
drivers/platform/x86/fujitsu-laptop.c +1 -0
@@ -1128,6 +1128,7 @@ static int __init fujitsu_init(void)memset (&props,0 ,sizeof (struct backlight_properties )); max_brightness = fujitsu->max_brightness; + props.type =BACKLIGHT_PLATFORM ; props.max_brightness = max_brightness -1 ; fujitsu->bl_device = backlight_device_register("fujitsu-laptop", NULL, NULL,
drivers/platform/x86/msi-laptop.c +1 -0
@@ -804,6 +804,7 @@ static int __init msi_init(void) }else {struct backlight_properties props;memset (&props,0 ,sizeof (struct backlight_properties )); + props.type =BACKLIGHT_PLATFORM ; props.max_brightness =MSI_LCD_LEVEL_MAX -1 ; msibl_device = backlight_device_register("msi-laptop-bl", NULL, NULL, &msibl_ops,
drivers/platform/x86/msi-wmi.c +1 -0
@@ -252,6 +252,7 @@ static int __init msi_wmi_init(void)if (!acpi_video_backlight_support ()) {struct backlight_properties props;memset (&props,0 ,sizeof (struct backlight_properties )); + props.type =BACKLIGHT_PLATFORM ; props.max_brightness =ARRAY_SIZE (backlight_map) -1 ; backlight = backlight_device_register(DRV_NAME, NULL, NULL, &msi_backlight_ops,
drivers/platform/x86/panasonic-laptop.c +1 -0
@@ -646,6 +646,7 @@ static int acpi_pcc_hotkey_add(struct acpi_device *device) }/* initialize backlight */ memset (&props,0 ,sizeof (struct backlight_properties )); + props.type =BACKLIGHT_PLATFORM ; props.max_brightness = pcc->sinf[SINF_AC_MAX_BRIGHT ]; pcc->backlight =backlight_device_register ("panasonic" ,NULL , pcc, &pcc_backlight_ops, &props);
drivers/platform/x86/sony-laptop.c +1 -0
@@ -1297,6 +1297,7 @@ static int sony_nc_add(struct acpi_device *device) &handle))) {struct backlight_properties props;memset (&props,0 ,sizeof (struct backlight_properties )); + props.type =BACKLIGHT_PLATFORM ; props.max_brightness =SONY_MAX_BRIGHTNESS -1 ; sony_backlight_device = backlight_device_register("sony", NULL, NULL,
drivers/platform/x86/thinkpad_acpi.c +1 -0
@@ -6309,6 +6309,7 @@ static int __init brightness_init(struct ibm_init_struct *iibm)return 1 ;memset (&props,0 ,sizeof (struct backlight_properties )); + props.type =BACKLIGHT_PLATFORM ; props.max_brightness = bright_maxlvl; props.brightness = b &TP_EC_BACKLIGHT_LVLMSK ; ibm_backlight_device = backlight_device_register(TPACPI_BACKLIGHT_DEV_NAME,
drivers/platform/x86/toshiba_acpi.c +1 -0
@@ -1080,6 +1080,7 @@ static int __init toshiba_acpi_init(void)create_toshiba_proc_entries (); } + props.type =BACKLIGHT_PLATFORM ; props.max_brightness =HCI_LCD_BRIGHTNESS_LEVELS -1 ; toshiba_backlight_device = backlight_device_register("toshiba", &toshiba_acpi.p_dev->dev,
drivers/staging/samsung-laptop/samsung-laptop.c +1 -0
@@ -488,6 +488,7 @@ static int __init samsung_init(void)/* create a backlight device to talk to this one */ memset (&props,0 ,sizeof (struct backlight_properties )); + props.type =BACKLIGHT_PLATFORM ; props.max_brightness =MAX_BRIGHT ; backlight_device = backlight_device_register("samsung", &sdev->dev, NULL, &backlight_ops,
drivers/usb/misc/appledisplay.c +1 -0
@@ -282,6 +282,7 @@ static int appledisplay_probe(struct usb_interface *iface,snprintf (bl_name,sizeof (bl_name),"appledisplay%d" ,atomic_inc_return (&count_displays) -1 );memset (&props,0 ,sizeof (struct backlight_properties )); + props.type =BACKLIGHT_PLATFORM ; props.max_brightness =0xff ; pdata->bd =backlight_device_register (bl_name,NULL , pdata, &appledisplay_bl_data, &props);
drivers/video/atmel_lcdfb.c +1 -0
@@ -127,6 +127,7 @@ static void init_backlight(struct atmel_lcdfb_info *sinfo)return ;memset (&props,0 ,sizeof (struct backlight_properties )); + props.type =BACKLIGHT_RAW ; props.max_brightness =0xff ; bl =backlight_device_register ("backlight" , &sinfo->pdev->dev, sinfo, &atmel_lcdc_bl_ops, &props);
drivers/video/aty/aty128fb.c +1 -0
@@ -1818,6 +1818,7 @@ static void aty128_bl_init(struct aty128fb_par *par)snprintf (name,sizeof (name),"aty128bl%d" , info->node);memset (&props,0 ,sizeof (struct backlight_properties )); + props.type =BACKLIGHT_RAW ; props.max_brightness =FB_BACKLIGHT_LEVELS -1 ; bd =backlight_device_register (name, info->dev, par, &aty128_bl_data, &props);
drivers/video/aty/atyfb_base.c +1 -0
@@ -2241,6 +2241,7 @@ static void aty_bl_init(struct atyfb_par *par)snprintf (name,sizeof (name),"atybl%d" , info->node);memset (&props,0 ,sizeof (struct backlight_properties )); + props.type =BACKLIGHT_RAW ; props.max_brightness =FB_BACKLIGHT_LEVELS -1 ; bd =backlight_device_register (name, info->dev, par, &aty_bl_data, &props);
drivers/video/aty/radeon_backlight.c +1 -0
@@ -158,6 +158,7 @@ void radeonfb_bl_init(struct radeonfb_info *rinfo)snprintf (name,sizeof (name),"radeonbl%d" , rinfo->info->node);memset (&props,0 ,sizeof (struct backlight_properties )); + props.type =BACKLIGHT_RAW ; props.max_brightness =FB_BACKLIGHT_LEVELS -1 ; bd =backlight_device_register (name, rinfo->info->dev, pdata, &radeon_bl_data, &props);
drivers/video/backlight/88pm860x_bl.c +1 -0
@@ -227,6 +227,7 @@ static int pm860x_backlight_probe(struct platform_device *pdev) }memset (&props,0 ,sizeof (struct backlight_properties )); + props.type =BACKLIGHT_RAW ; props.max_brightness =MAX_BRIGHTNESS ; bl =backlight_device_register (name, &pdev->dev, data, &pm860x_backlight_ops, &props);
drivers/video/backlight/adp5520_bl.c +1 -0
@@ -303,6 +303,7 @@ static int __devinit adp5520_bl_probe(struct platform_device *pdev)mutex_init (&data->lock);memset (&props,0 ,sizeof (struct backlight_properties )); + props.type =BACKLIGHT_RAW ; props.max_brightness =ADP5020_MAX_BRIGHTNESS ; bl =backlight_device_register (pdev->name, data->master, data, &adp5520_bl_ops, &props);
drivers/video/backlight/adp8860_bl.c +1 -0
@@ -707,6 +707,7 @@ static int __devinit adp8860_probe(struct i2c_client *client,i2c_set_clientdata (client, data);memset (&props,0 ,sizeof (props)); + props.type =BACKLIGHT_RAW ; props.max_brightness =ADP8860_MAX_BRIGHTNESS ;mutex_init (&data->lock);
drivers/video/backlight/adx_bl.c +1 -0
@@ -104,6 +104,7 @@ static int __devinit adx_backlight_probe(struct platform_device *pdev) }memset (&props,0 ,sizeof (struct backlight_properties )); + props.type =BACKLIGHT_RAW ; props.max_brightness =0xff ; bldev =backlight_device_register (dev_name (&pdev->dev), &pdev->dev, bl, &adx_backlight_ops, &props);
drivers/video/backlight/atmel-pwm-bl.c +1 -0
@@ -168,6 +168,7 @@ static int atmel_pwm_bl_probe(struct platform_device *pdev) }memset (&props,0 ,sizeof (struct backlight_properties )); + props.type =BACKLIGHT_RAW ; props.max_brightness = pdata->pwm_duty_max - pdata->pwm_duty_min; bldev =backlight_device_register ("atmel-pwm-bl" , &pdev->dev, pwmbl, &atmel_pwm_bl_ops, &props);
drivers/video/backlight/backlight.c +15 -0
@@ -19,6 +19,12 @@#include <asm/backlight.h> #endif +static const char *backlight_types[] = { + [BACKLIGHT_RAW ] ="raw" , + [BACKLIGHT_PLATFORM ] ="platform" , + [BACKLIGHT_FIRMWARE ] ="firmware" , +}; +#if defined(CONFIG_FB ) || (defined(CONFIG_FB_MODULE ) && \ defined(CONFIG_BACKLIGHT_CLASS_DEVICE_MODULE ))/* This callback gets called when something important happens inside a
@@ -169,6 +175,14 @@ static ssize_t backlight_store_brightness(struct device *dev,return rc; } +static ssize_t backlight_show_type (struct device *dev, +struct device_attribute *attr,char *buf) +{ +struct backlight_device *bd =to_backlight_device (dev); + +return sprintf (buf,"%s\n" , backlight_types[bd->props.type]); +} +static ssize_t backlight_show_max_brightness (struct device *dev,struct device_attribute *attr,char *buf) {
@@ -234,6 +248,7 @@ static struct device_attribute bl_device_attributes[] = {__ATTR (actual_brightness,0444 , backlight_show_actual_brightness,NULL ),__ATTR (max_brightness,0444 , backlight_show_max_brightness,NULL ), +__ATTR (type,0444 , backlight_show_type,NULL ), __ATTR_NULL, };
drivers/video/backlight/corgi_lcd.c +1 -0
@@ -562,6 +562,7 @@ static int __devinit corgi_lcd_probe(struct spi_device *spi) lcd->mode = (pdata) ? pdata->init_mode :CORGI_LCD_MODE_VGA ;memset (&props,0 ,sizeof (struct backlight_properties )); + props.type =BACKLIGHT_RAW ; props.max_brightness = pdata->max_intensity; lcd->bl_dev =backlight_device_register ("corgi_bl" , &spi->dev, lcd, &corgi_bl_ops, &props);
drivers/video/backlight/cr_bllcd.c +1 -0
@@ -193,6 +193,7 @@ static int cr_backlight_probe(struct platform_device *pdev) }memset (&props,0 ,sizeof (struct backlight_properties )); + props.type =BACKLIGHT_RAW ; bdp =backlight_device_register ("cr-backlight" , &pdev->dev,NULL , &cr_backlight_ops, &props);if (IS_ERR (bdp)) {
drivers/video/backlight/da903x_bl.c +1 -0
@@ -136,6 +136,7 @@ static int da903x_backlight_probe(struct platform_device *pdev)da903x_write (data->da903x_dev,DA9034_WLED_CONTROL2 ,DA9034_WLED_ISET (pdata->output_current)); + props.type =BACKLIGHT_RAW ; props.max_brightness = max_brightness; bl =backlight_device_register (pdev->name, data->da903x_dev, data, &da903x_backlight_ops, &props);
drivers/video/backlight/ep93xx_bl.c +1 -0
@@ -87,6 +87,7 @@ static int __init ep93xxbl_probe(struct platform_device *dev) ep93xxbl->mmio =EP93XX_RASTER_BRIGHTNESS ;memset (&props,0 ,sizeof (struct backlight_properties )); + props.type =BACKLIGHT_RAW ; props.max_brightness =EP93XX_MAX_BRIGHT ; bl =backlight_device_register (dev->name, &dev->dev, ep93xxbl, &ep93xxbl_ops, &props);
drivers/video/backlight/generic_bl.c +1 -0
@@ -91,6 +91,7 @@ static int genericbl_probe(struct platform_device *pdev) name = machinfo->name;memset (&props,0 ,sizeof (struct backlight_properties )); + props.type =BACKLIGHT_RAW ; props.max_brightness = machinfo->max_intensity; bd =backlight_device_register (name, &pdev->dev,NULL , &genericbl_ops, &props);
drivers/video/backlight/hp680_bl.c +1 -0
@@ -109,6 +109,7 @@ static int __devinit hp680bl_probe(struct platform_device *pdev)struct backlight_device *bd;memset (&props,0 ,sizeof (struct backlight_properties )); + props.type =BACKLIGHT_RAW ; props.max_brightness =HP680_MAX_INTENSITY ; bd =backlight_device_register ("hp680-bl" , &pdev->dev,NULL , &hp680bl_ops, &props);
drivers/video/backlight/jornada720_bl.c +1 -0
@@ -106,6 +106,7 @@ static int jornada_bl_probe(struct platform_device *pdev)struct backlight_device *bd;memset (&props,0 ,sizeof (struct backlight_properties )); + props.type =BACKLIGHT_RAW ; props.max_brightness =BL_MAX_BRIGHT ; bd =backlight_device_register (S1D_DEVICENAME , &pdev->dev,NULL , &jornada_bl_ops, &props);
drivers/video/backlight/kb3886_bl.c +1 -0
@@ -149,6 +149,7 @@ static int kb3886bl_probe(struct platform_device *pdev) machinfo->limit_mask =-1 ;memset (&props,0 ,sizeof (struct backlight_properties )); + props.type =BACKLIGHT_RAW ; props.max_brightness = machinfo->max_intensity; kb3886_backlight_device = backlight_device_register("kb3886-bl", &pdev->dev, NULL,
drivers/video/backlight/locomolcd.c +1 -0
@@ -184,6 +184,7 @@ static int locomolcd_probe(struct locomo_dev *ldev)local_irq_restore (flags);memset (&props,0 ,sizeof (struct backlight_properties )); + props.type =BACKLIGHT_RAW ; props.max_brightness =4 ; locomolcd_bl_device = backlight_device_register("locomo-bl", &ldev->dev, NULL,
drivers/video/backlight/max8925_bl.c +1 -0
@@ -136,6 +136,7 @@ static int __devinit max8925_backlight_probe(struct platform_device *pdev) data->current_brightness =0 ;memset (&props,0 ,sizeof (struct backlight_properties )); + props.type =BACKLIGHT_RAW ; props.max_brightness =MAX_BRIGHTNESS ; bl =backlight_device_register (name, &pdev->dev, data, &max8925_backlight_ops, &props);
drivers/video/backlight/mbp_nvidia_bl.c +1 -0
@@ -349,6 +349,7 @@ static int __init mbp_init(void)return -ENXIO ;memset (&props,0 ,sizeof (struct backlight_properties )); + props.type =BACKLIGHT_RAW ; props.max_brightness =15 ; mbp_backlight_device = backlight_device_register("mbp_backlight", NULL, NULL,
drivers/video/backlight/omap1_bl.c +1 -0
@@ -146,6 +146,7 @@ static int omapbl_probe(struct platform_device *pdev)return -ENOMEM ;memset (&props,0 ,sizeof (struct backlight_properties )); + props.type =BACKLIGHT_RAW ; props.max_brightness =OMAPBL_MAX_INTENSITY ; dev =backlight_device_register ("omap-bl" , &pdev->dev, bl, &omapbl_ops, &props);
drivers/video/backlight/pcf50633-backlight.c +1 -0
@@ -112,6 +112,7 @@ static int __devinit pcf50633_bl_probe(struct platform_device *pdev)if (!pcf_bl)return -ENOMEM ; + bl_props.type =BACKLIGHT_RAW ; bl_props.max_brightness =0x3f ; bl_props.power =FB_BLANK_UNBLANK ;
drivers/video/backlight/progear_bl.c +1 -0
@@ -84,6 +84,7 @@ static int progearbl_probe(struct platform_device *pdev)pci_write_config_byte (sb_dev,SB_MPS1 , temp |0x20 );memset (&props,0 ,sizeof (struct backlight_properties )); + props.type =BACKLIGHT_RAW ; props.max_brightness =HW_LEVEL_MAX -HW_LEVEL_MIN ; progear_backlight_device = backlight_device_register("progear-bl", &pdev->dev, NULL,
drivers/video/backlight/pwm_bl.c +1 -0
@@ -103,6 +103,7 @@ static int pwm_backlight_probe(struct platform_device *pdev)dev_dbg (&pdev->dev,"got pwm for backlight\n" );memset (&props,0 ,sizeof (struct backlight_properties )); + props.type =BACKLIGHT_RAW ; props.max_brightness = data->max_brightness; bl =backlight_device_register (dev_name (&pdev->dev), &pdev->dev, pb, &pwm_backlight_ops, &props);
drivers/video/backlight/tosa_bl.c +1 -0
@@ -102,6 +102,7 @@ static int __devinit tosa_bl_probe(struct i2c_client *client, data->i2c = client;memset (&props,0 ,sizeof (struct backlight_properties )); + props.type =BACKLIGHT_RAW ; props.max_brightness =512 -1 ; data->bl =backlight_device_register ("tosa-bl" , &client->dev, data, &bl_ops, &props);
drivers/video/backlight/wm831x_bl.c +1 -0
@@ -193,6 +193,7 @@ static int wm831x_backlight_probe(struct platform_device *pdev) data->current_brightness =0 ; data->isink_reg = isink_reg; + props.type =BACKLIGHT_RAW ; props.max_brightness = max_isel; bl =backlight_device_register ("wm831x" , &pdev->dev, data, &wm831x_backlight_ops, &props);
drivers/video/bf54x-lq043fb.c +1 -0
@@ -649,6 +649,7 @@ static int __devinit bfin_bf54x_probe(struct platform_device *pdev) }#ifndef NO_BL_SUPPORT memset (&props,0 ,sizeof (struct backlight_properties )); + props.type =BACKLIGHT_RAW ; props.max_brightness =255 ; bl_dev =backlight_device_register ("bf54x-bl" ,NULL ,NULL , &bfin_lq043fb_bl_ops, &props);
drivers/video/bfin-t350mcqb-fb.c +1 -0
@@ -545,6 +545,7 @@ static int __devinit bfin_t350mcqb_probe(struct platform_device *pdev) }#ifndef NO_BL_SUPPORT memset (&props,0 ,sizeof (struct backlight_properties )); + props.type =BACKLIGHT_RAW ; props.max_brightness =255 ; bl_dev =backlight_device_register ("bf52x-bl" ,NULL ,NULL , &bfin_lq043fb_bl_ops, &props);
drivers/video/nvidia/nv_backlight.c +1 -0
@@ -111,6 +111,7 @@ void nvidia_bl_init(struct nvidia_par *par)snprintf (name,sizeof (name),"nvidiabl%d" , info->node);memset (&props,0 ,sizeof (struct backlight_properties )); + props.type =BACKLIGHT_RAW ; props.max_brightness =FB_BACKLIGHT_LEVELS -1 ; bd =backlight_device_register (name, info->dev, par, &nvidia_bl_ops, &props);
drivers/video/omap2/displays/panel-acx565akm.c +1 -0
@@ -534,6 +534,7 @@ static int acx_panel_probe(struct omap_dss_device *dssdev) props.fb_blank =FB_BLANK_UNBLANK ; props.power =FB_BLANK_UNBLANK ; + props.type =BACKLIGHT_RAW ; bldev =backlight_device_register ("acx565akm" , &md->spi->dev, md, &acx565akm_bl_ops, &props);
drivers/video/omap2/displays/panel-taal.c +2 -0
@@ -729,6 +729,8 @@ static int taal_probe(struct omap_dss_device *dssdev) props.max_brightness =255 ; else props.max_brightness = 127; + + props.type =BACKLIGHT_RAW ; bldev =backlight_device_register ("taal" , &dssdev->dev, dssdev, &taal_bl_ops, &props);if (IS_ERR (bldev)) {
drivers/video/riva/fbdev.c +1 -0
@@ -355,6 +355,7 @@ static void riva_bl_init(struct riva_par *par)snprintf (name,sizeof (name),"rivabl%d" , info->node);memset (&props,0 ,sizeof (struct backlight_properties )); + props.type =BACKLIGHT_RAW ; props.max_brightness =FB_BACKLIGHT_LEVELS -1 ; bd =backlight_device_register (name, info->dev, par, &riva_bl_ops, &props);
include/linux/backlight.h +8 -0
@@ -32,6 +32,12 @@ enum backlight_update_reason { BACKLIGHT_UPDATE_SYSFS, }; +enum backlight_type { +BACKLIGHT_RAW , +BACKLIGHT_PLATFORM , +BACKLIGHT_FIRMWARE , +}; +struct backlight_device ;struct fb_info ;
@@ -62,6 +68,8 @@ struct backlight_properties {/* FB Blanking active? (values as for power) */ /* Due to be removed, please use (state & BL_CORE_FBBLANK) */ int fb_blank; +/* Backlight type */ +enum backlight_type type;/* Flags used to signal drivers of state changes */ /* Upper 4 bits are reserved for driver internal use */ unsigned int state;
Signature · 1 line
1.7.2.1
PATCH 1/1 radeon: Expose backlight class device for legacy LVDS encoder
From: Michel Dänzer <[email protected]>
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)
--- drivers/gpu/drm/radeon/Kconfig | 1 + drivers/gpu/drm/radeon/radeon_legacy_encoders.c | 257 ++++++++++++++++++++++- drivers/gpu/drm/radeon/radeon_mode.h | 10 + 3 files changed, 262 insertions(+), 6 deletions(-)
drivers/gpu/drm/radeon/Kconfig +1 -0
@@ -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.
drivers/gpu/drm/radeon/radeon_legacy_encoders.c +251 -6
318 lines not on this page · raw message
drivers/gpu/drm/radeon/radeon_mode.h +10 -0
@@ -302,6 +302,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 {struct radeon_atom_ss *ss;/* 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 {
Signature · 1 line
1.7.2.1
Re: [PATCH] radeon: Expose backlight class device for legacy LVDS encoder
Quoted 5 lines · Matthew Garrett
From: Michel Dänzer <[email protected]>
Allows e.g. power management daemons to control the backlight level. Inspired by the corresponding code in radeonfb.
The only problem with this is that not all oems use the internal backlight controller; systems that don't need to use the acpi methods.
On atombios systems there is a bit in theATOM_FIRMWARE_CAPABILITY_ACCESS struct in the FirmwareInfo data table to determine whether the backlight is controlled by the GPU or some external mechanism. Combios may have something similar. If the backlight is controlled via the GPU, it can be adjusting using the atom OutputControl and TransmitterControl control tables depending on the GPU family. However, if the driver chooses to control the backlight itself, it needs to set the appropriate bit in the bios scratch regs to tell the firmware not to attempt to change the backlight itself.
Alex
Quoted 389 lines
(Updated to add backlight type and make the connector the parent device - mjg)
Signed-off-by Michel Dänzer <[email protected]>Signed-off-by Matthew Garrett <[email protected]>---
drivers/gpu/drm/radeon/Kconfig | 1 +drivers/gpu/drm/radeon/radeon_legacy_encoders.c| 257 ++++++++++++++++++++++-drivers/gpu/drm/radeon/radeon_mode.h| 10 +3 files changed, 262 insertions(+), 6 deletions(-)drivers/gpu/drm/radeon/Kconfig +0
-0@@ -1,6 +1,7 @@config
DRM_RADEON_KMS
bool "Enable modesetting on radeon by default - NEW DRIVER" depends onDRM_RADEON
+ selectBACKLIGHT_CLASS_DEVICE
help
Choose this option if you want kernel modesetting enabled by default.drivers/gpu/drm/radeon/radeon_legacy_encoders.c +15
-4@@ -28,6 +28,7 @@ #include "radeon_drm.h" #include "radeon.h" #include "atom.h" +#include <linux/backlight.h> static void radeon_legacy_encoder_disable(struct drm_encoder *encoder) {@@ -39,7 +40,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 +48,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 +91,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 +106,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;drivers/gpu/drm/radeon/radeon_legacy_encoders.c +235
-1@@ -119,6 +129,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 +266,224 @@ 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, +}; + +static void radeon_legacy_backlight_init (struct radeon_encoder *radeon_encoder) +{ + 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; + struct drm_connector *connector; + 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; + } + + connector = radeon_get_connector_for_encoder(&radeon_encoder->base); + + props.max_brightness = MAX_RADEON_LEVEL; + props.type = BACKLIGHT_RAW; + bd = backlight_device_register("radeon_backlight", &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 || + machine_is_compatible("PowerBook4,3") || + machine_is_compatible("PowerBook6,3") || + 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)@@ -1389,6 +1633,7 @@ radeon_add_legacy_encoder(struct drm_device *dev, uint32_t encoder_enum, uint32_else
radeon_encoder->enc_priv =radeon_combios_get_lvds_info(radeon_encoder);radeon_encoder->rmx_type=RMX_FULL;
+radeon_legacy_backlight_init(radeon_encoder);
break;
caseENCODER_OBJECT_ID_INTERNAL_TMDS1:
drm_encoder_init(dev, encoder,&radeon_legacy_tmds_int_enc_funcs,DRM_MODE_ENCODER_TMDS);drivers/gpu/drm/radeon/radeon_mode.h +10
-1@@ -302,6 +302,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 { struct radeon_atom_ss *ss; /* 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.2.1
_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH] radeon: Expose backlight class device for legacy LVDS encoder
Quoted 2 lines · Alex Deucher
The only problem with this is that not all oems use the internal backlight controller; systems that don't need to use the acpi methods.
That's why we expose the backlight type. Userspace should use the acpi or platform mechanism when available, with this being a last-ditch fallback.
Quoted 10 lines
On atombios systems there is a bit in the
ATOM_FIRMWARE_CAPABILITY_ACCESSstruct in the FirmwareInfo data table to determine whether the backlight is controlled by the GPU or some external mechanism. Combios may have something similar. If the backlight is controlled via the GPU, it can be adjusting using the atom OutputControl and TransmitterControl control tables depending on the GPU family. However, if the driver chooses to control the backlight itself, it needs to set the appropriate bit in the bios scratch regs to tell the firmware not to attempt to change the backlight itself.
If there's support for probing this more reliably then I'm all for that, but I'm not keen on taking over control if the BIOS has previous asserted it.
Signature · 1 line
Matthew Garrett | [email protected]
Re: [PATCH] radeon: Expose backlight class device for legacy LVDS encoder
Quoted 8 lines · Matthew Garrett
Quoted 2 lines · Alex Deucher
The only problem with this is that not all oems use the internal backlight controller; systems that don't need to use the acpi methods.
That's why we expose the backlight type. Userspace should use the acpi or platform mechanism when available, with this being a last-ditch fallback.
Ah, gotcha.
Quoted 12 lines
Quoted 11 lines
On atombios systems there is a bit in the
ATOM_FIRMWARE_CAPABILITY_ACCESSstruct in the FirmwareInfo data table to determine whether the backlight is controlled by the GPU or some external mechanism. Combios may have something similar. If the backlight is controlled via the GPU, it can be adjusting using the atom OutputControl and TransmitterControl control tables depending on the GPU family. However, if the driver chooses to control the backlight itself, it needs to set the appropriate bit in the bios scratch regs to tell the firmware not to attempt to change the backlight itself.
Quoted 3 lines
If there's support for probing this more reliably then I'm all for that, but I'm not keen on taking over control if the BIOS has previous asserted it.
Agreed.
Alex
Re: [PATCH] radeon: Expose backlight class device for legacy LVDS encoder
In reply to Matthew GarrettQuoted 9 lines · Matthew Garrett
From: Michel Dänzer <[email protected]>
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 <[email protected]>Signed-off-by Matthew Garrett <[email protected]>
Thanks for picking this up, Matthew.
Unfortunately, it fails to build here:
CC [M] drivers/gpu/drm/radeon/radeon_legacy_encoders.odrivers/gpu/drm/radeon/radeon_legacy_encoders.c: In function ‘radeon_legacy_backlight_init’:drivers/gpu/drm/radeon/radeon_legacy_encoders.c:358: error: implicit declaration of function ‘pmac_has_backlight_type’ drivers/gpu/drm/radeon/radeon_legacy_encoders.c:403: error: implicit declaration of function ‘machine_is_compatible’ make[1]: *** [drivers/gpu/drm/radeon/radeon_legacy_encoders.o] Error 1
make: *** [_module_drivers/gpu/drm/radeon] Error 2
Am I missing changes from another tree?
Signature · 6 lines
Earthling Michel Dänzer | http://www.vmware.com Libre software enthusiast | Debian, X and DRI developer _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH] radeon: Expose backlight class device for legacy LVDS encoder
Quoted 13 lines · Michel Dänzer
Quoted 9 lines · Matthew Garrett
From: Michel Dänzer <[email protected]>
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 <[email protected]>Signed-off-by Matthew Garrett <[email protected]>Thanks for picking this up, Matthew.
Quoted 8 lines
Unfortunately, it fails to build here:
CC [M]
drivers/gpu/drm/radeon/radeon_legacy_encoders.odrivers/gpu/drm/radeon/radeon_legacy_encoders.c: In function ‘radeon_legacy_backlight_init’:drivers/gpu/drm/radeon/radeon_legacy_encoders.c:358: error: implicit declaration of function ‘pmac_has_backlight_type’drivers/gpu/drm/radeon/radeon_legacy_encoders.c:403: error: implicit declaration of function ‘machine_is_compatible’ make[1]: *** [drivers/gpu/drm/radeon/radeon_legacy_encoders.o] Error 1
make: *** [_module_drivers/gpu/drm/radeon] Error 2
Also, radeon_get_connector_for_encoder() only works when a mode is set, connector->kdev is only initialized after drm_sysfs_connector_add(), and I deliberately chose the backlight device name ending in "bl" because that's what pbbuttonsd looks for (though of course that could be fixed there).
The updated patch below fixes these issues, successfully using this right now.
From 59ce4a62cefdef665db5ec7527860c9314a6931d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <[email protected]>
Date: Mon, 23 Aug 2010 08:46:31 +0200
Subject: drm/radeon/kms: Expose backlight class device for legacy LVDS encoder.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
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)
--- 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(-)
drivers/gpu/drm/radeon/Kconfig +1 -0
@@ -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.
drivers/gpu/drm/radeon/radeon_connectors.c +15 -0
@@ -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;
@@ -1389,6 +1393,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:
drivers/gpu/drm/radeon/radeon_legacy_encoders.c +251 -6
312 lines not on this page · raw message
drivers/gpu/drm/radeon/radeon_mode.h +10 -0
@@ -302,6 +302,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 {struct radeon_atom_ss *ss;/* 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 {
Signature · 7 lines
1.7.1 -- Earthling Michel Dänzer | http://www.vmware.com Libre software enthusiast | Debian, X and DRI developer
PATCH 1/1 i915: Add native backlight control
In reply to Matthew GarrettNot all systems expose a firmware or platform mechanism for changing the backlight intensity on i915, so add native driver support.
--- drivers/gpu/drm/i915/i915_drv.h | 3 + drivers/gpu/drm/i915/i915_opregion.c | 60 +----------- drivers/gpu/drm/i915/intel_drv.h | 3 + drivers/gpu/drm/i915/intel_lvds.c | 177 ++++++++++++++++++++++++++++++---- 4 files changed, 170 insertions(+), 73 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +3 -0
@@ -34,6 +34,7 @@#include "intel_bios.h" #include "intel_ringbuffer.h" #include <linux/io-mapping.h> +#include <linux/backlight.h> /* General customization: */
@@ -663,6 +664,8 @@ typedef struct drm_i915_private {/* list of fbdev register on this device */ struct intel_fbdev *fbdev; + +struct backlight_device *backlight; } drm_i915_private_t;/** driver private structure attached to each drm_gem_object */
drivers/gpu/drm/i915/i915_opregion.c +5 -55
92 lines not on this page · raw message
drivers/gpu/drm/i915/intel_drv.h +3 -0
@@ -201,6 +201,9 @@ extern void intel_dvo_init(struct drm_device *dev);extern void intel_tv_init (struct drm_device *dev);extern void intel_mark_busy (struct drm_device *dev,struct drm_gem_object *obj);extern void intel_lvds_init (struct drm_device *dev); +extern u32 intel_lvds_get_max_backlight (struct drm_device *dev); +extern u32 intel_lvds_get_backlight (struct drm_device *dev); +extern void intel_lvds_set_backlight (struct drm_device *dev,int level);extern void intel_dp_init (struct drm_device *dev,int dp_reg); void intel_dp_set_m_n(struct drm_crtc *crtc, struct drm_display_mode *mode,
drivers/gpu/drm/i915/intel_lvds.c +159 -18
227 lines not on this page · raw message
Signature · 1 line
1.7.2.1
Re: [Intel-gfx] [PATCH] i915: Add native backlight control
Quoted 2 lines · Matthew Garrett
Not all systems expose a firmware or platform mechanism for changing the backlight intensity on i915, so add native driver support.
This will conflict with a similar patch I have in drm-intel-next to unify the various bits of code that were attempting to modify the BLC PWM, each in their own unique fashion.
I'll respin this native interface on top of that. Do you want to add a native RAW interface all in one go, or to base it on the current backlight_device and then to add the RAW property with this patch set? -Chris
Signature · 1 line
Chris Wilson, Intel Open Source Technology Centre
Re: [Intel-gfx] [PATCH] i915: Add native backlight control
Quoted 11 lines · Chris Wilson
Quoted 2 lines · Matthew Garrett
Not all systems expose a firmware or platform mechanism for changing the backlight intensity on i915, so add native driver support.
This will conflict with a similar patch I have in drm-intel-next to unify the various bits of code that were attempting to modify the BLC PWM, each in their own unique fashion.
I'll respin this native interface on top of that. Do you want to add a native RAW interface all in one go, or to base it on the current
backlight_deviceand then to add the RAW property with this patch set?
I don't think providing a native interface in i915 is beneficial without providing the type information - userspace just doesn't have any way to identify the correct device otherwise.
Signature · 1 line
Matthew Garrett | [email protected]
PATCH 1/1 drm/i915: Expose a native backlight device
In reply to Matthew GarrettBased on an original patch by Matthew Garrett <[email protected]>
--- drivers/gpu/drm/i915/intel_dp.c | 7 ++++- drivers/gpu/drm/i915/intel_drv.h | 19 +++++++++++++ drivers/gpu/drm/i915/intel_lvds.c | 4 +++ drivers/gpu/drm/i915/intel_panel.c | 50 ++++++++++++++++++++++++++++++++++++ 4 files changed, 79 insertions(+), 1 deletions(-)
drivers/gpu/drm/i915/intel_dp.c +6 -1
@@ -1522,8 +1522,10 @@ static int intel_dp_get_modes(struct drm_connector *connector) }static void -intel_dp_destroy (struct drm_connector *connector) +intel_dp_destroy (struct drm_connector *connector) { +intel_panel_backlight_destroy (to_intel_connector (connector)); +drm_sysfs_connector_remove (connector);drm_connector_cleanup (connector);kfree (connector);
@@ -1729,4 +1731,7 @@ intel_dp_init(struct drm_device *dev, int output_reg)u32 temp =I915_READ (PEG_BAND_GAP_DATA );I915_WRITE (PEG_BAND_GAP_DATA , (temp & ~0xf ) |0xd ); } + +if (IS_eDP (intel_dp)) +intel_panel_backlight_create (intel_connector); }
drivers/gpu/drm/i915/intel_drv.h +19 -0
@@ -28,6 +28,7 @@#include <linux/i2c.h> #include <linux/i2c-id.h> #include <linux/i2c-algo-bit.h> +#include <linux/backlight.h> #include "i915_drv.h" #include "drm_crtc.h" #include "drm_crtc_helper.h"
@@ -151,6 +152,9 @@ struct intel_encoder {struct intel_connector {struct drm_connector base;struct intel_encoder *encoder; + +/* expose a RAW native backlight interface */ +struct backlight_device *backlight; };struct intel_crtc {
@@ -229,6 +233,21 @@ extern u32 intel_panel_get_max_backlight(struct drm_device *dev);extern u32 intel_panel_get_backlight (struct drm_device *dev);extern void intel_panel_set_backlight (struct drm_device *dev,u32 level); +#ifdef CONFIG_BACKLIGHT_CLASS_DEVICE +extern int intel_panel_backlight_create (struct intel_connector *connector); +extern void intel_panel_backlight_destroy (struct intel_connector *connector); +#else +static inline int intel_panel_backlight_create (struct intel_connector *connector) +{ +return -ENODEV ; +} + +static inline void intel_panel_backlight_destroy (struct intel_connector *connector) +{ +return ; +} +#endif +extern int intel_panel_fitter_pipe (struct drm_device *dev);extern void intel_crtc_load_lut (struct drm_crtc *crtc);extern void intel_encoder_prepare (struct drm_encoder *encoder);
drivers/gpu/drm/i915/intel_lvds.c +4 -0
@@ -541,6 +541,8 @@ static void intel_lvds_destroy(struct drm_connector *connector)struct drm_device *dev = connector->dev;struct drm_i915_private *dev_priv = dev->dev_private; +intel_panel_backlight_destroy (to_intel_connector (connector)); +if (dev_priv->lid_notifier.notifier_call)acpi_lid_notifier_unregister (&dev_priv->lid_notifier);drm_sysfs_connector_remove (connector);
@@ -964,6 +966,8 @@ out:/* keep the LVDS connector */ dev_priv->int_lvds_connector = connector;drm_sysfs_connector_add (connector); + +intel_panel_backlight_create (intel_connector);return ; failed:
drivers/gpu/drm/i915/intel_panel.c +50 -0
53 lines not on this page · raw message
Signature · 1 line
1.7.1
Re: [PATCH] drm/i915: Expose a native backlight device
Quoted 3 lines · Chris Wilson
Based on an original patch by Matthew Garrett <[email protected]>
Signed-off-by Chris Wilson <[email protected]>Cc Matthew Garrett <[email protected]>
Signature · 1 line
Matthew Garrett | [email protected]
Quoted 3 lines · Matthew Garrett
There may be multiple ways of controlling the backlight on a given machine. Allow drivers to expose the type of interface they are providing, making it possible for userspace to make appropriate policy decisions.
maybe i missed something, but i dont see the core validating the .type value at registration time. since the value is then used later as an index into an array, shouldnt it verify that it is valid ?
do you want to force everyone to declare they're "raw" ? or just go with the memset default to have people start with "raw" ? otherwise it might make sense to have the first enum be BACKLIGHT_UNKNOWN and have the core warn when it hits that.
drivers/video/backlight/backlight.c line 26
Quoted 8 lines
drivers/video/backlight/backlight.c +5
-0+static const char *backlight_types[] = { + [BACKLIGHT_RAW] = "raw", + [BACKLIGHT_PLATFORM] = "platform", + [BACKLIGHT_FIRMWARE] = "firmware", +};
const char * const backlight_types[] ?
-mke
Richard, any feedback on this?
Signature · 1 line
Matthew Garrett | [email protected]
Quoted 2 lines · On Mon, 15 Nov 2010 15:48:20 +0000 Matthew Garrett <[email protected]> wrote:
Richard, any feedback on this?
At KS akpm said he'd likely be taking over backlight from Richard, since Richard is very distracted with other things atm (please correct me if I'm wrong).
So either someone needs to volunteer to maintain this subsystem (I know how much you love backlights, maybe you'd like to do it?) or you need to get this patch over to akpm.
Signature · 1 line
Jesse Barnes, Intel Open Source Technology Center
Quoted 11 lines · Jesse Barnes
Quoted 2 lines · On Mon, 15 Nov 2010 15:48:20 +0000 Matthew Garrett wrote:
Richard, any feedback on this?
At KS akpm said he'd likely be taking over backlight from Richard, since Richard is very distracted with other things atm (please correct me if I'm wrong).
So either someone needs to volunteer to maintain this subsystem (I know how much you love backlights, maybe you'd like to do it?) or you need to get this patch over to akpm.
this go anywhere ?
-mike
Quoted 8 lines · Mike Frysinger
Quoted 7 lines · Jesse Barnes
Quoted 1 line · On Mon, 15 Nov 2010 15:48:20 +0000 Matthew Garrett wrote:
Richard, any feedback on this?
At KS akpm said he'd likely be taking over backlight from Richard, since Richard is very distracted with other things atm (please correct me if I'm wrong).
Quoted 5 lines
Quoted 3 lines
So either someone needs to volunteer to maintain this subsystem (I know how much you love backlights, maybe you'd like to do it?) or you need to get this patch over to akpm.
this go anywhere ?
nm, i see it was just merged. one of the things i pointed out though is still there:
-static const char const *backlight_types[] = {
+static const char const * const backlight_types[] = { -mike