diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2012-05-05 00:39:21 +1000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-06-17 11:21:22 -0700 |
| commit | 666b7a8a0355bb510cd9804f6d2973be89045fc4 (patch) | |
| tree | bf018fdcf3f437fc30e3384d1cda94ea1de7ab3b /drivers/gpu | |
| parent | 1f5547c7f183363eabe07e5d202a49f2e94e995a (diff) | |
| download | linux-3.10-666b7a8a0355bb510cd9804f6d2973be89045fc4.tar.gz linux-3.10-666b7a8a0355bb510cd9804f6d2973be89045fc4.tar.bz2 linux-3.10-666b7a8a0355bb510cd9804f6d2973be89045fc4.zip | |
drm/nouveau/disp: fix dithering not being enabled on some eDP macbooks
commit a6a17859f1bdf607650ee055101f54c5f207762b upstream.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Cc: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_connector.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c index fa860358add..7b11edb077d 100644 --- a/drivers/gpu/drm/nouveau/nouveau_connector.c +++ b/drivers/gpu/drm/nouveau/nouveau_connector.c @@ -654,7 +654,13 @@ nouveau_connector_detect_depth(struct drm_connector *connector) if (nv_connector->edid && connector->display_info.bpc) return; - /* if not, we're out of options unless we're LVDS, default to 8bpc */ + /* EDID 1.4 is *supposed* to be supported on eDP, but, Apple... */ + if (nv_connector->type == DCB_CONNECTOR_eDP) { + connector->display_info.bpc = 6; + return; + } + + /* we're out of options unless we're LVDS, default to 8bpc */ if (nv_encoder->dcb->type != OUTPUT_LVDS) { connector->display_info.bpc = 8; return; |