diff options
author | Jani Nikula <jani.nikula@intel.com> | 2025-02-05 19:12:37 +0200 |
---|---|---|
committer | Jani Nikula <jani.nikula@intel.com> | 2025-02-05 19:12:37 +0200 |
commit | ea9f8f2b21795a5d80418a655bcb212d5b89e08f (patch) | |
tree | 16190fb8cb798e7643667784b5a85f60de1f755e /drivers/gpu/drm/msm/dsi/dsi_cfg.c | |
parent | bdcdb913c2d36447ea49d33774e5d6093c55d6f7 (diff) | |
parent | 2014c95afecee3e76ca4a56956a936e23283f05b (diff) |
Merge drm/drm-next into drm-intel-next
Sync with v6.14-rc1.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers/gpu/drm/msm/dsi/dsi_cfg.c')
-rw-r--r-- | drivers/gpu/drm/msm/dsi/dsi_cfg.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/msm/dsi/dsi_cfg.c b/drivers/gpu/drm/msm/dsi/dsi_cfg.c index 10ba7d153d1c..7754dcec33d0 100644 --- a/drivers/gpu/drm/msm/dsi/dsi_cfg.c +++ b/drivers/gpu/drm/msm/dsi/dsi_cfg.c @@ -286,6 +286,8 @@ static const struct msm_dsi_cfg_handler dsi_cfg_handlers[] = { &sdm845_dsi_cfg, &msm_dsi_6g_v2_host_ops}, {MSM_DSI_VER_MAJOR_6G, MSM_DSI_6G_VER_MINOR_V2_3_0, &sdm845_dsi_cfg, &msm_dsi_6g_v2_host_ops}, + {MSM_DSI_VER_MAJOR_6G, MSM_DSI_6G_VER_MINOR_V2_3_1, + &sdm845_dsi_cfg, &msm_dsi_6g_v2_host_ops}, {MSM_DSI_VER_MAJOR_6G, MSM_DSI_6G_VER_MINOR_V2_4_0, &sdm845_dsi_cfg, &msm_dsi_6g_v2_host_ops}, {MSM_DSI_VER_MAJOR_6G, MSM_DSI_6G_VER_MINOR_V2_4_1, |