Home Home > GIT Browse > SLE15-AZURE
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-06-14 12:00:06 +0200
committerTakashi Iwai <tiwai@suse.de>2019-06-14 12:00:10 +0200
commit44c7a531140f74f9e5af10eb7ea5955eafc3c4ef (patch)
tree11a0d79ece56ee7ee80a487133cb6c3ffc6997ff
parenta50c7d917f9b70cc7cf8c9c3bfd4e0585b927c61 (diff)
drm/gma500/cdv: Check vbt config bits when detecting lvds panels
(bsc#1051510).
-rw-r--r--patches.drm/drm-gma500-cdv-Check-vbt-config-bits-when-detecting-.patch68
-rw-r--r--series.conf1
2 files changed, 69 insertions, 0 deletions
diff --git a/patches.drm/drm-gma500-cdv-Check-vbt-config-bits-when-detecting-.patch b/patches.drm/drm-gma500-cdv-Check-vbt-config-bits-when-detecting-.patch
new file mode 100644
index 0000000000..f26efb2974
--- /dev/null
+++ b/patches.drm/drm-gma500-cdv-Check-vbt-config-bits-when-detecting-.patch
@@ -0,0 +1,68 @@
+From 7c420636860a719049fae9403e2c87804f53bdde Mon Sep 17 00:00:00 2001
+From: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
+Date: Tue, 16 Apr 2019 13:46:07 +0200
+Subject: [PATCH] drm/gma500/cdv: Check vbt config bits when detecting lvds panels
+Git-commit: 7c420636860a719049fae9403e2c87804f53bdde
+Patch-mainline: v5.2-rc2
+References: bsc#1051510
+
+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: Hans de Goede <hdegoede@redhat.com>
+Signed-off-by: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
+Link: https://patchwork.freedesktop.org/patch/msgid/20190416114607.1072-1-patrik.r.jakobsson@gmail.com
+Acked-by: Takashi Iwai <tiwai@suse.de>
+
+---
+ 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;
+--
+2.16.4
+
diff --git a/series.conf b/series.conf
index 076f1228f8..9cdaa615d0 100644
--- a/series.conf
+++ b/series.conf
@@ -22376,6 +22376,7 @@
patches.drm/drm-vmwgfx-Don-t-send-drm-sysfs-hotplug-events-on-in.patch
patches.drm/0001-drm-vmwgfx-NULL-pointer-dereference-from-vmw_cmd_dx_.patch
patches.drm/drm-vmwgfx-integer-underflow-in-vmw_cmd_dx_set_shade.patch
+ patches.drm/drm-gma500-cdv-Check-vbt-config-bits-when-detecting-.patch
patches.drm/0002-drm-i915-gvt-Tiled-Resources-mmios-are-in-context-mm.patch
patches.drm/0003-drm-i915-gvt-add-0x4dfc-to-gen9-save-restore-list.patch
patches.drm/drm-i915-gvt-do-not-let-TRTTE-and-0x4dfc-write-passt.patch