drivers/gpu/drm/openchrome/openchrome_drv.h | 2 +- include/uapi/drm/openchrome_drm.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
New commits: commit d80b8e5b35e2ca3c3ebe2fde811316c7ee409a5c Author: Kevin Brace <kevinbr...@gmx.com> Date: Thu Aug 13 17:40:52 2020 -0700 drm/openchrome: Version bumped to 3.3.0 Added a new OpenChrome DRM uAPI service (DRM_OPENCHROME_GEM_UNMAP), so the OpenChrome DRM minor version number will have to be incremented by 1. Signed-off-by: Kevin Brace <kevinbr...@gmx.com> diff --git a/drivers/gpu/drm/openchrome/openchrome_drv.h b/drivers/gpu/drm/openchrome/openchrome_drv.h index d16d392a5dca..921baadd6ae2 100644 --- a/drivers/gpu/drm/openchrome/openchrome_drv.h +++ b/drivers/gpu/drm/openchrome/openchrome_drv.h @@ -60,11 +60,11 @@ #define DRIVER_MAJOR 3 -#define DRIVER_MINOR 2 +#define DRIVER_MINOR 3 #define DRIVER_PATCHLEVEL 0 #define DRIVER_NAME "openchrome" #define DRIVER_DESC "OpenChrome DRM for VIA Technologies Chrome IGP" -#define DRIVER_DATE "20200810" +#define DRIVER_DATE "20200813" #define DRIVER_AUTHOR "OpenChrome Project" commit 931a374e44e8f3096bfd45d70bcd993be27fc1ad Author: Kevin Brace <kevinbr...@gmx.com> Date: Thu Aug 13 17:40:33 2020 -0700 drm/openchrome: Add DRM_OPENCHROME_GEM_UNMAP OpenChrome DRM uAPI service Signed-off-by: Kevin Brace <kevinbr...@gmx.com> diff --git a/drivers/gpu/drm/openchrome/openchrome_ioctl.c b/drivers/gpu/drm/openchrome/openchrome_ioctl.c index 17fb2ae5ee32..d3e12df3322a 100644 --- a/drivers/gpu/drm/openchrome/openchrome_ioctl.c +++ b/drivers/gpu/drm/openchrome/openchrome_ioctl.c @@ -101,10 +101,26 @@ exit: return ret; } +static int openchrome_gem_unmap(struct drm_device *dev, + void *data, + struct drm_file *file_priv) +{ + struct drm_openchrome_gem_unmap *args = data; + int ret; + + DRM_DEBUG_KMS("Entered %s.\n", __func__); + + ret = drm_gem_handle_delete(file_priv, args->handle); + + DRM_DEBUG_KMS("Exiting %s.\n", __func__); + return ret; +} + const struct drm_ioctl_desc openchrome_ioctls[] = { DRM_IOCTL_DEF_DRV(OPENCHROME_GEM_CREATE, openchrome_gem_create, DRM_AUTH | DRM_UNLOCKED), DRM_IOCTL_DEF_DRV(OPENCHROME_GEM_MAP, openchrome_gem_map, DRM_AUTH | DRM_UNLOCKED), + DRM_IOCTL_DEF_DRV(OPENCHROME_GEM_UNMAP, openchrome_gem_unmap, DRM_AUTH | DRM_UNLOCKED), }; diff --git a/include/uapi/drm/openchrome_drm.h b/include/uapi/drm/openchrome_drm.h index 06f7f2ababda..6253612fa4a4 100644 --- a/include/uapi/drm/openchrome_drm.h +++ b/include/uapi/drm/openchrome_drm.h @@ -42,10 +42,12 @@ extern "C" { #define DRM_OPENCHROME_GEM_CREATE 0x00 #define DRM_OPENCHROME_GEM_MAP 0x01 +#define DRM_OPENCHROME_GEM_UNMAP 0x02 #define DRM_IOCTL_OPENCHROME_GEM_CREATE DRM_IOWR(DRM_COMMAND_BASE + DRM_OPENCHROME_GEM_CREATE, struct drm_openchrome_gem_create) #define DRM_IOCTL_OPENCHROME_GEM_MAP DRM_IOWR(DRM_COMMAND_BASE + DRM_OPENCHROME_GEM_MAP, struct drm_openchrome_gem_map) +#define DRM_IOCTL_OPENCHROME_GEM_UNMAP DRM_IOR(DRM_COMMAND_BASE + DRM_OPENCHROME_GEM_UNMAP, struct drm_openchrome_gem_unmap) struct drm_openchrome_gem_create { @@ -61,6 +63,10 @@ struct drm_openchrome_gem_map { uint64_t map_offset; }; +struct drm_openchrome_gem_unmap { + uint32_t handle; +}; + #if defined(__cplusplus) } commit 4d5c13b3493c0288951811bab7936b34641f6588 Author: Kevin Brace <kevinbr...@gmx.com> Date: Thu Aug 13 17:40:00 2020 -0700 Revert "drm/openchrome: Add DRM_OPENCHROME_GEM_UNMAP OpenChrome DRM uAPI call" This reverts commit 9da86319e21156f2d733d1a81832fd011de18c4c. diff --git a/drivers/gpu/drm/openchrome/openchrome_ioctl.c b/drivers/gpu/drm/openchrome/openchrome_ioctl.c index d3e12df3322a..17fb2ae5ee32 100644 --- a/drivers/gpu/drm/openchrome/openchrome_ioctl.c +++ b/drivers/gpu/drm/openchrome/openchrome_ioctl.c @@ -101,26 +101,10 @@ exit: return ret; } -static int openchrome_gem_unmap(struct drm_device *dev, - void *data, - struct drm_file *file_priv) -{ - struct drm_openchrome_gem_unmap *args = data; - int ret; - - DRM_DEBUG_KMS("Entered %s.\n", __func__); - - ret = drm_gem_handle_delete(file_priv, args->handle); - - DRM_DEBUG_KMS("Exiting %s.\n", __func__); - return ret; -} - const struct drm_ioctl_desc openchrome_ioctls[] = { DRM_IOCTL_DEF_DRV(OPENCHROME_GEM_CREATE, openchrome_gem_create, DRM_AUTH | DRM_UNLOCKED), DRM_IOCTL_DEF_DRV(OPENCHROME_GEM_MAP, openchrome_gem_map, DRM_AUTH | DRM_UNLOCKED), - DRM_IOCTL_DEF_DRV(OPENCHROME_GEM_UNMAP, openchrome_gem_unmap, DRM_AUTH | DRM_UNLOCKED), }; diff --git a/include/uapi/drm/openchrome_drm.h b/include/uapi/drm/openchrome_drm.h index e640ad3fd15b..06f7f2ababda 100644 --- a/include/uapi/drm/openchrome_drm.h +++ b/include/uapi/drm/openchrome_drm.h @@ -42,12 +42,10 @@ extern "C" { #define DRM_OPENCHROME_GEM_CREATE 0x00 #define DRM_OPENCHROME_GEM_MAP 0x01 -#define DRM_OPENCHROME_GEM_UNMAP 0x02 #define DRM_IOCTL_OPENCHROME_GEM_CREATE DRM_IOWR(DRM_COMMAND_BASE + DRM_OPENCHROME_GEM_CREATE, struct drm_openchrome_gem_create) #define DRM_IOCTL_OPENCHROME_GEM_MAP DRM_IOWR(DRM_COMMAND_BASE + DRM_OPENCHROME_GEM_MAP, struct drm_openchrome_gem_map) -#define DRM_IOCTL_OPENCHROME_GEM_UNMAP DRM_IOR(DRM_COMMAND_BASE + DRM_OPENCHROME_GEM_MAP, struct drm_openchrome_gem_unmap) struct drm_openchrome_gem_create { @@ -63,10 +61,6 @@ struct drm_openchrome_gem_map { uint64_t map_offset; }; -struct drm_openchrome_gem_unmap { - uint32_t handle; -}; - #if defined(__cplusplus) } commit 9f9b5b4100b02d0a0acbff882c3241cf33494a5f Author: Kevin Brace <kevinbr...@gmx.com> Date: Thu Aug 13 17:39:44 2020 -0700 Revert "drm/openchrome: Version bumped to 3.3.0" This reverts commit 1f28fa3d000f6f0faff9227969dd7753c3355de5. diff --git a/drivers/gpu/drm/openchrome/openchrome_drv.h b/drivers/gpu/drm/openchrome/openchrome_drv.h index 891a52cce787..d16d392a5dca 100644 --- a/drivers/gpu/drm/openchrome/openchrome_drv.h +++ b/drivers/gpu/drm/openchrome/openchrome_drv.h @@ -60,11 +60,11 @@ #define DRIVER_MAJOR 3 -#define DRIVER_MINOR 3 +#define DRIVER_MINOR 2 #define DRIVER_PATCHLEVEL 0 #define DRIVER_NAME "openchrome" #define DRIVER_DESC "OpenChrome DRM for VIA Technologies Chrome IGP" -#define DRIVER_DATE "20200812" +#define DRIVER_DATE "20200810" #define DRIVER_AUTHOR "OpenChrome Project" _______________________________________________ openchrome-devel mailing list openchrome-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/openchrome-devel