| Message ID | 20221205161005.222274-3-jim.cromie@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | DRM - avoid regression in -rc, fix comment | expand |
On Mon, Dec 05, 2022 at 09:10:05AM -0700, Jim Cromie wrote: > Cited commit uses stale macro name, fix this, and explain better. > > When DRM_USE_DYNAMIC_DEBUG=y, DYNDBG_CLASSMAP_DEFINE() maps DRM_UT_* > onto BITs in drm.debug. This still uses enum drm_debug_category, but > it is somewhat indirect, with the ordered set of DRM_UT_* enum-vals. > This requires that the macro args: DRM_UT_* list must be kept in sync > and in order. > > Fixes: f158936b60a7 ("drm: POC drm on dyndbg - use in core, 2 helpers, 3 drivers.") > Signed-off-by: Jim Cromie <jim.cromie@gmail.com> What's the status of this series? Greg, you landed the original entire pile that wasn't quite ready yet? Or should I apply these two? -Daniel > --- > . emphasize ABI non-change despite enum val change - Jani Nikula > . reorder to back of patchset to follow API name changes. > --- > include/drm/drm_print.h | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/include/drm/drm_print.h b/include/drm/drm_print.h > index a44fb7ef257f..e4c0c7e6d49d 100644 > --- a/include/drm/drm_print.h > +++ b/include/drm/drm_print.h > @@ -276,7 +276,10 @@ static inline struct drm_printer drm_err_printer(const char *prefix) > * > */ > enum drm_debug_category { > - /* These names must match those in DYNAMIC_DEBUG_CLASSBITS */ > + /* > + * Keep DYNDBG_CLASSMAP_DEFINE args in sync with changes here, > + * the enum-values define BIT()s in drm.debug, so are ABI. > + */ > /** > * @DRM_UT_CORE: Used in the generic drm code: drm_ioctl.c, drm_mm.c, > * drm_memory.c, ... > -- > 2.38.1 >
On Thu, Jan 5, 2023 at 5:46 AM Daniel Vetter <daniel@ffwll.ch> wrote: > > On Mon, Dec 05, 2022 at 09:10:05AM -0700, Jim Cromie wrote: > > Cited commit uses stale macro name, fix this, and explain better. > > > > When DRM_USE_DYNAMIC_DEBUG=y, DYNDBG_CLASSMAP_DEFINE() maps DRM_UT_* > > onto BITs in drm.debug. This still uses enum drm_debug_category, but > > it is somewhat indirect, with the ordered set of DRM_UT_* enum-vals. > > This requires that the macro args: DRM_UT_* list must be kept in sync > > and in order. > > > > Fixes: f158936b60a7 ("drm: POC drm on dyndbg - use in core, 2 helpers, 3 drivers.") > > Signed-off-by: Jim Cromie <jim.cromie@gmail.com> > > What's the status of this series? > dead - superseded by https://patchwork.freedesktop.org/series/111652/ which is still WIP, but improved since that post. I'll resubmit soon, with same title so patchwork calls it rev 2 > Greg, you landed the original entire pile that wasn't quite ready yet? Or > should I apply these two? > -Daniel > > > --- > > . emphasize ABI non-change despite enum val change - Jani Nikula > > . reorder to back of patchset to follow API name changes. > > --- > > include/drm/drm_print.h | 5 ++++- > > 1 file changed, 4 insertions(+), 1 deletion(-) > > > > diff --git a/include/drm/drm_print.h b/include/drm/drm_print.h > > index a44fb7ef257f..e4c0c7e6d49d 100644 > > --- a/include/drm/drm_print.h > > +++ b/include/drm/drm_print.h > > @@ -276,7 +276,10 @@ static inline struct drm_printer drm_err_printer(const char *prefix) > > * > > */ > > enum drm_debug_category { > > - /* These names must match those in DYNAMIC_DEBUG_CLASSBITS */ > > + /* > > + * Keep DYNDBG_CLASSMAP_DEFINE args in sync with changes here, > > + * the enum-values define BIT()s in drm.debug, so are ABI. > > + */ > > /** > > * @DRM_UT_CORE: Used in the generic drm code: drm_ioctl.c, drm_mm.c, > > * drm_memory.c, ... > > -- > > 2.38.1 > > > > -- > Daniel Vetter > Software Engineer, Intel Corporation > http://blog.ffwll.ch
diff --git a/include/drm/drm_print.h b/include/drm/drm_print.h index a44fb7ef257f..e4c0c7e6d49d 100644 --- a/include/drm/drm_print.h +++ b/include/drm/drm_print.h @@ -276,7 +276,10 @@ static inline struct drm_printer drm_err_printer(const char *prefix) * */ enum drm_debug_category { - /* These names must match those in DYNAMIC_DEBUG_CLASSBITS */ + /* + * Keep DYNDBG_CLASSMAP_DEFINE args in sync with changes here, + * the enum-values define BIT()s in drm.debug, so are ABI. + */ /** * @DRM_UT_CORE: Used in the generic drm code: drm_ioctl.c, drm_mm.c, * drm_memory.c, ...
Cited commit uses stale macro name, fix this, and explain better. When DRM_USE_DYNAMIC_DEBUG=y, DYNDBG_CLASSMAP_DEFINE() maps DRM_UT_* onto BITs in drm.debug. This still uses enum drm_debug_category, but it is somewhat indirect, with the ordered set of DRM_UT_* enum-vals. This requires that the macro args: DRM_UT_* list must be kept in sync and in order. Fixes: f158936b60a7 ("drm: POC drm on dyndbg - use in core, 2 helpers, 3 drivers.") Signed-off-by: Jim Cromie <jim.cromie@gmail.com> --- . emphasize ABI non-change despite enum val change - Jani Nikula . reorder to back of patchset to follow API name changes. --- include/drm/drm_print.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)