| Message ID | 1469106764-19411-4-git-send-email-andreas.boll.dev@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 21 July 2016 at 14:12, Andreas Boll <andreas.boll.dev@gmail.com> wrote: > A similar change was made to mesa's copy of virtgpu_drm.h by the > following commit: > Please sync this using the approach shown in commit c745e541a9d8dfd3fb5e1ac57297e58d34d9328f. Namely: - Use make header_install and copy the resulting file over. - Mention the tree/branch and sha where it is based on. Adding details about the kernel changes are a bonus, but not necessary unless they remove/change existing code. Thanks Emil
2016-07-21 18:10 GMT+02:00 Emil Velikov <emil.l.velikov@gmail.com>: > On 21 July 2016 at 14:12, Andreas Boll <andreas.boll.dev@gmail.com> wrote: >> A similar change was made to mesa's copy of virtgpu_drm.h by the >> following commit: >> > Please sync this using the approach shown in commit > c745e541a9d8dfd3fb5e1ac57297e58d34d9328f. > > Namely: > - Use make header_install and copy the resulting file over. > - Mention the tree/branch and sha where it is based on. > > Adding details about the kernel changes are a bonus, but not necessary > unless they remove/change existing code. > > Thanks > Emil I've replaced this patch with a new one that syncs from the kernel header. Thanks, Andreas
diff --git a/include/drm/virtgpu_drm.h b/include/drm/virtgpu_drm.h index abf11c5..6a43f8d 100644 --- a/include/drm/virtgpu_drm.h +++ b/include/drm/virtgpu_drm.h @@ -25,7 +25,7 @@ #define VIRTGPU_DRM_H #include <stddef.h> -#include "drm/drm.h" +#include "drm.h" /* Please note that modifications to all structs defined here are * subject to backwards-compatibility constraints.
A similar change was made to mesa's copy of virtgpu_drm.h by the following commit: commit c1bf71f77c9d4bc83fa7dc987b56f98350430d7c Author: Emil Velikov <emil.velikov@collabora.com> Date: Wed Oct 28 11:47:18 2015 +0000 virgl: fix drm.h include path The drm/ prefix is required, if using the kernel provided headers. As most distros don't ship them it and we already depend on libdrm (which adds the relevant -I flag) just drop the drm/ from the include. Once a libdrm release with the virtgpu_drm.h header is released, we can drop our local copy of the file. Signed-off-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Dave Airlie <airlied@redhat.com> This matches the include path used by all other drm header files. Signed-off-by: Andreas Boll <andreas.boll.dev@gmail.com> --- include/drm/virtgpu_drm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)