From e1e6831f28106f6dece8b78081e99881943938a9 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Tue, 19 Apr 2011 15:28:32 +0100 Subject: [PATCH] --- yaml --- r: 249186 b: refs/heads/master c: 541c81ab4bd40d3a1a1044b4fe265ea2124389fc h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/gma500/psb_intel_lvds.c | 14 +++++--------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index f54ea89d55dd..fa6b9228402f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e1684a048b709f886dcd996901580f8a65b18391 +refs/heads/master: 541c81ab4bd40d3a1a1044b4fe265ea2124389fc diff --git a/trunk/drivers/staging/gma500/psb_intel_lvds.c b/trunk/drivers/staging/gma500/psb_intel_lvds.c index 28e04a3e7b6f..b0a225b9f562 100644 --- a/trunk/drivers/staging/gma500/psb_intel_lvds.c +++ b/trunk/drivers/staging/gma500/psb_intel_lvds.c @@ -32,13 +32,6 @@ #include "psb_powermgmt.h" #include -/* MRST defines start */ -uint8_t blc_freq; -uint8_t blc_minbrightness; -uint8_t blc_i2caddr; -uint8_t blc_brightnesscmd; -int lvds_backlight; /* restore backlight to this value */ - u32 CoreClock; u32 PWMControlRegFreq; @@ -97,8 +90,11 @@ static u32 psb_intel_lvds_get_max_backlight(struct drm_device *dev) return retVal; } -/** +/* * Set LVDS backlight level by I2C command + * + * FIXME: at some point we need to both track this for PM and also + * disable runtime pm on MRST if the brightness is nil (ie blanked) */ static int psb_lvds_i2c_set_brightness(struct drm_device *dev, unsigned int level) @@ -131,7 +127,7 @@ static int psb_lvds_i2c_set_brightness(struct drm_device *dev, if (i2c_transfer(&lvds_i2c_bus->adapter, msgs, 1) == 1) { DRM_DEBUG("I2C set brightness.(command, value) (%d, %d)\n", - blc_brightnesscmd, + dev_priv->lvds_bl->brightnesscmd, blc_i2c_brightness); return 0; }