forked from ~ljy/RK356X_SDK_RELEASE

hc
2024-05-13 9d77db3c730780c8ef5ccd4b66403ff5675cfe4e
kernel/drivers/gpu/drm/qxl/qxl_gem.c
....@@ -23,7 +23,6 @@
2323 * Alon Levy
2424 */
2525
26
-#include <drm/drmP.h>
2726 #include <drm/drm.h>
2827
2928 #include "qxl_drv.h"
....@@ -35,12 +34,12 @@
3534 struct qxl_device *qdev;
3635 struct ttm_buffer_object *tbo;
3736
38
- qdev = (struct qxl_device *)gobj->dev->dev_private;
37
+ qdev = to_qxl(gobj->dev);
3938
4039 qxl_surface_evict(qdev, qobj, false);
4140
4241 tbo = &qobj->tbo;
43
- ttm_bo_unref(&tbo);
42
+ ttm_bo_put(tbo);
4443 }
4544
4645 int qxl_gem_object_create(struct qxl_device *qdev, int size,
....@@ -56,7 +55,7 @@
5655 /* At least align on page size */
5756 if (alignment < PAGE_SIZE)
5857 alignment = PAGE_SIZE;
59
- r = qxl_bo_create(qdev, size, kernel, false, initial_domain, surf, &qbo);
58
+ r = qxl_bo_create(qdev, size, kernel, false, initial_domain, 0, surf, &qbo);
6059 if (r) {
6160 if (r != -ERESTARTSYS)
6261 DRM_ERROR(
....@@ -64,7 +63,7 @@
6463 size, initial_domain, alignment, r);
6564 return r;
6665 }
67
- *obj = &qbo->gem_base;
66
+ *obj = &qbo->tbo.base;
6867
6968 mutex_lock(&qdev->gem.mutex);
7069 list_add_tail(&qbo->list, &qdev->gem.objects);
....@@ -98,7 +97,7 @@
9897 return r;
9998 /* drop reference from allocate - handle holds it now */
10099 *qobj = gem_to_qxl_bo(gobj);
101
- drm_gem_object_put_unlocked(gobj);
100
+ drm_gem_object_put(gobj);
102101 return 0;
103102 }
104103