summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2012-05-05 00:39:21 +1000
committerBen Skeggs <bskeggs@redhat.com>2012-05-24 16:56:26 +1000
commita6a17859f1bdf607650ee055101f54c5f207762b (patch)
treefcee3566bfb597111a957406e84171fd79c0e8e2 /drivers
parent0c75f332e50949b62add5d5fc3f7ee4829c8972a (diff)
downloadlinux-3.10-a6a17859f1bdf607650ee055101f54c5f207762b.tar.gz
linux-3.10-a6a17859f1bdf607650ee055101f54c5f207762b.tar.bz2
linux-3.10-a6a17859f1bdf607650ee055101f54c5f207762b.zip
drm/nouveau/disp: fix dithering not being enabled on some eDP macbooks
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_connector.c8
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;