diff options
author | Ingo Molnar <mingo@kernel.org> | 2018-05-14 11:22:59 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2018-05-14 11:22:59 +0200 |
commit | 4b96583869c4d990b779eca72976063970d41b8d (patch) | |
tree | f2fdb7760a06f6445f33fdee3ec512fbdb46fcb4 /drivers/gpu/drm/qxl/qxl_drv.h | |
parent | 53667c670fe00d63246fb3cfb4480bb1ba247bcc (diff) | |
parent | 67b8d5c7081221efa252e111cd52532ec6d4266f (diff) |
Merge tag 'v4.17-rc5' into irq/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/gpu/drm/qxl/qxl_drv.h')
-rw-r--r-- | drivers/gpu/drm/qxl/qxl_drv.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/qxl/qxl_drv.h b/drivers/gpu/drm/qxl/qxl_drv.h index 00a1a66b052a..864b456080c4 100644 --- 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; |