aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_suspend.c
diff options
context:
space:
mode:
authorPaulo Zanoni <paulo.r.zanoni@intel.com>2013-09-12 12:58:17 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2013-09-13 05:40:45 -0400
commit8e8f8aec2a8deba35af6ba2d3129f0d7bcfd3902 (patch)
tree2410a838708f19a553fd3a4640fe313d6e5b1d25 /drivers/gpu/drm/i915/i915_suspend.c
parent9d49c0ef40890064ca552230c2e3ae0e1fb3b617 (diff)
drm/i915: don't save/restore LBB on Gen5+
Because this PCI config register doesn't exist on Gen5+. Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_suspend.c')
-rw-r--r--drivers/gpu/drm/i915/i915_suspend.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_suspend.c b/drivers/gpu/drm/i915/i915_suspend.c
index 70db618989c4..3538370e3a47 100644
--- a/drivers/gpu/drm/i915/i915_suspend.c
+++ b/drivers/gpu/drm/i915/i915_suspend.c
@@ -340,7 +340,9 @@ int i915_save_state(struct drm_device *dev)
340 struct drm_i915_private *dev_priv = dev->dev_private; 340 struct drm_i915_private *dev_priv = dev->dev_private;
341 int i; 341 int i;
342 342
343 pci_read_config_byte(dev->pdev, LBB, &dev_priv->regfile.saveLBB); 343 if (INTEL_INFO(dev)->gen <= 4)
344 pci_read_config_byte(dev->pdev, LBB,
345 &dev_priv->regfile.saveLBB);
344 346
345 mutex_lock(&dev->struct_mutex); 347 mutex_lock(&dev->struct_mutex);
346 348
@@ -390,7 +392,9 @@ int i915_restore_state(struct drm_device *dev)
390 struct drm_i915_private *dev_priv = dev->dev_private; 392 struct drm_i915_private *dev_priv = dev->dev_private;
391 int i; 393 int i;
392 394
393 pci_write_config_byte(dev->pdev, LBB, dev_priv->regfile.saveLBB); 395 if (INTEL_INFO(dev)->gen <= 4)
396 pci_write_config_byte(dev->pdev, LBB,
397 dev_priv->regfile.saveLBB);
394 398
395 mutex_lock(&dev->struct_mutex); 399 mutex_lock(&dev->struct_mutex);
396 400