Skip to content

Commit 553c5a4

Browse files
Ondrej Jirmanmmind
authored andcommitted
drm/rockchip: dsi: Fix VOP selection on SoCs that support it
lcdsel_grf_reg is defined as u32, so "< 0" comaprison is always false, which breaks VOP selection on eg. RK3399. Compare against 0. Fixes: f3aaa61 ("drm/rockchip: dsi: add rk3568 support") Signed-off-by: Ondrej Jirman <megi@xff.cz> Tested-by: Chris Morgan <macromorgan@hotmail.com> Signed-off-by: Heiko Stuebner <heiko@sntech.de> Link: https://patchwork.freedesktop.org/patch/msgid/20221023160747.607943-1-megi@xff.cz
1 parent ab78c74 commit 553c5a4

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -752,7 +752,7 @@ static void dw_mipi_dsi_rockchip_config(struct dw_mipi_dsi_rockchip *dsi)
752752
static void dw_mipi_dsi_rockchip_set_lcdsel(struct dw_mipi_dsi_rockchip *dsi,
753753
int mux)
754754
{
755-
if (dsi->cdata->lcdsel_grf_reg < 0)
755+
if (dsi->cdata->lcdsel_grf_reg)
756756
regmap_write(dsi->grf_regmap, dsi->cdata->lcdsel_grf_reg,
757757
mux ? dsi->cdata->lcdsel_lit : dsi->cdata->lcdsel_big);
758758
}
@@ -1643,7 +1643,6 @@ static const struct rockchip_dw_dsi_chip_data rk3399_chip_data[] = {
16431643
static const struct rockchip_dw_dsi_chip_data rk3568_chip_data[] = {
16441644
{
16451645
.reg = 0xfe060000,
1646-
.lcdsel_grf_reg = -1,
16471646
.lanecfg1_grf_reg = RK3568_GRF_VO_CON2,
16481647
.lanecfg1 = HIWORD_UPDATE(0, RK3568_DSI0_SKEWCALHS |
16491648
RK3568_DSI0_FORCETXSTOPMODE |
@@ -1653,7 +1652,6 @@ static const struct rockchip_dw_dsi_chip_data rk3568_chip_data[] = {
16531652
},
16541653
{
16551654
.reg = 0xfe070000,
1656-
.lcdsel_grf_reg = -1,
16571655
.lanecfg1_grf_reg = RK3568_GRF_VO_CON3,
16581656
.lanecfg1 = HIWORD_UPDATE(0, RK3568_DSI1_SKEWCALHS |
16591657
RK3568_DSI1_FORCETXSTOPMODE |

0 commit comments

Comments
 (0)