diff options
| author | Julian Veit <Claymore1298@gmail.com> | 2021-04-17 08:39:31 +0200 |
|---|---|---|
| committer | Julian Veit <Claymore1298@gmail.com> | 2021-04-17 08:39:31 +0200 |
| commit | f080e3dbaa060bf3d59560611b628a25fab6df7b (patch) | |
| tree | 811ff5236a4568a3331e17fcfd873642aca0fbdb /drivers/gpu/drm/imx/imx-ldb.c | |
| parent | bc18b8fd8a1c97d87a8a6274a35afdfaa8d9f385 (diff) | |
| parent | edfe8b68de5392cc7b759f7723b6494422cb5359 (diff) | |
Merge branch 'linux-stable' into HEADr11.1-backup
Change-Id: I243aa151ea3e897496378bb24f94cb31d36d770d
Diffstat (limited to 'drivers/gpu/drm/imx/imx-ldb.c')
| -rw-r--r-- | drivers/gpu/drm/imx/imx-ldb.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/gpu/drm/imx/imx-ldb.c b/drivers/gpu/drm/imx/imx-ldb.c index 2df407b2b0da..3a9d06de81b4 100644 --- a/drivers/gpu/drm/imx/imx-ldb.c +++ b/drivers/gpu/drm/imx/imx-ldb.c @@ -212,6 +212,11 @@ static void imx_ldb_encoder_enable(struct drm_encoder *encoder) int dual = ldb->ldb_ctrl & LDB_SPLIT_MODE_EN; int mux = drm_of_encoder_active_port_id(imx_ldb_ch->child, encoder); + if (mux < 0 || mux >= ARRAY_SIZE(ldb->clk_sel)) { + dev_warn(ldb->dev, "%s: invalid mux %d\n", __func__, mux); + return; + } + drm_panel_prepare(imx_ldb_ch->panel); if (dual) { @@ -270,6 +275,11 @@ imx_ldb_encoder_atomic_mode_set(struct drm_encoder *encoder, int mux = drm_of_encoder_active_port_id(imx_ldb_ch->child, encoder); u32 bus_format = imx_ldb_ch->bus_format; + if (mux < 0 || mux >= ARRAY_SIZE(ldb->clk_sel)) { + dev_warn(ldb->dev, "%s: invalid mux %d\n", __func__, mux); + return; + } + if (mode->clock > 170000) { dev_warn(ldb->dev, "%s: mode exceeds 170 MHz pixel clock\n", __func__); |