Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 286848
b: refs/heads/master
c: 04115a9
h: refs/heads/master
v: v3
  • Loading branch information
Eric Anholt authored and Keith Packard committed Jan 24, 2012
1 parent db1b22e commit 238f82a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: fff24e21e17e438bf24791ed9cea7bbc02ad2dbb
refs/heads/master: 04115a9dee110b52a8eaa556c574022fa3bf4704
4 changes: 2 additions & 2 deletions trunk/drivers/gpu/drm/i915/i915_suspend.c
Original file line number Diff line number Diff line change
Expand Up @@ -827,7 +827,7 @@ int i915_save_state(struct drm_device *dev)

if (IS_IRONLAKE_M(dev))
ironlake_disable_drps(dev);
if (IS_GEN6(dev))
if (INTEL_INFO(dev)->gen >= 6)
gen6_disable_rps(dev);

/* Cache mode state */
Expand Down Expand Up @@ -886,7 +886,7 @@ int i915_restore_state(struct drm_device *dev)
intel_init_emon(dev);
}

if (IS_GEN6(dev)) {
if (INTEL_INFO(dev)->gen >= 6) {
gen6_enable_rps(dev_priv);
gen6_update_ring_freq(dev_priv);
}
Expand Down

0 comments on commit 238f82a

Please sign in to comment.