Attachment 42720 Details for Bug 33691 – VBT override (against 2.6.37)

[patch] VBT override (against 2.6.37)

0001-drm-i915-Override-SDVO-panel-type-in-VBT.patch (text/plain), 3.29 KB, created by Chris Wilson on 2011-01-30 08:11:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Wilson

Created: 2011-01-30 08:11:57 UTC

Size: 3.29 KB

patch

obsolete

>From 30e3c2dbed7c744e8d2b94264856dde3ed04fe06 Mon Sep 17 00:00:00 2001
>From: Chris Wilson <chris@chris-wilson.co.uk>
>Date: Sat, 29 Jan 2011 16:50:25 +0000
>Subject: [PATCH] drm/i915: Override SDVO panel type in VBT
>
>Judging by comments in the BIOS, if the SDVO LVDS option h40 is enabled,
>then we are supposed to query the real panel type via Int15. We don't do
>this and so for the Sony Vaio VGC-JS210J which has otherwise default
>values, we choose the wrong mode.
>
>This patch adds a driver option, i915.vbt_sdvo_panel_type, which can be
>used to override the value in the VBT.
>
>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=33691
>Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
>---
> drivers/gpu/drm/i915/i915_drv.c   |    3 +++
> drivers/gpu/drm/i915/i915_drv.h   |    1 +
> drivers/gpu/drm/i915/intel_bios.c |   22 ++++++++++++++--------
> 3 files changed, 18 insertions(+), 8 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
>index f737960..1785ca6 100644
>--- a/drivers/gpu/drm/i915/i915_drv.c
>+++ b/drivers/gpu/drm/i915/i915_drv.c
>@@ -49,6 +49,9 @@ module_param_named(powersave, i915_powersave, int, 0600);
> unsigned int i915_lvds_downclock = 0;
> module_param_named(lvds_downclock, i915_lvds_downclock, int, 0400);
> 
>+int i915_vbt_sdvo_panel_type = -1;
>+module_param_named(vbt_sdvo_panel_type, i915_vbt_sdvo_panel_type, int, 0600);
>+
> static struct drm_driver driver;
> extern int intel_agp_enabled;
> 
>diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
>index 409826d..bf83de8 100644
>--- a/drivers/gpu/drm/i915/i915_drv.h
>+++ b/drivers/gpu/drm/i915/i915_drv.h
>@@ -885,6 +885,7 @@ extern int i915_max_ioctl;
> extern unsigned int i915_fbpercrtc;
> extern unsigned int i915_powersave;
> extern unsigned int i915_lvds_downclock;
>+extern int i915_vbt_sdvo_panel_type;
> 
> extern int i915_suspend(struct drm_device *dev, pm_message_t state);
> extern int i915_resume(struct drm_device *dev);
>diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c
>index b0b1200..24b9369 100644
>--- a/drivers/gpu/drm/i915/intel_bios.c
>+++ b/drivers/gpu/drm/i915/intel_bios.c
>@@ -226,29 +226,35 @@ static void
> parse_sdvo_panel_data(struct drm_i915_private *dev_priv,
> 		      struct bdb_header *bdb)
> {
>-	struct bdb_sdvo_lvds_options *sdvo_lvds_options;
> 	struct lvds_dvo_timing *dvo_timing;
> 	struct drm_display_mode *panel_fixed_mode;
>+	int index;
> 
>-	sdvo_lvds_options = find_section(bdb, BDB_SDVO_LVDS_OPTIONS);
>-	if (!sdvo_lvds_options)
>-		return;
>+	index = i915_vbt_sdvo_panel_type;
>+	if (index == -1) {
>+		struct bdb_sdvo_lvds_options *sdvo_lvds_options;
>+
>+		sdvo_lvds_options = find_section(bdb, BDB_SDVO_LVDS_OPTIONS);
>+		if (!sdvo_lvds_options)
>+			return;
>+
>+		index = sdvo_lvds_options->panel_type;
>+	}
> 
> 	dvo_timing = find_section(bdb, BDB_SDVO_PANEL_DTDS);
> 	if (!dvo_timing)
> 		return;
> 
> 	panel_fixed_mode = kzalloc(sizeof(*panel_fixed_mode), GFP_KERNEL);
>-
> 	if (!panel_fixed_mode)
> 		return;
> 
>-	fill_detail_timing_data(panel_fixed_mode,
>-			dvo_timing + sdvo_lvds_options->panel_type);
>+	fill_detail_timing_data(panel_fixed_mode, dvo_timing + index);
> 
> 	dev_priv->sdvo_lvds_vbt_mode = panel_fixed_mode;
> 
>-	return;
>+	DRM_DEBUG_KMS("Found SDVO panel mode in BIOS VBT tables:\n");
>+	drm_mode_debug_printmodeline(panel_fixed_mode);
> }
> 
> static void
>-- 
>1.7.2.3
>

Actions: View | Splinter Review

Attachments on bug 33691: 42695 | 42696 | 42720

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.