diff options
| author | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2019-01-23 01:51:36 +0300 |
|---|---|---|
| committer | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2019-01-23 01:51:36 +0300 |
| commit | f42fb2317ffcbd005eeb22b1e49020821a11e23a (patch) | |
| tree | d89ccd0c9086c492a32da7ce4c2486c99ed3e805 /include/drm/bridge/dw_mipi_dsi.h | |
| parent | 25f9cebd7a52ddf15405d74fb5fd4c374f301983 (diff) | |
| parent | f164a94c2c87752caeb1a3cbe068c440e7f7921f (diff) | |
| download | linux-f42fb2317ffcbd005eeb22b1e49020821a11e23a.tar.xz | |
Merge drm/drm-next into drm-intel-next-queued
We need avi infoframe stuff who got merged via drm-misc
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Diffstat (limited to 'include/drm/bridge/dw_mipi_dsi.h')
| -rw-r--r-- | include/drm/bridge/dw_mipi_dsi.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/drm/bridge/dw_mipi_dsi.h b/include/drm/bridge/dw_mipi_dsi.h index 48a671e782ca..7d3dd69a5caa 100644 --- a/include/drm/bridge/dw_mipi_dsi.h +++ b/include/drm/bridge/dw_mipi_dsi.h @@ -14,7 +14,8 @@ struct dw_mipi_dsi; struct dw_mipi_dsi_phy_ops { int (*init)(void *priv_data); - int (*get_lane_mbps)(void *priv_data, struct drm_display_mode *mode, + int (*get_lane_mbps)(void *priv_data, + const struct drm_display_mode *mode, unsigned long mode_flags, u32 lanes, u32 format, unsigned int *lane_mbps); }; |