diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2010-07-06 11:20:17 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2010-07-13 10:13:34 +1000 |
| commit | 1f403d9cca359531e16bc685ed5d619c77762004 (patch) | |
| tree | c8207e926c775f0ca39c86a15a9b84d01b69ce81 /drivers/gpu/drm/nouveau/nv50_sor.c | |
| parent | ea4718d1dc52c4faef92065ce62fcba6113540bf (diff) | |
| download | kernel_samsung_smdk4412-1f403d9cca359531e16bc685ed5d619c77762004.zip kernel_samsung_smdk4412-1f403d9cca359531e16bc685ed5d619c77762004.tar.gz kernel_samsung_smdk4412-1f403d9cca359531e16bc685ed5d619c77762004.tar.bz2 | |
drm/nv50: set DP display power state during DPMS
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nv50_sor.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nv50_sor.c | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nv50_sor.c b/drivers/gpu/drm/nouveau/nv50_sor.c index 45a617d..bcd4cf8 100644 --- a/drivers/gpu/drm/nouveau/nv50_sor.c +++ b/drivers/gpu/drm/nouveau/nv50_sor.c @@ -115,8 +115,22 @@ nv50_sor_dpms(struct drm_encoder *encoder, int mode) nv_rd32(dev, NV50_PDISPLAY_SOR_DPMS_STATE(or))); } - if (nv_encoder->dcb->type == OUTPUT_DP && mode == DRM_MODE_DPMS_ON) - nouveau_dp_link_train(encoder); + if (nv_encoder->dcb->type == OUTPUT_DP) { + struct nouveau_i2c_chan *auxch; + + auxch = nouveau_i2c_find(dev, nv_encoder->dcb->i2c_index); + if (!auxch) + return; + + if (mode == DRM_MODE_DPMS_ON) { + u8 status = DP_SET_POWER_D0; + nouveau_dp_auxch(auxch, 8, DP_SET_POWER, &status, 1); + nouveau_dp_link_train(encoder); + } else { + u8 status = DP_SET_POWER_D3; + nouveau_dp_auxch(auxch, 8, DP_SET_POWER, &status, 1); + } + } } static void |