From patchwork Tue Apr 18 11:43:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrik Jakobsson X-Patchwork-Id: 9685401 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8D269601C2 for ; Tue, 18 Apr 2017 11:43:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 773F728418 for ; Tue, 18 Apr 2017 11:43:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5920E2841E; Tue, 18 Apr 2017 11:43:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E237428418 for ; Tue, 18 Apr 2017 11:43:42 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5CCCC6E160; Tue, 18 Apr 2017 11:43:41 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lf0-x243.google.com (mail-lf0-x243.google.com [IPv6:2a00:1450:4010:c07::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id C93E76E11C for ; Tue, 18 Apr 2017 11:43:39 +0000 (UTC) Received: by mail-lf0-x243.google.com with SMTP id 88so8299768lfr.0 for ; Tue, 18 Apr 2017 04:43:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=NOP30n+YF+zk7fnRM171HEPIk1mH67/VK1CUILH2zP0=; b=ug6/E+nlCkSeLypAIXYHs6aW8CJTvBURUe7Pg3YUf/Qo4ilvjSBGmJkkPVtC13VT1m Z6VoXF123ah+RUsckvom7F5yCmIgyTDAF2PU9Tkk8F7yAWW79YS7rSM4tDzBMTHnZFAB od658QT9FMITu0GsJb5IM0Dfv7lI2I+SOnFtD2lS8Zvlkv4yJr8KkPKmt6QBkBsLn6xQ MA6n+RDTQrk3YwicNLd1JY4RY4ueAZSleZLWyC2iywN87jgmDlDXV/ubEzeuAaq0eO4X z2P0wppFwyRQ1h+u99vJru9hut+RCZTflAU37AtV8uz2nkyx4eneifRECEPwy+U+U7n2 SDrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=NOP30n+YF+zk7fnRM171HEPIk1mH67/VK1CUILH2zP0=; b=PJ2cSuSOmpGE8Z7QU0ecmB9FIAJNkxwcUBLCJ8TfywuoXK+kt+UkWZn5MlF9prpAEz 1jXN3qTZefj0d5Ao+Hm2i8CSpxPBbE8e0psS1mjJWQnpLzK/GGwcD8mn0XnTCgdDcxf+ ltwl+brNEK3pzCdEd5M57K5RTEfLOTKcQ997itJgY9I2NACDYCLPP1XQfdgmkOWS8LKr TDAJ/Sn9bmAbCXRv8tUYO4fNIYjUC5JQ/Sq90LbCjzkaWGGnDjbFgp5QIS9wc2pIQUDp /65+UyQOJai9rW/cqypLRnEN/rfCxya1wawxSR/eHAX0+Ych108CKXi3YVrAsUZQ/8LU bdkQ== X-Gm-Message-State: AN3rC/4SnGY+AKzhmlMm5HDaqZghQHnzglJRemIbn/pGrxCRtNnSHqsM larYcVk3S1fv1sP1 X-Received: by 10.25.74.215 with SMTP id x206mr5380231lfa.67.1492515817936; Tue, 18 Apr 2017 04:43:37 -0700 (PDT) Received: from localhost.localdomain (h195n4-oer-a32.ias.bredband.telia.com. [78.73.138.195]) by smtp.gmail.com with ESMTPSA id q123sm2397595ljb.18.2017.04.18.04.43.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 18 Apr 2017 04:43:37 -0700 (PDT) From: Patrik Jakobsson To: dri-devel@lists.freedesktop.org Subject: [PATCH] drm/gma500/psb: Actually use VBT mode when it is found Date: Tue, 18 Apr 2017 13:43:32 +0200 Message-Id: <20170418114332.12183-1-patrik.r.jakobsson@gmail.com> X-Mailer: git-send-email 2.12.2 Cc: stable@vger.kernel.org, daniel.vetter@ffwll.ch X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP With LVDS we were incorrectly picking the pre-programmed mode instead of the prefered mode provided by VBT. Make sure we pick the VBT mode if one is provided. It is likely that the mode read-out code is still wrong but this patch fixes the immediate problem on most machines. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=78562 Cc: Signed-off-by: Patrik Jakobsson --- drivers/gpu/drm/gma500/psb_intel_lvds.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/gma500/psb_intel_lvds.c b/drivers/gpu/drm/gma500/psb_intel_lvds.c index 483fdce74e39..97c444856d09 100644 --- a/drivers/gpu/drm/gma500/psb_intel_lvds.c +++ b/drivers/gpu/drm/gma500/psb_intel_lvds.c @@ -760,20 +760,23 @@ void psb_intel_lvds_init(struct drm_device *dev, if (scan->type & DRM_MODE_TYPE_PREFERRED) { mode_dev->panel_fixed_mode = drm_mode_duplicate(dev, scan); + DRM_DEBUG_KMS("Using mode from DDC\n"); goto out; /* FIXME: check for quirks */ } } /* Failed to get EDID, what about VBT? do we need this? */ - if (mode_dev->vbt_mode) + if (dev_priv->lfp_lvds_vbt_mode) { mode_dev->panel_fixed_mode = - drm_mode_duplicate(dev, mode_dev->vbt_mode); + drm_mode_duplicate(dev, dev_priv->lfp_lvds_vbt_mode); - if (!mode_dev->panel_fixed_mode) - if (dev_priv->lfp_lvds_vbt_mode) - mode_dev->panel_fixed_mode = - drm_mode_duplicate(dev, - dev_priv->lfp_lvds_vbt_mode); + if (mode_dev->panel_fixed_mode) { + mode_dev->panel_fixed_mode->type |= + DRM_MODE_TYPE_PREFERRED; + DRM_DEBUG_KMS("Using mode from VBT\n"); + goto out; + } + } /* * If we didn't get EDID, try checking if the panel is already turned @@ -790,6 +793,7 @@ void psb_intel_lvds_init(struct drm_device *dev, if (mode_dev->panel_fixed_mode) { mode_dev->panel_fixed_mode->type |= DRM_MODE_TYPE_PREFERRED; + DRM_DEBUG_KMS("Using pre-programmed mode\n"); goto out; /* FIXME: check for quirks */ } }