From a77cbe2f364438bed71cdec31ad55b7a0a6ab547 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Tue, 3 Nov 2009 13:23:15 +1000 Subject: [PATCH] --- yaml --- r: 168483 b: refs/heads/master c: 8a9832e89ff1bc7a039c8f966f07101570be3d5e h: refs/heads/master i: 168481: 00fefea8821fa727ea90d9b14131bebe4525c5e1 168479: 58d6fdc65db655df0a3ed633b1403c67d41acf80 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/radeon/rv515.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index fb9b79c4278a..7ff036fb6485 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d6f28938d9426d12eea1578949f1d73d24ad37ec +refs/heads/master: 8a9832e89ff1bc7a039c8f966f07101570be3d5e diff --git a/trunk/drivers/gpu/drm/radeon/rv515.c b/trunk/drivers/gpu/drm/radeon/rv515.c index 41a34c23e6d8..03c052d892c0 100644 --- a/trunk/drivers/gpu/drm/radeon/rv515.c +++ b/trunk/drivers/gpu/drm/radeon/rv515.c @@ -137,6 +137,8 @@ int rv515_mc_wait_for_idle(struct radeon_device *rdev) void rv515_vga_render_disable(struct radeon_device *rdev) { + WREG32(R_000330_D1VGA_CONTROL, 0); + WREG32(R_000338_D2VGA_CONTROL, 0); WREG32(R_000300_VGA_RENDER_CONTROL, RREG32(R_000300_VGA_RENDER_CONTROL) & C_000300_VGA_VSTATUS_CNTL); }