diff options
| author | Lingfeng Yang <lfy@google.com> | 2020-04-16 11:53:41 -0700 |
|---|---|---|
| committer | Alistair Delva <adelva@google.com> | 2020-04-17 15:31:01 -0700 |
| commit | c2d015d2d8a6e1575369f4cf3de867bceef6e2d4 (patch) | |
| tree | 6b5499f77e516c4ec6a58df51a60003a751f2c4d /include/uapi | |
| parent | f5c353b091839f4cdcc7f11090cf5d3514f6f70c (diff) | |
CHROMIUM: drm/virtgpu: add legacy VIRTIO_GPU_* values for non-upstream variants
Upstream is foolishly using values for VIRTIO_GPU_RESP_OK_* that we are
already using in crosvm's virtio-gpu impl. In order to work around this,
this change renumbers to values that are unlikely to collide with
existing ones, and renaming the existing ones as *_LEGACY so that the
kernel may be compatible with both old and new versions of crosvm.
BUG=chromium:1047867
TEST=glxgears on crostini
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/kernel/+/2051223
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
Tested-by: Zach Reizner <zachr@chromium.org>
Commit-Queue: Daniel Verkamp <dverkamp@chromium.org>
Bug: 153580313
Signed-off-by: Lingfeng Yang <lfy@google.com>
Change-Id: I40d37c877d13392cc26274561f13684aabc54a23
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/linux/virtio_gpu.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/include/uapi/linux/virtio_gpu.h b/include/uapi/linux/virtio_gpu.h index c6353769821e..f483dff166e3 100644 --- a/include/uapi/linux/virtio_gpu.h +++ b/include/uapi/linux/virtio_gpu.h @@ -103,8 +103,14 @@ enum virtio_gpu_ctrl_type { VIRTIO_GPU_RESP_OK_CAPSET_INFO, VIRTIO_GPU_RESP_OK_CAPSET, VIRTIO_GPU_RESP_OK_EDID, - VIRTIO_GPU_RESP_OK_RESOURCE_PLANE_INFO, - VIRTIO_GPU_RESP_OK_ALLOCATION_METADATA, + + /* CHROMIUM: legacy responses */ + VIRTIO_GPU_RESP_OK_RESOURCE_PLANE_INFO_LEGACY = 0x1104, + VIRTIO_GPU_RESP_OK_ALLOCATION_METADATA_LEGACY = 0x1106, + + /* CHROMIUM: success responses */ + VIRTIO_GPU_RESP_OK_RESOURCE_PLANE_INFO = 0x11FF, + VIRTIO_GPU_RESP_OK_ALLOCATION_METADATA = 0x11FE, /* error responses */ VIRTIO_GPU_RESP_ERR_UNSPEC = 0x1200, |