drm/radeon/kms: ignore vga arbiter return.
authorDave Airlie <airlied@redhat.com>
Wed, 28 Oct 2009 01:09:58 +0000 (11:09 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 28 Oct 2009 01:09:58 +0000 (11:09 +1000)
Since we register all radeon devices, and the arbiter only cares about
VGA class ones, we will fail to startup on display controller class devices.
We don't gain anything by using the return value here.

this helps kms on sparc64 get started.

Reported-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Dave Airlie <airlied@redhat.com>
drivers/gpu/drm/radeon/radeon_device.c

index 3d667031de6ea17e23ff08d0d50ee66d3ae1d47f..df988142e6b0f8fc01d981859fc07dd71d2f27d2 100644 (file)
@@ -582,10 +582,9 @@ int radeon_device_init(struct radeon_device *rdev,
        DRM_INFO("register mmio size: %u\n", (unsigned)rdev->rmmio_size);
 
        /* if we have > 1 VGA cards, then disable the radeon VGA resources */
-       r = vga_client_register(rdev->pdev, rdev, NULL, radeon_vga_set_decode);
-       if (r) {
-               return -EINVAL;
-       }
+       /* this will fail for cards that aren't VGA class devices, just
+        * ignore it */
+       vga_client_register(rdev->pdev, rdev, NULL, radeon_vga_set_decode);
 
        r = radeon_init(rdev);
        if (r)