From 52eaf83d7b1766814d17a684c84d03c26ec5fe98 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 22 Jan 2021 16:31:08 +0100 Subject: [PATCH] ANDROID: fix up merge issues in drm_mipi_dsi.h 0e9cdc986313 ("Revert "ANDROID: include: drm: support unicasting mipi cmds to dsi ctrls"") left an out-of-tree difference, so fix that up. Reported-by: Matthias Maennich Change-Id: I27ae5707b35bb25ec3ff5c55ab07fb712c496642 --- include/drm/drm_mipi_dsi.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/drm/drm_mipi_dsi.h b/include/drm/drm_mipi_dsi.h index 651b326d6aff..de4ee7c36632 100644 --- a/include/drm/drm_mipi_dsi.h +++ b/include/drm/drm_mipi_dsi.h @@ -19,6 +19,7 @@ struct drm_dsc_picture_parameter_set; #define MIPI_DSI_MSG_REQ_ACK BIT(0) /* use Low Power Mode to transmit message */ #define MIPI_DSI_MSG_USE_LPM BIT(1) +/* Stack all commands until lastcommand bit and trigger all in one go */ #define MIPI_DSI_MSG_LASTCOMMAND BIT(3) /**