---

yaml --- r: 307366 b: refs/heads/master c: 5fe9fe8 h: refs/heads/master v: v3
git-mirror · May 5, 2012 · 8846a61 · 8846a61
1 parent fbc74c3
commit 8846a61
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 523bcb28c3fb92baecda6daa60560f67eb4a6177
+refs/heads/master: 5fe9fe8c98eeed86650e9e5e9eaa156cf0ce1282
diff --git a/trunk/drivers/gpu/drm/i915/i915_drv.c b/trunk/drivers/gpu/drm/i915/i915_drv.c
@@ -707,7 +707,7 @@ static int i965_reset_complete(struct drm_device *dev)
 {
 	u8 gdrst;
 	pci_read_config_byte(dev->pdev, I965_GDRST, &gdrst);
-	return gdrst & 0x1;
+	return (gdrst & GRDOM_RESET_ENABLE) == 0;
 }
 
 static int i965_do_reset(struct drm_device *dev)