UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Francisco Jerez 2010-08-05 22:57:08 +02:00 committed by Ben Skeggs
parent 1849719ef8
commit c93ebb4021
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/gpu/drm/i2c/ch7006_drv.c
View File

@ -470,6 +470,7 @@ static int ch7006_encoder_init(struct i2c_client *client,
priv->hmargin = 50; priv->hmargin = 50;
priv->vmargin = 50; priv->vmargin = 50;
priv->last_dpms = -1; priv->last_dpms = -1;
priv->chip_version = ch7006_read(client, CH7006_VERSION_ID);
if (ch7006_tv_norm) { if (ch7006_tv_norm) {
for (i = 0; i < NUM_TV_NORMS; i++) { for (i = 0; i < NUM_TV_NORMS; i++) {

5
drivers/gpu/drm/i2c/ch7006_mode.c
View File

@ -316,7 +316,10 @@ void ch7006_setup_power_state(struct drm_encoder *encoder)
} }
} else { } 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);
} }
} }

1
drivers/gpu/drm/i2c/ch7006_priv.h
View File

@ -95,6 +95,7 @@ struct ch7006_priv {
int flicker; int flicker;
int scale; int scale;
int chip_version;
int last_dpms; int last_dpms;
}; };