git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'drm/drm-next' into drm-misc-next
[sfrench/cifs-2.6.git]
/
drivers
/
gpu
/
drm
/
qxl
/
qxl_drv.h
diff --git
a/drivers/gpu/drm/qxl/qxl_drv.h
b/drivers/gpu/drm/qxl/qxl_drv.h
index 4b8984017373796d8b069b6435cb651c1d2c5d7f..01220d386b0aed446e43fb04db7f485122ffc5b9 100644
(file)
--- a/
drivers/gpu/drm/qxl/qxl_drv.h
+++ b/
drivers/gpu/drm/qxl/qxl_drv.h
@@
-167,6
+167,7
@@
struct qxl_release {
int id;
int type;
+ struct qxl_bo *release_bo;
uint32_t release_offset;
uint32_t surface_release_id;
struct ww_acquire_ctx ticket;