]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
drm/radeon/kms: disable D1VGA and D2VGA if enabled
authorDave Airlie <airlied@linux.ie>
Tue, 3 Nov 2009 03:23:15 +0000 (13:23 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 3 Nov 2009 23:53:42 +0000 (09:53 +1000)
Once kms is enabled we don't need these, and it causes a problem
with the Lenovo W500 ACPI brightness implementation, it hangs
in a loop inside an SMI.

Signed-off-by: Dave Airlie <airlied@redhat.com>
drivers/gpu/drm/radeon/rv515.c

index 41a34c23e6d8514b39d9f427ce59880a405cce04..03c052d892c09300017e8bface06ec68d7cf2185 100644 (file)
@@ -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);
 }