diff options
| author | Tom Rini <[email protected]> | 2023-11-15 14:15:21 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2023-11-15 14:15:21 -0500 |
| commit | 169c3cc49e40758956ee6c310f7f59a6443826a1 (patch) | |
| tree | 469779cc9196adce361abe56c2ce27a6563e98ce /include | |
| parent | 92b27528d777ce85362af45e7d2974a6c856219b (diff) | |
| parent | 0d4d9f94c555577f78cddc372c307465fc92413e (diff) | |
Merge tag 'dm-pull-15nov23' of https://source.denx.de/u-boot/custodians/u-boot-dm
patman correct import of u_boot_pylib
correct long-standing EFI framebuffer bug
minor test refactor
Diffstat (limited to 'include')
| -rw-r--r-- | include/dm/util.h | 4 | ||||
| -rw-r--r-- | include/video.h | 9 |
2 files changed, 7 insertions, 6 deletions
diff --git a/include/dm/util.h b/include/dm/util.h index 89206cc4966..95c3527a37c 100644 --- a/include/dm/util.h +++ b/include/dm/util.h @@ -11,9 +11,7 @@ struct dm_stats; #if CONFIG_IS_ENABLED(DM_WARN) #define dm_warn(fmt...) log(LOGC_DM, LOGL_WARNING, ##fmt) #else -static inline void dm_warn(const char *fmt, ...) -{ -} +#define dm_warn(fmt...) log(LOGC_DM, LOGL_DEBUG, ##fmt) #endif struct list_head; diff --git a/include/video.h b/include/video.h index 5048116a3d5..4d8df9baaad 100644 --- a/include/video.h +++ b/include/video.h @@ -21,9 +21,12 @@ struct udevice; * @align: Frame-buffer alignment, indicating the memory boundary the frame * buffer should start on. If 0, 1MB is assumed * @size: Frame-buffer size, in bytes - * @base: Base address of frame buffer, 0 if not yet known - * @copy_base: Base address of a hardware copy of the frame buffer. See - * CONFIG_VIDEO_COPY. + * @base: Base address of frame buffer, 0 if not yet known. If CONFIG_VIDEO_COPY + * is enabled, this is the software copy, so writes to this will not be + * visible until vidconsole_sync_copy() is called. If CONFIG_VIDEO_COPY is + * disabled, this is the hardware framebuffer. + * @copy_base: Base address of a hardware copy of the frame buffer. If + * CONFIG_VIDEO_COPY is disabled, this is not used. * @copy_size: Size of copy framebuffer, used if @size is 0 * @hide_logo: Hide the logo (used for testing) */ |