| Message ID | 20210415155958.391624-1-matthew.auld@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v3,1/4] drm/i915/uapi: hide kernel doc warnings | expand |
On Thu, Apr 15, 2021 at 04:59:55PM +0100, Matthew Auld wrote: > It's not properly formatted kernel doc, just nerf the warnings for now. > > Signed-off-by: Matthew Auld <matthew.auld@intel.com> > Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> > Cc: Jordan Justen <jordan.l.justen@intel.com> > Cc: Daniel Vetter <daniel.vetter@intel.com> > Cc: Kenneth Graunke <kenneth@whitecape.org> > Cc: Jason Ekstrand <jason@jlekstrand.net> > Cc: Dave Airlie <airlied@gmail.com> > Cc: dri-devel@lists.freedesktop.org > Cc: mesa-dev@lists.freedesktop.org Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> > --- > include/uapi/drm/i915_drm.h | 16 ++++++++-------- > 1 file changed, 8 insertions(+), 8 deletions(-) > > diff --git a/include/uapi/drm/i915_drm.h b/include/uapi/drm/i915_drm.h > index ddc47bbf48b6..a50257cde9ff 100644 > --- a/include/uapi/drm/i915_drm.h > +++ b/include/uapi/drm/i915_drm.h > @@ -1054,12 +1054,12 @@ struct drm_i915_gem_exec_fence { > __u32 flags; > }; > > -/** > +/* > * See drm_i915_gem_execbuffer_ext_timeline_fences. > */ > #define DRM_I915_GEM_EXECBUFFER_EXT_TIMELINE_FENCES 0 > > -/** > +/* > * This structure describes an array of drm_syncobj and associated points for > * timeline variants of drm_syncobj. It is invalid to append this structure to > * the execbuf if I915_EXEC_FENCE_ARRAY is set. > @@ -1700,7 +1700,7 @@ struct drm_i915_gem_context_param { > __u64 value; > }; > > -/** > +/* > * Context SSEU programming > * > * It may be necessary for either functional or performance reason to configure > @@ -2067,7 +2067,7 @@ struct drm_i915_perf_open_param { > __u64 properties_ptr; > }; > > -/** > +/* > * Enable data capture for a stream that was either opened in a disabled state > * via I915_PERF_FLAG_DISABLED or was later disabled via > * I915_PERF_IOCTL_DISABLE. > @@ -2081,7 +2081,7 @@ struct drm_i915_perf_open_param { > */ > #define I915_PERF_IOCTL_ENABLE _IO('i', 0x0) > > -/** > +/* > * Disable data capture for a stream. > * > * It is an error to try and read a stream that is disabled. > @@ -2090,7 +2090,7 @@ struct drm_i915_perf_open_param { > */ > #define I915_PERF_IOCTL_DISABLE _IO('i', 0x1) > > -/** > +/* > * Change metrics_set captured by a stream. > * > * If the stream is bound to a specific context, the configuration change > @@ -2103,7 +2103,7 @@ struct drm_i915_perf_open_param { > */ > #define I915_PERF_IOCTL_CONFIG _IO('i', 0x2) > > -/** > +/* > * Common to all i915 perf records > */ > struct drm_i915_perf_record_header { > @@ -2151,7 +2151,7 @@ enum drm_i915_perf_record_type { > DRM_I915_PERF_RECORD_MAX /* non-ABI */ > }; > > -/** > +/* > * Structure to upload perf dynamic configuration into the kernel. > */ > struct drm_i915_perf_oa_config { > -- > 2.26.3 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel
On Fri, Apr 16, 2021 at 10:44:28AM +0200, Daniel Vetter wrote: > On Thu, Apr 15, 2021 at 04:59:55PM +0100, Matthew Auld wrote: > > It's not properly formatted kernel doc, just nerf the warnings for now. > > > > Signed-off-by: Matthew Auld <matthew.auld@intel.com> > > Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> > > Cc: Jordan Justen <jordan.l.justen@intel.com> > > Cc: Daniel Vetter <daniel.vetter@intel.com> > > Cc: Kenneth Graunke <kenneth@whitecape.org> > > Cc: Jason Ekstrand <jason@jlekstrand.net> > > Cc: Dave Airlie <airlied@gmail.com> > > Cc: dri-devel@lists.freedesktop.org > > Cc: mesa-dev@lists.freedesktop.org > > Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> Ok I need to revise, we need to pull this into Documentation/gpu/. I think best would be to create a new driver-uapi.rst file, put it right after drm-uapi.rst, and then add a section for drm/i915 uapi or similar. Also since pxp patches, Jason's ctx cleanup and lmem all need this prep work in patches 1-3 here, can you pls just resend those with the review feedback so we can fast-track merging? Thanks, Daniel > > > --- > > include/uapi/drm/i915_drm.h | 16 ++++++++-------- > > 1 file changed, 8 insertions(+), 8 deletions(-) > > > > diff --git a/include/uapi/drm/i915_drm.h b/include/uapi/drm/i915_drm.h > > index ddc47bbf48b6..a50257cde9ff 100644 > > --- a/include/uapi/drm/i915_drm.h > > +++ b/include/uapi/drm/i915_drm.h > > @@ -1054,12 +1054,12 @@ struct drm_i915_gem_exec_fence { > > __u32 flags; > > }; > > > > -/** > > +/* > > * See drm_i915_gem_execbuffer_ext_timeline_fences. > > */ > > #define DRM_I915_GEM_EXECBUFFER_EXT_TIMELINE_FENCES 0 > > > > -/** > > +/* > > * This structure describes an array of drm_syncobj and associated points for > > * timeline variants of drm_syncobj. It is invalid to append this structure to > > * the execbuf if I915_EXEC_FENCE_ARRAY is set. > > @@ -1700,7 +1700,7 @@ struct drm_i915_gem_context_param { > > __u64 value; > > }; > > > > -/** > > +/* > > * Context SSEU programming > > * > > * It may be necessary for either functional or performance reason to configure > > @@ -2067,7 +2067,7 @@ struct drm_i915_perf_open_param { > > __u64 properties_ptr; > > }; > > > > -/** > > +/* > > * Enable data capture for a stream that was either opened in a disabled state > > * via I915_PERF_FLAG_DISABLED or was later disabled via > > * I915_PERF_IOCTL_DISABLE. > > @@ -2081,7 +2081,7 @@ struct drm_i915_perf_open_param { > > */ > > #define I915_PERF_IOCTL_ENABLE _IO('i', 0x0) > > > > -/** > > +/* > > * Disable data capture for a stream. > > * > > * It is an error to try and read a stream that is disabled. > > @@ -2090,7 +2090,7 @@ struct drm_i915_perf_open_param { > > */ > > #define I915_PERF_IOCTL_DISABLE _IO('i', 0x1) > > > > -/** > > +/* > > * Change metrics_set captured by a stream. > > * > > * If the stream is bound to a specific context, the configuration change > > @@ -2103,7 +2103,7 @@ struct drm_i915_perf_open_param { > > */ > > #define I915_PERF_IOCTL_CONFIG _IO('i', 0x2) > > > > -/** > > +/* > > * Common to all i915 perf records > > */ > > struct drm_i915_perf_record_header { > > @@ -2151,7 +2151,7 @@ enum drm_i915_perf_record_type { > > DRM_I915_PERF_RECORD_MAX /* non-ABI */ > > }; > > > > -/** > > +/* > > * Structure to upload perf dynamic configuration into the kernel. > > */ > > struct drm_i915_perf_oa_config { > > -- > > 2.26.3 > > > > _______________________________________________ > > dri-devel mailing list > > dri-devel@lists.freedesktop.org > > https://lists.freedesktop.org/mailman/listinfo/dri-devel > > -- > Daniel Vetter > Software Engineer, Intel Corporation > http://blog.ffwll.ch
diff --git a/include/uapi/drm/i915_drm.h b/include/uapi/drm/i915_drm.h index ddc47bbf48b6..a50257cde9ff 100644 --- a/include/uapi/drm/i915_drm.h +++ b/include/uapi/drm/i915_drm.h @@ -1054,12 +1054,12 @@ struct drm_i915_gem_exec_fence { __u32 flags; }; -/** +/* * See drm_i915_gem_execbuffer_ext_timeline_fences. */ #define DRM_I915_GEM_EXECBUFFER_EXT_TIMELINE_FENCES 0 -/** +/* * This structure describes an array of drm_syncobj and associated points for * timeline variants of drm_syncobj. It is invalid to append this structure to * the execbuf if I915_EXEC_FENCE_ARRAY is set. @@ -1700,7 +1700,7 @@ struct drm_i915_gem_context_param { __u64 value; }; -/** +/* * Context SSEU programming * * It may be necessary for either functional or performance reason to configure @@ -2067,7 +2067,7 @@ struct drm_i915_perf_open_param { __u64 properties_ptr; }; -/** +/* * Enable data capture for a stream that was either opened in a disabled state * via I915_PERF_FLAG_DISABLED or was later disabled via * I915_PERF_IOCTL_DISABLE. @@ -2081,7 +2081,7 @@ struct drm_i915_perf_open_param { */ #define I915_PERF_IOCTL_ENABLE _IO('i', 0x0) -/** +/* * Disable data capture for a stream. * * It is an error to try and read a stream that is disabled. @@ -2090,7 +2090,7 @@ struct drm_i915_perf_open_param { */ #define I915_PERF_IOCTL_DISABLE _IO('i', 0x1) -/** +/* * Change metrics_set captured by a stream. * * If the stream is bound to a specific context, the configuration change @@ -2103,7 +2103,7 @@ struct drm_i915_perf_open_param { */ #define I915_PERF_IOCTL_CONFIG _IO('i', 0x2) -/** +/* * Common to all i915 perf records */ struct drm_i915_perf_record_header { @@ -2151,7 +2151,7 @@ enum drm_i915_perf_record_type { DRM_I915_PERF_RECORD_MAX /* non-ABI */ }; -/** +/* * Structure to upload perf dynamic configuration into the kernel. */ struct drm_i915_perf_oa_config {
It's not properly formatted kernel doc, just nerf the warnings for now. Signed-off-by: Matthew Auld <matthew.auld@intel.com> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Cc: Jordan Justen <jordan.l.justen@intel.com> Cc: Daniel Vetter <daniel.vetter@intel.com> Cc: Kenneth Graunke <kenneth@whitecape.org> Cc: Jason Ekstrand <jason@jlekstrand.net> Cc: Dave Airlie <airlied@gmail.com> Cc: dri-devel@lists.freedesktop.org Cc: mesa-dev@lists.freedesktop.org --- include/uapi/drm/i915_drm.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)