From 8846a612d378e17c4da9984cdcc5862d404c14ca Mon Sep 17 00:00:00 2001 From: Daniel Vetter Date: Wed, 2 May 2012 21:33:52 +0200 Subject: [PATCH] --- yaml --- r: 307366 b: refs/heads/master c: 5fe9fe8c98eeed86650e9e5e9eaa156cf0ce1282 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/i915_drv.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ed6b6351fb34..875e06285970 100644 --- 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 index 133f1014ed90..77b7a50e2014 100644 --- 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)