These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / gpu / drm / qxl / qxl_gem.c

diff --git a/kernel/drivers/gpu/drm/qxl/qxl_gem.c b/kernel/drivers/gpu/drm/qxl/qxl_gem.c
index b96f0c9..d9746e9 100644 (file)
--- a/kernel/drivers/gpu/drm/qxl/qxl_gem.c
+++ b/kernel/drivers/gpu/drm/qxl/qxl_gem.c
@@ -31,9 +31,15 @@
 void qxl_gem_object_free(struct drm_gem_object *gobj)
 {
        struct qxl_bo *qobj = gem_to_qxl_bo(gobj);
+       struct qxl_device *qdev;
+       struct ttm_buffer_object *tbo;
 
-       if (qobj)
-               qxl_bo_unref(&qobj);
+       qdev = (struct qxl_device *)gobj->dev->dev_private;
+
+       qxl_surface_evict(qdev, qobj, false);
+
+       tbo = &qobj->tbo;
+       ttm_bo_unref(&tbo);
 }
 
 int qxl_gem_object_create(struct qxl_device *qdev, int size,