Merge tag 'dm-3.5-changes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/agk...

[karo-tx-linux.git] / drivers / gpu / drm / nouveau / nouveau_connector.c

diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c
index fa860358add1560c2ada715a1d381f4860ef98b4..7b11edb077d0c5790dc6e4b35c90b1686d315f9f 100644 (file)
--- 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;