Merge branch 'master' into for-linus

1 files changed, 4 insertions, 1 deletions

diff --git a/drivers/gpu/drm/i2c/ch7006_mode.c b/drivers/gpu/drm/i2c/ch7006_mode.c
index e447dfb63890..c860f24a5afc 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);
         }
 }