Commit 0f5fab86 authored by Patrik Jakobsson's avatar Patrik Jakobsson Committed by Greg Kroah-Hartman

drm/gma500/cdv: Check vbt config bits when detecting lvds panels

commit 7c420636860a719049fae9403e2c87804f53bdde upstream.

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
Cc: stable@vger.kernel.org
Reviewed-by: 's avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: 's avatarPatrik Jakobsson <patrik.r.jakobsson@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190416114607.1072-1-patrik.r.jakobsson@gmail.comSigned-off-by: 's avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e087f751
...@@ -620,6 +620,9 @@ void cdv_intel_lvds_init(struct drm_device *dev, ...@@ -620,6 +620,9 @@ void cdv_intel_lvds_init(struct drm_device *dev,
int pipe; int pipe;
u8 pin; u8 pin;
if (!dev_priv->lvds_enabled_in_vbt)
return;
pin = GMBUS_PORT_PANEL; pin = GMBUS_PORT_PANEL;
if (!lvds_is_present_in_vbt(dev, &pin)) { if (!lvds_is_present_in_vbt(dev, &pin)) {
DRM_DEBUG_KMS("LVDS is not present in VBT\n"); DRM_DEBUG_KMS("LVDS is not present in VBT\n");
......
...@@ -436,6 +436,9 @@ parse_driver_features(struct drm_psb_private *dev_priv, ...@@ -436,6 +436,9 @@ parse_driver_features(struct drm_psb_private *dev_priv,
if (driver->lvds_config == BDB_DRIVER_FEATURE_EDP) if (driver->lvds_config == BDB_DRIVER_FEATURE_EDP)
dev_priv->edp.support = 1; 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 */ /* This bit means to use 96Mhz for DPLL_A or not */
if (driver->primary_lfp_id) if (driver->primary_lfp_id)
dev_priv->dplla_96mhz = true; dev_priv->dplla_96mhz = true;
......
...@@ -536,6 +536,7 @@ struct drm_psb_private { ...@@ -536,6 +536,7 @@ struct drm_psb_private {
int lvds_ssc_freq; int lvds_ssc_freq;
bool is_lvds_on; bool is_lvds_on;
bool is_mipi_on; bool is_mipi_on;
bool lvds_enabled_in_vbt;
u32 mipi_ctrl_display; u32 mipi_ctrl_display;
unsigned int core_freq; unsigned int core_freq;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment