diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2012-11-19 04:18:25 +0400 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2012-11-29 03:57:57 +0400 |
commit | 647bf61d0399515c526c125450cadaade79b1988 (patch) | |
tree | a3556aff092310377002501d1d953d423d4630b0 | |
parent | 63718a0730c666edcac94c261d1df5edef80fd23 (diff) | |
download | linux-647bf61d0399515c526c125450cadaade79b1988.tar.xz |
drm/nvd0/disp: remove fetching of capabilities report
Unused, and caused a race with evo_sync(). Will revisit using it properly
later on.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r-- | drivers/gpu/drm/nouveau/nvd0_display.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/gpu/drm/nouveau/nvd0_display.c b/drivers/gpu/drm/nouveau/nvd0_display.c index d0920acea741..b444aa7a8ae8 100644 --- a/drivers/gpu/drm/nouveau/nvd0_display.c +++ b/drivers/gpu/drm/nouveau/nvd0_display.c @@ -1863,14 +1863,8 @@ nvd0_display_init(struct drm_device *dev) if (push) { evo_mthd(push, 0x0088, 1); evo_data(push, NvEvoSync); - evo_mthd(push, 0x0084, 1); - evo_data(push, 0x00000000); - evo_mthd(push, 0x0084, 1); - evo_data(push, 0x80000000); - evo_mthd(push, 0x008c, 1); - evo_data(push, 0x00000000); evo_kick(push, nvd0_mast(dev)); - return 0; + return evo_sync(dev); } return -EBUSY; |