diff options
author | Kenneth Graunke <kenneth@whitecape.org> | 2010-09-11 04:24:50 -0400 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-09-21 06:19:47 -0400 |
commit | eeccdcac07c1e21d25e7d3cf70030059a3017f0c (patch) | |
tree | 23642ef5cc72448dbde93e02d5d9b55c096a7221 /drivers/gpu/drm/i915/i915_drv.c | |
parent | f49f0586191fe16140410db0a46d43bdc690d6af (diff) |
drm/i915: Rename graphics reset registers.
The graphics domains are listed as GRDOM in the documentation, and the
GDRST PCI config register (0xc0) is only valid on I965 and GM45. Newer
chips (like Sandy Bridge) have a different GDRST.
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.c')
-rw-r--r-- | drivers/gpu/drm/i915/i915_drv.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 7209997f18fe..45027d5ad1e5 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c | |||
@@ -330,7 +330,7 @@ int i915_resume(struct drm_device *dev) | |||
330 | static int i965_reset_complete(struct drm_device *dev) | 330 | static int i965_reset_complete(struct drm_device *dev) |
331 | { | 331 | { |
332 | u8 gdrst; | 332 | u8 gdrst; |
333 | pci_read_config_byte(dev->pdev, GDRST, &gdrst); | 333 | pci_read_config_byte(dev->pdev, I965_GDRST, &gdrst); |
334 | return gdrst & 0x1; | 334 | return gdrst & 0x1; |
335 | } | 335 | } |
336 | 336 | ||
@@ -375,8 +375,8 @@ int i965_reset(struct drm_device *dev, u8 flags) | |||
375 | * well as the reset bit (GR/bit 0). Setting the GR bit | 375 | * well as the reset bit (GR/bit 0). Setting the GR bit |
376 | * triggers the reset; when done, the hardware will clear it. | 376 | * triggers the reset; when done, the hardware will clear it. |
377 | */ | 377 | */ |
378 | pci_read_config_byte(dev->pdev, GDRST, &gdrst); | 378 | pci_read_config_byte(dev->pdev, I965_GDRST, &gdrst); |
379 | pci_write_config_byte(dev->pdev, GDRST, gdrst | flags | 0x1); | 379 | pci_write_config_byte(dev->pdev, I965_GDRST, gdrst | flags | 0x1); |
380 | 380 | ||
381 | /* Wait for the hardware to reset (but no more than 500 ms) */ | 381 | /* Wait for the hardware to reset (but no more than 500 ms) */ |
382 | if (wait_for(i965_reset_complete(dev), 500)) { | 382 | if (wait_for(i965_reset_complete(dev), 500)) { |