diff options
| author | Joonas Lahtinen <joonas.lahtinen@linux.intel.com> | 2021-06-02 10:18:45 +0300 |
|---|---|---|
| committer | Joonas Lahtinen <joonas.lahtinen@linux.intel.com> | 2021-06-02 10:18:45 +0300 |
| commit | 942baad211336efefb93a8369478888ab845c450 (patch) | |
| tree | d959f4b4c0680e6b589cc9684bd489f09ee65fd8 /include/linux/console_struct.h | |
| parent | 35cbd91eb541e001f6e2648c56abb5361e3d6774 (diff) | |
| parent | ccd1950c2f7e38ae45aeefb99a08b39407cd6c63 (diff) | |
| download | cachepc-linux-942baad211336efefb93a8369478888ab845c450.tar.gz cachepc-linux-942baad211336efefb93a8369478888ab845c450.zip | |
Merge drm/drm-next into drm-intel-gt-next
Pulling in -rc2 fixes and TTM changes that next upcoming patches depend
on.
Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Diffstat (limited to 'include/linux/console_struct.h')
| -rw-r--r-- | include/linux/console_struct.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/console_struct.h b/include/linux/console_struct.h index 153734816b49..d5b9c8d40c18 100644 --- a/include/linux/console_struct.h +++ b/include/linux/console_struct.h @@ -101,6 +101,7 @@ struct vc_data { unsigned int vc_rows; unsigned int vc_size_row; /* Bytes per row */ unsigned int vc_scan_lines; /* # of scan lines */ + unsigned int vc_cell_height; /* CRTC character cell height */ unsigned long vc_origin; /* [!] Start of real screen */ unsigned long vc_scr_end; /* [!] End of real screen */ unsigned long vc_visible_origin; /* [!] Top of visible window */ |