diff --git a/sys/external/bsd/drm2/dist/drm/drm_fb_helper.c b/sys/external/bsd/drm2/dist/drm/drm_fb_helper.c index 1a727d1..7783488 100644 --- a/sys/external/bsd/drm2/dist/drm/drm_fb_helper.c +++ b/sys/external/bsd/drm2/dist/drm/drm_fb_helper.c @@ -323,12 +323,14 @@ bool drm_fb_helper_restore_fbdev_mode(struct drm_fb_helper *fb_helper) drm_plane_force_disable(plane); for (i = 0; i < fb_helper->crtc_count; i++) { + aprint_normal("%s: %s:%d .. %d \n",__func__, __FILE__,__LINE__, i); struct drm_mode_set *mode_set = &fb_helper->crtc_info[i].mode_set; struct drm_crtc *crtc = mode_set->crtc; int ret; if (crtc->funcs->cursor_set) { ret = crtc->funcs->cursor_set(crtc, NULL, 0, 0, 0); + aprint_normal("%s: %s:%d .. %x \n",__func__, __FILE__,__LINE__, ret); if (ret) error = true; } diff --git a/sys/external/bsd/drm2/dist/drm/drm_stub.c b/sys/external/bsd/drm2/dist/drm/drm_stub.c index 550a653..b0d9c41 100644 --- a/sys/external/bsd/drm2/dist/drm/drm_stub.c +++ b/sys/external/bsd/drm2/dist/drm/drm_stub.c @@ -42,7 +42,7 @@ #include #include -unsigned int drm_debug = 0; /* 1 to enable debug output */ +unsigned int drm_debug = 1; /* 1 to enable debug output */ EXPORT_SYMBOL(drm_debug); unsigned int drm_rnodes = 0; /* 1 to enable experimental render nodes API */ @@ -92,13 +92,13 @@ struct class *drm_class; struct dentry *drm_debugfs_root; #endif -int drm_err(const char *func, const char *format, ...) +int drm_err(const char *file_name, const char *func, const char *format, ...) { #ifdef __NetBSD__ va_list args; va_start(args, format); - printf("DRM error in %s: ", func); + printf("DRM error in %s %s: ", file_name, func); vprintf(format, args); va_end(args); @@ -122,13 +122,13 @@ int drm_err(const char *func, const char *format, ...) } EXPORT_SYMBOL(drm_err); -void drm_ut_debug_printk(const char *function_name, const char *format, ...) +void drm_ut_debug_printk(const char *file_name, const char *function_name, const char *format, ...) { #ifdef __NetBSD__ va_list args; va_start(args, format); - printf("DRM debug in %s: ", function_name); + printf("DRM debug in %s %s: ", file_name, function_name); vprintf(format, args); va_end(args); #else diff --git a/sys/external/bsd/drm2/dist/include/drm/drmP.h b/sys/external/bsd/drm2/dist/include/drm/drmP.h index 682fe5b..f6a4120 100644 --- a/sys/external/bsd/drm2/dist/include/drm/drmP.h +++ b/sys/external/bsd/drm2/dist/include/drm/drmP.h @@ -134,11 +134,12 @@ struct videomode; #define DRM_UT_KMS 0x04 #define DRM_UT_PRIME 0x08 -extern __printf(2, 3) -void drm_ut_debug_printk(const char *function_name, +extern __printf(3, 4) +void drm_ut_debug_printk(const char *file_name, + const char *function_name, const char *format, ...); -extern __printf(2, 3) -int drm_err(const char *func, const char *format, ...); +extern __printf(3, 4) +int drm_err(const char *file_name, const char *func, const char *format, ...); /***********************************************************************/ /** \name DRM template customization defaults */ @@ -187,7 +188,7 @@ int drm_err(const char *func, const char *format, ...); * \param arg arguments */ #define DRM_ERROR(fmt, ...) \ - drm_err(__func__, fmt, ##__VA_ARGS__) + drm_err(__FILE__, __func__, fmt, ##__VA_ARGS__) #ifdef __NetBSD__ @@ -230,23 +231,23 @@ int drm_err(const char *func, const char *format, ...); #define DRM_DEBUG(fmt, args...) \ do { \ if (unlikely(drm_debug & DRM_UT_CORE)) \ - drm_ut_debug_printk(__func__, fmt, ##args); \ + drm_ut_debug_printk(__FILE__, __func__ , fmt, ##args); \ } while (0) #define DRM_DEBUG_DRIVER(fmt, args...) \ do { \ if (unlikely(drm_debug & DRM_UT_DRIVER)) \ - drm_ut_debug_printk(__func__, fmt, ##args); \ + drm_ut_debug_printk(__FILE__, __func__ , fmt, ##args); \ } while (0) #define DRM_DEBUG_KMS(fmt, args...) \ do { \ if (unlikely(drm_debug & DRM_UT_KMS)) \ - drm_ut_debug_printk(__func__, fmt, ##args); \ + drm_ut_debug_printk(__FILE__, __func__ , fmt, ##args); \ } while (0) #define DRM_DEBUG_PRIME(fmt, args...) \ do { \ if (unlikely(drm_debug & DRM_UT_PRIME)) \ - drm_ut_debug_printk(__func__, fmt, ##args); \ + drm_ut_debug_printk(__FILE__, __func__ , fmt, ##args); \ } while (0) #else #define DRM_DEBUG_DRIVER(fmt, args...) do { } while (0)