aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_dma.c
diff options
context:
space:
mode:
authorBryan Freed <bfreed@chromium.org>2010-10-14 04:14:51 -0400
committerChris Wilson <chris@chris-wilson.co.uk>2010-10-19 04:17:24 -0400
commit6d139a87b747aaebc969ac5f4eb8db766fcd9cbd (patch)
tree62e4a8aa1b01f0b3ba6e11b989be4d64c0057fae /drivers/gpu/drm/i915/i915_dma.c
parente60a0b107b3df072e23cb6d68510aa2615b059ce (diff)
drm/i915: Initialize panel timing registers if VBIOS did not
The time between start of the pixel clock and backlight enable is a basic panel timing constraint. If the Panel Power On/Off registers are found to be 0, assume we are booting without VBIOS initialization and set these registers to something reasonable. Change-Id: Ibed6cc10d46bf52fd92e0beb25ae3525b5eef99d Signed-off-by: Bryan Freed <bfreed@chromium.org> [ickle: rearranged into a separate function to distinguish its role from simply parsing the VBIOS tables.] Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_dma.c')
-rw-r--r--drivers/gpu/drm/i915/i915_dma.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index 2caf43de8a6a..35d121c70a1f 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -1235,7 +1235,7 @@ static int i915_load_modeset_init(struct drm_device *dev,
1235 */ 1235 */
1236 dev_priv->allow_batchbuffer = 1; 1236 dev_priv->allow_batchbuffer = 1;
1237 1237
1238 ret = intel_init_bios(dev); 1238 ret = intel_parse_bios(dev);
1239 if (ret) 1239 if (ret)
1240 DRM_INFO("failed to find VBIOS tables\n"); 1240 DRM_INFO("failed to find VBIOS tables\n");
1241 1241
@@ -2001,6 +2001,9 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
2001 intel_setup_gmbus(dev); 2001 intel_setup_gmbus(dev);
2002 intel_opregion_setup(dev); 2002 intel_opregion_setup(dev);
2003 2003
2004 /* Make sure the bios did its job and set up vital registers */
2005 intel_setup_bios(dev);
2006
2004 i915_gem_load(dev); 2007 i915_gem_load(dev);
2005 2008
2006 /* Init HWS */ 2009 /* Init HWS */