diff options
| author | Francisco Jerez <currojerez@riseup.net> | 2010-08-05 22:57:08 +0200 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2010-08-09 15:16:23 +1000 |
| commit | c93ebb4021ff1fdffe78be89a4bd30bc7cbc75e6 (patch) | |
| tree | c5869fd94b3891c3f75f923d15b9dc2e554c4d68 /drivers/gpu/drm | |
| parent | 1849719ef86e29def631a473e496507a4e052c06 (diff) | |
| download | kernel_samsung_smdk4412-c93ebb4021ff1fdffe78be89a4bd30bc7cbc75e6.zip kernel_samsung_smdk4412-c93ebb4021ff1fdffe78be89a4bd30bc7cbc75e6.tar.gz kernel_samsung_smdk4412-c93ebb4021ff1fdffe78be89a4bd30bc7cbc75e6.tar.bz2 | |
drm/i2c/ch7006: Don't use POWER_LEVEL_FULL_POWER_OFF on early chip versions.
Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm')
| -rw-r--r-- | drivers/gpu/drm/i2c/ch7006_drv.c | 1 | ||||
| -rw-r--r-- | drivers/gpu/drm/i2c/ch7006_mode.c | 5 | ||||
| -rw-r--r-- | drivers/gpu/drm/i2c/ch7006_priv.h | 1 |
3 files changed, 6 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i2c/ch7006_drv.c b/drivers/gpu/drm/i2c/ch7006_drv.c index 833b35f..08792a7 100644 --- a/drivers/gpu/drm/i2c/ch7006_drv.c +++ b/drivers/gpu/drm/i2c/ch7006_drv.c @@ -470,6 +470,7 @@ static int ch7006_encoder_init(struct i2c_client *client, priv->hmargin = 50; priv->vmargin = 50; priv->last_dpms = -1; + priv->chip_version = ch7006_read(client, CH7006_VERSION_ID); if (ch7006_tv_norm) { for (i = 0; i < NUM_TV_NORMS; i++) { diff --git a/drivers/gpu/drm/i2c/ch7006_mode.c b/drivers/gpu/drm/i2c/ch7006_mode.c index e447dfb..c860f24 100644 --- a/drivers/gpu/drm/i2c/ch7006_mode.c +++ b/drivers/gpu/drm/i2c/ch7006_mode.c @@ -316,7 +316,10 @@ void ch7006_setup_power_state(struct drm_encoder *encoder) } } else { - *power |= bitfs(CH7006_POWER_LEVEL, FULL_POWER_OFF); + if (priv->chip_version >= 0x20) + *power |= bitfs(CH7006_POWER_LEVEL, FULL_POWER_OFF); + else + *power |= bitfs(CH7006_POWER_LEVEL, POWER_OFF); } } diff --git a/drivers/gpu/drm/i2c/ch7006_priv.h b/drivers/gpu/drm/i2c/ch7006_priv.h index 1c6d2e3..17667b7 100644 --- a/drivers/gpu/drm/i2c/ch7006_priv.h +++ b/drivers/gpu/drm/i2c/ch7006_priv.h @@ -95,6 +95,7 @@ struct ch7006_priv { int flicker; int scale; + int chip_version; int last_dpms; }; |