Skip to content

Commit f518f6c

Browse files
lumagrobclark
authored andcommitted
drm/msm/dsi: add three helper functions
Add three helper functions to be used by display drivers for setting up encoders. Signed-off-by: Dmitry Baryshkov <[email protected]> Reviewed-by: Abhinav Kumar <[email protected]> Link: https://lore.kernel.org/r/[email protected] Reviewed-by: Bjorn Andersson <[email protected]> Signed-off-by: Dmitry Baryshkov <[email protected]> Signed-off-by: Rob Clark <[email protected]>
1 parent 6183606 commit f518f6c

File tree

3 files changed

+33
-10
lines changed

3 files changed

+33
-10
lines changed

drivers/gpu/drm/msm/dsi/dsi.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,13 @@ struct drm_encoder *msm_dsi_get_encoder(struct msm_dsi *msm_dsi)
1313
return msm_dsi->encoder;
1414
}
1515

16+
bool msm_dsi_is_cmd_mode(struct msm_dsi *msm_dsi)
17+
{
18+
unsigned long host_flags = msm_dsi_host_get_mode_flags(msm_dsi->host);
19+
20+
return !(host_flags & MIPI_DSI_MODE_VIDEO);
21+
}
22+
1623
static int dsi_get_phy(struct msm_dsi *msm_dsi)
1724
{
1825
struct platform_device *pdev = msm_dsi->pdev;

drivers/gpu/drm/msm/dsi/dsi_manager.c

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -215,12 +215,6 @@ static int dsi_mgr_bridge_get_id(struct drm_bridge *bridge)
215215
return dsi_bridge->id;
216216
}
217217

218-
static bool dsi_mgr_is_cmd_mode(struct msm_dsi *msm_dsi)
219-
{
220-
unsigned long host_flags = msm_dsi_host_get_mode_flags(msm_dsi->host);
221-
return !(host_flags & MIPI_DSI_MODE_VIDEO);
222-
}
223-
224218
void msm_dsi_manager_setup_encoder(int id)
225219
{
226220
struct msm_dsi *msm_dsi = dsi_mgr_get_dsi(id);
@@ -230,7 +224,7 @@ void msm_dsi_manager_setup_encoder(int id)
230224

231225
if (encoder && kms->funcs->set_encoder_mode)
232226
kms->funcs->set_encoder_mode(kms, encoder,
233-
dsi_mgr_is_cmd_mode(msm_dsi));
227+
msm_dsi_is_cmd_mode(msm_dsi));
234228
}
235229

236230
static int msm_dsi_manager_panel_init(struct drm_connector *conn, u8 id)
@@ -275,7 +269,7 @@ static int msm_dsi_manager_panel_init(struct drm_connector *conn, u8 id)
275269
if (other_dsi && other_dsi->panel && kms->funcs->set_split_display) {
276270
kms->funcs->set_split_display(kms, master_dsi->encoder,
277271
slave_dsi->encoder,
278-
dsi_mgr_is_cmd_mode(msm_dsi));
272+
msm_dsi_is_cmd_mode(msm_dsi));
279273
}
280274

281275
out:
@@ -851,3 +845,12 @@ void msm_dsi_manager_unregister(struct msm_dsi *msm_dsi)
851845
msm_dsim->dsi[msm_dsi->id] = NULL;
852846
}
853847

848+
bool msm_dsi_is_bonded_dsi(struct msm_dsi *msm_dsi)
849+
{
850+
return IS_BONDED_DSI();
851+
}
852+
853+
bool msm_dsi_is_master_dsi(struct msm_dsi *msm_dsi)
854+
{
855+
return IS_MASTER_DSI_LINK(msm_dsi->id);
856+
}

drivers/gpu/drm/msm/msm_drv.h

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,9 @@ void __exit msm_dsi_unregister(void);
349349
int msm_dsi_modeset_init(struct msm_dsi *msm_dsi, struct drm_device *dev,
350350
struct drm_encoder *encoder);
351351
void msm_dsi_snapshot(struct msm_disp_state *disp_state, struct msm_dsi *msm_dsi);
352-
352+
bool msm_dsi_is_cmd_mode(struct msm_dsi *msm_dsi);
353+
bool msm_dsi_is_bonded_dsi(struct msm_dsi *msm_dsi);
354+
bool msm_dsi_is_master_dsi(struct msm_dsi *msm_dsi);
353355
#else
354356
static inline void __init msm_dsi_register(void)
355357
{
@@ -366,7 +368,18 @@ static inline int msm_dsi_modeset_init(struct msm_dsi *msm_dsi,
366368
static inline void msm_dsi_snapshot(struct msm_disp_state *disp_state, struct msm_dsi *msm_dsi)
367369
{
368370
}
369-
371+
static inline bool msm_dsi_is_cmd_mode(struct msm_dsi *msm_dsi)
372+
{
373+
return false;
374+
}
375+
static inline bool msm_dsi_is_bonded_dsi(struct msm_dsi *msm_dsi)
376+
{
377+
return false;
378+
}
379+
static inline bool msm_dsi_is_master_dsi(struct msm_dsi *msm_dsi)
380+
{
381+
return false;
382+
}
370383
#endif
371384

372385
#ifdef CONFIG_DRM_MSM_DP

0 commit comments

Comments
 (0)