Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 190174
b: refs/heads/master
c: 1918ad7
h: refs/heads/master
v: v3
  • Loading branch information
Jesse Barnes authored and Linus Torvalds committed Apr 23, 2010
1 parent aaea59e commit 34026c0
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 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: d5a30458a90597915977f06e79406b664a41b8ac
refs/heads/master: 1918ad77f7f908ed67cf37c505c6ad4ac52f1ecf
2 changes: 1 addition & 1 deletion trunk/drivers/gpu/drm/i915/i915_gem.c
Original file line number Diff line number Diff line change
Expand Up @@ -1793,7 +1793,7 @@ i915_get_gem_seqno(struct drm_device *dev)
{
drm_i915_private_t *dev_priv = dev->dev_private;

if (IS_I965G(dev))
if (HAS_PIPE_CONTROL(dev))
return ((volatile u32 *)(dev_priv->seqno_page))[0];
else
return READ_HWSP(dev_priv, I915_GEM_HWS_INDEX);
Expand Down

0 comments on commit 34026c0

Please sign in to comment.