From patchwork Tue Apr 16 11:46:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Patrik Jakobsson X-Patchwork-Id: 10902777 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 54A1A13B5 for ; Tue, 16 Apr 2019 11:46:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 083AD28999 for ; Tue, 16 Apr 2019 11:46:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F00CE289A6; Tue, 16 Apr 2019 11:46:38 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED 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 A74BE28999 for ; Tue, 16 Apr 2019 11:46:38 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3E6F889B57; Tue, 16 Apr 2019 11:46:37 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lf1-x144.google.com (mail-lf1-x144.google.com [IPv6:2a00:1450:4864:20::144]) by gabe.freedesktop.org (Postfix) with ESMTPS id F2CAF89A77 for ; Tue, 16 Apr 2019 11:46:35 +0000 (UTC) Received: by mail-lf1-x144.google.com with SMTP id a28so15774069lfo.7 for ; Tue, 16 Apr 2019 04:46:35 -0700 (PDT) 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:mime-version :content-transfer-encoding; bh=oUMdGYLTDye62/E4+oDlP7fvyHbPepi1JH+tYX+WGd4=; b=SzoWqIhnSFlgDfLh044jX7xnU65JF3kaywzA/YpTqo4JXYcU58TKauP0k/PItOg1Zc TUpkxw8reXZGF1IYuSNJ7pCcE8TTkO3JoAwUl1c1f0bglQ3acdqtaZsDIx6XCbbC8WmU DAhCE9aXVV84FJpRLjnk336Ctjj/dGomGP5D52vTqcb0pgUfzCK6GE1KJqkmHVCN1arS YAqx5ov9eto0aiYcrXKwOV2c60xI9nL2/FtmjkqyLDApxKtIwauKmu1dJVlzKKQ+FYKw 36N4mxCKZxF0WjKpY0n5dPGoQbBaOyIknzZvvbvYhJZhH/FhaA3na0gY+AwB4e70gOg8 tM/w== X-Gm-Message-State: APjAAAUO6ltvDZ40OdEVkYRyo7AD4hUGl6G1ARvXpT5MgG1MItyWpuDN fMahiUDLeBhtRuHy63FCSSh0SpeJ X-Google-Smtp-Source: APXvYqyCzxTB0raH9m00TTvksc6iO5c0TonHmaubgSjqCyT5iGThraIYSHiydXVt9rjBnqacXReq0g== X-Received: by 2002:a19:6a0e:: with SMTP id u14mr14286308lfu.153.1555415194099; Tue, 16 Apr 2019 04:46:34 -0700 (PDT) Received: from linux-brbb.suse.de (81-229-85-231-no13.tbcn.telia.com. [81.229.85.231]) by smtp.gmail.com with ESMTPSA id k15sm10338827lji.2.2019.04.16.04.46.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Apr 2019 04:46:32 -0700 (PDT) From: Patrik Jakobsson To: dri-devel@lists.freedesktop.org Subject: [PATCH] drm/gma500/cdv: Check vbt config bits when detecting lvds panels Date: Tue, 16 Apr 2019 13:46:07 +0200 Message-Id: <20190416114607.1072-1-patrik.r.jakobsson@gmail.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=oUMdGYLTDye62/E4+oDlP7fvyHbPepi1JH+tYX+WGd4=; b=itbaC+vcUJu+ireX/Z0ESZI7H6mPB/NtioFmdA6r85r0plhseS16bSjLf+vmQzUQ2j W+zcqZYEhABRG8YPgGJLb/6MJvTiRIfPoBfmWwl8uN505N+UGCJYW7O6Dn9t+rZoCJf5 /gNv5gLuaTQ/7/Lmga8Q5hoDZ+kKSz+3VaXakrkFoKG1WhOaspY3GrW8TxW2dfmZpQP4 sxjBFY0SNke12eJiELZO5qM98w7/w3T2v12SD+cm2fUMZaZ44lN+dTBwPIyipyswvL4m 0pOBFafYy/nIrPbg3cUptz4/l+DA0jXyBdY9f1Vgb4ucl+G5GoZNlzgUEAy1aozswgCp IA1Q== X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Hans de Goede Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Some machines have an lvds child device in vbt even though a panel is not attached. To make detection more reliable we now also check the lvds config bits available in the vbt. Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1665766 Signed-off-by: Patrik Jakobsson Cc: Hans de Goede Cc: Ville Syrjälä Reviewed-by: Hans de Goede --- drivers/gpu/drm/gma500/cdv_intel_lvds.c | 3 +++ drivers/gpu/drm/gma500/intel_bios.c | 3 +++ drivers/gpu/drm/gma500/psb_drv.h | 1 + 3 files changed, 7 insertions(+) diff --git a/drivers/gpu/drm/gma500/cdv_intel_lvds.c b/drivers/gpu/drm/gma500/cdv_intel_lvds.c index de9531caaca0..9c8446184b17 100644 --- a/drivers/gpu/drm/gma500/cdv_intel_lvds.c +++ b/drivers/gpu/drm/gma500/cdv_intel_lvds.c @@ -594,6 +594,9 @@ void cdv_intel_lvds_init(struct drm_device *dev, int pipe; u8 pin; + if (!dev_priv->lvds_enabled_in_vbt) + return; + pin = GMBUS_PORT_PANEL; if (!lvds_is_present_in_vbt(dev, &pin)) { DRM_DEBUG_KMS("LVDS is not present in VBT\n"); diff --git a/drivers/gpu/drm/gma500/intel_bios.c b/drivers/gpu/drm/gma500/intel_bios.c index 63bde4e86c6a..e019ea271ffc 100644 --- a/drivers/gpu/drm/gma500/intel_bios.c +++ b/drivers/gpu/drm/gma500/intel_bios.c @@ -436,6 +436,9 @@ parse_driver_features(struct drm_psb_private *dev_priv, if (driver->lvds_config == BDB_DRIVER_FEATURE_EDP) dev_priv->edp.support = 1; + dev_priv->lvds_enabled_in_vbt = driver->lvds_config != 0; + DRM_DEBUG_KMS("LVDS VBT config bits: 0x%x\n", driver->lvds_config); + /* This bit means to use 96Mhz for DPLL_A or not */ if (driver->primary_lfp_id) dev_priv->dplla_96mhz = true; diff --git a/drivers/gpu/drm/gma500/psb_drv.h b/drivers/gpu/drm/gma500/psb_drv.h index 941b238bdcc9..bc608ddc3bd1 100644 --- a/drivers/gpu/drm/gma500/psb_drv.h +++ b/drivers/gpu/drm/gma500/psb_drv.h @@ -537,6 +537,7 @@ struct drm_psb_private { int lvds_ssc_freq; bool is_lvds_on; bool is_mipi_on; + bool lvds_enabled_in_vbt; u32 mipi_ctrl_display; unsigned int core_freq;