diff options
Diffstat (limited to 'drivers/gpu/drm/i915/intel_bios.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_bios.c | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c index 61abef8a8119..63880e2e5cfd 100644 --- a/drivers/gpu/drm/i915/intel_bios.c +++ b/drivers/gpu/drm/i915/intel_bios.c | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright � 2006 Intel Corporation | 2 | * Copyright �� 2006 Intel Corporation |
| 3 | * | 3 | * |
| 4 | * Permission is hereby granted, free of charge, to any person obtaining a | 4 | * Permission is hereby granted, free of charge, to any person obtaining a |
| 5 | * copy of this software and associated documentation files (the "Software"), | 5 | * copy of this software and associated documentation files (the "Software"), |
| @@ -309,6 +309,13 @@ parse_general_features(struct drm_i915_private *dev_priv, | |||
| 309 | dev_priv->lvds_use_ssc = general->enable_ssc; | 309 | dev_priv->lvds_use_ssc = general->enable_ssc; |
| 310 | dev_priv->lvds_ssc_freq = | 310 | dev_priv->lvds_ssc_freq = |
| 311 | intel_bios_ssc_frequency(dev, general->ssc_freq); | 311 | intel_bios_ssc_frequency(dev, general->ssc_freq); |
| 312 | dev_priv->display_clock_mode = general->display_clock_mode; | ||
| 313 | DRM_DEBUG_KMS("BDB_GENERAL_FEATURES int_tv_support %d int_crt_support %d lvds_use_ssc %d lvds_ssc_freq %d display_clock_mode %d\n", | ||
| 314 | dev_priv->int_tv_support, | ||
| 315 | dev_priv->int_crt_support, | ||
| 316 | dev_priv->lvds_use_ssc, | ||
| 317 | dev_priv->lvds_ssc_freq, | ||
| 318 | dev_priv->display_clock_mode); | ||
| 312 | } | 319 | } |
| 313 | } | 320 | } |
| 314 | 321 | ||
| @@ -381,7 +388,7 @@ parse_sdvo_device_mapping(struct drm_i915_private *dev_priv, | |||
| 381 | if (p_child->dvo_port != DEVICE_PORT_DVOB && | 388 | if (p_child->dvo_port != DEVICE_PORT_DVOB && |
| 382 | p_child->dvo_port != DEVICE_PORT_DVOC) { | 389 | p_child->dvo_port != DEVICE_PORT_DVOC) { |
| 383 | /* skip the incorrect SDVO port */ | 390 | /* skip the incorrect SDVO port */ |
| 384 | DRM_DEBUG_KMS("Incorrect SDVO port. Skip it \n"); | 391 | DRM_DEBUG_KMS("Incorrect SDVO port. Skip it\n"); |
| 385 | continue; | 392 | continue; |
| 386 | } | 393 | } |
| 387 | DRM_DEBUG_KMS("the SDVO device with slave addr %2x is found on" | 394 | DRM_DEBUG_KMS("the SDVO device with slave addr %2x is found on" |
| @@ -396,15 +403,13 @@ parse_sdvo_device_mapping(struct drm_i915_private *dev_priv, | |||
| 396 | p_mapping->dvo_wiring = p_child->dvo_wiring; | 403 | p_mapping->dvo_wiring = p_child->dvo_wiring; |
| 397 | p_mapping->ddc_pin = p_child->ddc_pin; | 404 | p_mapping->ddc_pin = p_child->ddc_pin; |
| 398 | p_mapping->i2c_pin = p_child->i2c_pin; | 405 | p_mapping->i2c_pin = p_child->i2c_pin; |
| 399 | p_mapping->i2c_speed = p_child->i2c_speed; | ||
| 400 | p_mapping->initialized = 1; | 406 | p_mapping->initialized = 1; |
| 401 | DRM_DEBUG_KMS("SDVO device: dvo=%x, addr=%x, wiring=%d, ddc_pin=%d, i2c_pin=%d, i2c_speed=%d\n", | 407 | DRM_DEBUG_KMS("SDVO device: dvo=%x, addr=%x, wiring=%d, ddc_pin=%d, i2c_pin=%d\n", |
| 402 | p_mapping->dvo_port, | 408 | p_mapping->dvo_port, |
| 403 | p_mapping->slave_addr, | 409 | p_mapping->slave_addr, |
| 404 | p_mapping->dvo_wiring, | 410 | p_mapping->dvo_wiring, |
| 405 | p_mapping->ddc_pin, | 411 | p_mapping->ddc_pin, |
| 406 | p_mapping->i2c_pin, | 412 | p_mapping->i2c_pin); |
| 407 | p_mapping->i2c_speed); | ||
| 408 | } else { | 413 | } else { |
| 409 | DRM_DEBUG_KMS("Maybe one SDVO port is shared by " | 414 | DRM_DEBUG_KMS("Maybe one SDVO port is shared by " |
| 410 | "two SDVO device.\n"); | 415 | "two SDVO device.\n"); |
| @@ -564,7 +569,7 @@ parse_device_mapping(struct drm_i915_private *dev_priv, | |||
| 564 | count++; | 569 | count++; |
| 565 | } | 570 | } |
| 566 | if (!count) { | 571 | if (!count) { |
| 567 | DRM_DEBUG_KMS("no child dev is parsed from VBT \n"); | 572 | DRM_DEBUG_KMS("no child dev is parsed from VBT\n"); |
| 568 | return; | 573 | return; |
| 569 | } | 574 | } |
| 570 | dev_priv->child_dev = kzalloc(sizeof(*p_child) * count, GFP_KERNEL); | 575 | dev_priv->child_dev = kzalloc(sizeof(*p_child) * count, GFP_KERNEL); |
| @@ -610,7 +615,7 @@ init_vbt_defaults(struct drm_i915_private *dev_priv) | |||
| 610 | /* Default to using SSC */ | 615 | /* Default to using SSC */ |
| 611 | dev_priv->lvds_use_ssc = 1; | 616 | dev_priv->lvds_use_ssc = 1; |
| 612 | dev_priv->lvds_ssc_freq = intel_bios_ssc_frequency(dev, 1); | 617 | dev_priv->lvds_ssc_freq = intel_bios_ssc_frequency(dev, 1); |
| 613 | DRM_DEBUG("Set default to SSC at %dMHz\n", dev_priv->lvds_ssc_freq); | 618 | DRM_DEBUG_KMS("Set default to SSC at %dMHz\n", dev_priv->lvds_ssc_freq); |
| 614 | 619 | ||
| 615 | /* eDP data */ | 620 | /* eDP data */ |
| 616 | dev_priv->edp.bpp = 18; | 621 | dev_priv->edp.bpp = 18; |
| @@ -639,7 +644,7 @@ intel_parse_bios(struct drm_device *dev) | |||
| 639 | if (dev_priv->opregion.vbt) { | 644 | if (dev_priv->opregion.vbt) { |
| 640 | struct vbt_header *vbt = dev_priv->opregion.vbt; | 645 | struct vbt_header *vbt = dev_priv->opregion.vbt; |
| 641 | if (memcmp(vbt->signature, "$VBT", 4) == 0) { | 646 | if (memcmp(vbt->signature, "$VBT", 4) == 0) { |
| 642 | DRM_DEBUG_DRIVER("Using VBT from OpRegion: %20s\n", | 647 | DRM_DEBUG_KMS("Using VBT from OpRegion: %20s\n", |
| 643 | vbt->signature); | 648 | vbt->signature); |
| 644 | bdb = (struct bdb_header *)((char *)vbt + vbt->bdb_offset); | 649 | bdb = (struct bdb_header *)((char *)vbt + vbt->bdb_offset); |
| 645 | } else | 650 | } else |