drm: Protect fb_defio in drivers with CONFIG_KMS_FBDEV_EMULATION

[deliverable/linux.git] / drivers / gpu / drm / qxl / qxl_kms.c

diff --git a/drivers/gpu/drm/qxl/qxl_kms.c b/drivers/gpu/drm/qxl/qxl_kms.c
index 2319800b7addc5af25cda7d33a5f186d7ea4c69a..e642242728c0b236caa0b066786f6b26cd6c8cb3 100644 (file)
--- a/drivers/gpu/drm/qxl/qxl_kms.c
+++ b/drivers/gpu/drm/qxl/qxl_kms.c
@@ -258,7 +258,6 @@ static int qxl_device_init(struct qxl_device *qdev,
                 (unsigned long)qdev->surfaceram_size);
 
 
-       qdev->gc_queue = create_singlethread_workqueue("qxl_gc");
        INIT_WORK(&qdev->gc_work, qxl_gc_work);
 
        return 0;
@@ -270,10 +269,7 @@ static void qxl_device_fini(struct qxl_device *qdev)
                qxl_bo_unref(&qdev->current_release_bo[0]);
        if (qdev->current_release_bo[1])
                qxl_bo_unref(&qdev->current_release_bo[1]);
-       flush_workqueue(qdev->gc_queue);
-       destroy_workqueue(qdev->gc_queue);
-       qdev->gc_queue = NULL;
-
+       flush_work(&qdev->gc_work);
        qxl_ring_free(qdev->command_ring);
        qxl_ring_free(qdev->cursor_ring);
        qxl_ring_free(qdev->release_ring);
@@ -310,10 +306,6 @@ int qxl_driver_load(struct drm_device *dev, unsigned long flags)
        struct qxl_device *qdev;
        int r;
 
-       /* require kms */
-       if (!drm_core_check_feature(dev, DRIVER_MODESET))
-               return -ENODEV;
-
        qdev = kzalloc(sizeof(struct qxl_device), GFP_KERNEL);
        if (qdev == NULL)
                return -ENOMEM;