summaryrefslogtreecommitdiffstats
path: root/include/drm/drm_mode_config.h
diff options
context:
space:
mode:
authorGustavo Padovan <gustavo.padovan@collabora.com>2017-12-04 16:04:45 -0200
committerGustavo Padovan <gustavo.padovan@collabora.com>2017-12-04 16:04:45 -0200
commit7b47c66cfa203288c43851260edeeb0fae56f692 (patch)
treefa729735fdaf1d77fbbf13062fd53c31b59d682d /include/drm/drm_mode_config.h
parentca0e68e21aae10220eff71a297e7d794425add77 (diff)
parentca797d29cd63e7b71b4eea29aff3b1cefd1ecb59 (diff)
downloadlinux-7b47c66cfa203288c43851260edeeb0fae56f692.tar.bz2
Merge arlied/drm-next into drm-misc-next
We need to pull 66660d4cf21b (drm: add connector info/property for non-desktop displays [v2]) into drm-misc-next to continue the development of the display rotation series. Effectively this also pulls 4.15-r2 into drm-misc-next. Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.com>
Diffstat (limited to 'include/drm/drm_mode_config.h')
-rw-r--r--include/drm/drm_mode_config.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/include/drm/drm_mode_config.h b/include/drm/drm_mode_config.h
index eb3b8dba3e2c..f7ef0023d68b 100644
--- a/include/drm/drm_mode_config.h
+++ b/include/drm/drm_mode_config.h
@@ -728,6 +728,13 @@ struct drm_mode_config {
*/
struct drm_property *suggested_y_property;
+ /**
+ * @non_desktop_property: Optional connector property with a hint
+ * that device isn't a standard display, and the console/desktop,
+ * should not be displayed on it.
+ */
+ struct drm_property *non_desktop_property;
+
/* dumb ioctl parameters */
uint32_t preferred_depth, prefer_shadow;