drm/msm/mdp5: drop support for MSM8998, SDM630 and SDM660

Currently MDP5 3.x (MSM8998, SDM630 and SDM660) platforms are support
by both DPU and MDP5 drivers. Support for them in the DPU driver is
mature enough, so it's no longer sensible to keep them enabled in the
MDP5 driver. Not to mention that MSM8998 never used an MDP5 compatible
string. Drop support for the MDP5 3.x genration inside the MDP5
driver and migrate those to the DPU driver only.

Note: this will break if one uses the DT generated before v6.3 as they
had only the generic, "qcom,mdp5" compatible string for SDM630 and
SDM660. However granted that we had two LTS releases inbetween I don't
think it is an issue.

Patchwork: https://patchwork.freedesktop.org/patch/696491/
Link: https://lore.kernel.org/r/20251228-mdp5-drop-dpu3-v4-3-7497c3d39179@oss.qualcomm.com
Tested-by: Alexey Minnekhanov <alexeymin@minlexx.ru>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>

diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c
index df464f7c05bfa1d55b828c30b3e20513fb1298b0..69fef034d0df10a878087d4f3abeda8597eed094 100644 (file)
--- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c
+++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c
@@ -1097,310 +1097,6 @@ static const struct mdp5_cfg_hw msm8937_config = {
        .max_clk = 320000000,
 };
 
-static const struct mdp5_cfg_hw msm8998_config = {
-       .name = "msm8998",
-       .mdp = {
-               .count = 1,
-               .caps = MDP_CAP_DSC |
-                       MDP_CAP_CDM |
-                       MDP_CAP_SRC_SPLIT |
-                       0,
-       },
-       .ctl = {
-               .count = 5,
-               .base = { 0x01000, 0x01200, 0x01400, 0x01600, 0x01800 },
-               .flush_hw_mask = 0xf7ffffff,
-       },
-       .pipe_vig = {
-               .count = 4,
-               .base = { 0x04000, 0x06000, 0x08000, 0x0a000 },
-               .caps = MDP_PIPE_CAP_HFLIP      |
-                       MDP_PIPE_CAP_VFLIP      |
-                       MDP_PIPE_CAP_SCALE      |
-                       MDP_PIPE_CAP_CSC        |
-                       MDP_PIPE_CAP_DECIMATION |
-                       MDP_PIPE_CAP_SW_PIX_EXT |
-                       0,
-       },
-       .pipe_rgb = {
-               .count = 4,
-               .base = { 0x14000, 0x16000, 0x18000, 0x1a000 },
-               .caps = MDP_PIPE_CAP_HFLIP      |
-                       MDP_PIPE_CAP_VFLIP      |
-                       MDP_PIPE_CAP_SCALE      |
-                       MDP_PIPE_CAP_DECIMATION |
-                       MDP_PIPE_CAP_SW_PIX_EXT |
-                       0,
-       },
-       .pipe_dma = {
-               .count = 2, /* driver supports max of 2 currently */
-               .base = { 0x24000, 0x26000, 0x28000, 0x2a000 },
-               .caps = MDP_PIPE_CAP_HFLIP      |
-                       MDP_PIPE_CAP_VFLIP      |
-                       MDP_PIPE_CAP_SW_PIX_EXT |
-                       0,
-       },
-       .pipe_cursor = {
-               .count = 2,
-               .base = { 0x34000, 0x36000 },
-               .caps = MDP_PIPE_CAP_HFLIP      |
-                       MDP_PIPE_CAP_VFLIP      |
-                       MDP_PIPE_CAP_SW_PIX_EXT |
-                       MDP_PIPE_CAP_CURSOR     |
-                       0,
-       },
-
-       .lm = {
-               .count = 6,
-               .base = { 0x44000, 0x45000, 0x46000, 0x47000, 0x48000, 0x49000 },
-               .instances = {
-                               { .id = 0, .pp = 0, .dspp = 0,
-                                 .caps = MDP_LM_CAP_DISPLAY |
-                                         MDP_LM_CAP_PAIR, },
-                               { .id = 1, .pp = 1, .dspp = 1,
-                                 .caps = MDP_LM_CAP_DISPLAY, },
-                               { .id = 2, .pp = 2, .dspp = -1,
-                                 .caps = MDP_LM_CAP_DISPLAY |
-                                         MDP_LM_CAP_PAIR, },
-                               { .id = 3, .pp = -1, .dspp = -1,
-                                 .caps = MDP_LM_CAP_WB, },
-                               { .id = 4, .pp = -1, .dspp = -1,
-                                 .caps = MDP_LM_CAP_WB, },
-                               { .id = 5, .pp = 3, .dspp = -1,
-                                 .caps = MDP_LM_CAP_DISPLAY, },
-                            },
-               .nb_stages = 8,
-               .max_width = 2560,
-               .max_height = 0xFFFF,
-       },
-       .dspp = {
-               .count = 2,
-               .base = { 0x54000, 0x56000 },
-       },
-       .ad = {
-               .count = 3,
-               .base = { 0x78000, 0x78800, 0x79000 },
-       },
-       .pp = {
-               .count = 4,
-               .base = { 0x70000, 0x70800, 0x71000, 0x71800 },
-       },
-       .cdm = {
-               .count = 1,
-               .base = { 0x79200 },
-       },
-       .dsc = {
-               .count = 2,
-               .base = { 0x80000, 0x80400 },
-       },
-       .intf = {
-               .base = { 0x6a000, 0x6a800, 0x6b000, 0x6b800, 0x6c000 },
-               .connect = {
-                       [0] = INTF_eDP,
-                       [1] = INTF_DSI,
-                       [2] = INTF_DSI,
-                       [3] = INTF_HDMI,
-               },
-       },
-       .max_clk = 412500000,
-};
-
-static const struct mdp5_cfg_hw sdm630_config = {
-       .name = "sdm630",
-       .mdp = {
-               .count = 1,
-               .caps = MDP_CAP_CDM |
-                       MDP_CAP_SRC_SPLIT |
-                       0,
-       },
-       .ctl = {
-               .count = 5,
-               .base = { 0x01000, 0x01200, 0x01400, 0x01600, 0x01800 },
-               .flush_hw_mask = 0xf4ffffff,
-       },
-       .pipe_vig = {
-               .count = 1,
-               .base = { 0x04000 },
-               .caps = MDP_PIPE_CAP_HFLIP      |
-                       MDP_PIPE_CAP_VFLIP      |
-                       MDP_PIPE_CAP_SCALE      |
-                       MDP_PIPE_CAP_CSC        |
-                       MDP_PIPE_CAP_DECIMATION |
-                       MDP_PIPE_CAP_SW_PIX_EXT |
-                       0,
-       },
-       .pipe_rgb = {
-               .count = 4,
-               .base = { 0x14000, 0x16000, 0x18000, 0x1a000 },
-               .caps = MDP_PIPE_CAP_HFLIP      |
-                       MDP_PIPE_CAP_VFLIP      |
-                       MDP_PIPE_CAP_SCALE      |
-                       MDP_PIPE_CAP_DECIMATION |
-                       MDP_PIPE_CAP_SW_PIX_EXT |
-                       0,
-       },
-       .pipe_dma = {
-               .count = 2, /* driver supports max of 2 currently */
-               .base = { 0x24000, 0x26000, 0x28000 },
-               .caps = MDP_PIPE_CAP_HFLIP      |
-                       MDP_PIPE_CAP_VFLIP      |
-                       MDP_PIPE_CAP_SW_PIX_EXT |
-                       0,
-       },
-       .pipe_cursor = {
-               .count = 1,
-               .base = { 0x34000 },
-               .caps = MDP_PIPE_CAP_HFLIP      |
-                       MDP_PIPE_CAP_VFLIP      |
-                       MDP_PIPE_CAP_SW_PIX_EXT |
-                       MDP_PIPE_CAP_CURSOR     |
-                       0,
-       },
-
-       .lm = {
-               .count = 2,
-               .base = { 0x44000, 0x46000 },
-               .instances = {
-                               { .id = 0, .pp = 0, .dspp = 0,
-                                 .caps = MDP_LM_CAP_DISPLAY |
-                                         MDP_LM_CAP_PAIR, },
-                               { .id = 1, .pp = 1, .dspp = -1,
-                                 .caps = MDP_LM_CAP_WB, },
-                               },
-               .nb_stages = 8,
-               .max_width = 2048,
-               .max_height = 0xFFFF,
-       },
-       .dspp = {
-               .count = 1,
-               .base = { 0x54000 },
-       },
-       .ad = {
-               .count = 2,
-               .base = { 0x78000, 0x78800 },
-       },
-       .pp = {
-               .count = 3,
-               .base = { 0x70000, 0x71000, 0x72000 },
-       },
-       .cdm = {
-               .count = 1,
-               .base = { 0x79200 },
-       },
-       .intf = {
-               .base = { 0x6a000, 0x6a800 },
-               .connect = {
-                       [0] = INTF_DISABLED,
-                       [1] = INTF_DSI,
-               },
-       },
-       .max_clk = 412500000,
-};
-
-static const struct mdp5_cfg_hw sdm660_config = {
-       .name = "sdm660",
-       .mdp = {
-               .count = 1,
-               .caps = MDP_CAP_DSC |
-                       MDP_CAP_CDM |
-                       MDP_CAP_SRC_SPLIT |
-                       0,
-       },
-       .ctl = {
-               .count = 5,
-               .base = { 0x01000, 0x01200, 0x01400, 0x01600, 0x01800 },
-               .flush_hw_mask = 0xf4ffffff,
-       },
-       .pipe_vig = {
-               .count = 2,
-               .base = { 0x04000, 0x6000 },
-               .caps = MDP_PIPE_CAP_HFLIP      |
-                       MDP_PIPE_CAP_VFLIP      |
-                       MDP_PIPE_CAP_SCALE      |
-                       MDP_PIPE_CAP_CSC        |
-                       MDP_PIPE_CAP_DECIMATION |
-                       MDP_PIPE_CAP_SW_PIX_EXT |
-                       0,
-       },
-       .pipe_rgb = {
-               .count = 4,
-               .base = { 0x14000, 0x16000, 0x18000, 0x1a000 },
-               .caps = MDP_PIPE_CAP_HFLIP      |
-                       MDP_PIPE_CAP_VFLIP      |
-                       MDP_PIPE_CAP_SCALE      |
-                       MDP_PIPE_CAP_DECIMATION |
-                       MDP_PIPE_CAP_SW_PIX_EXT |
-                       0,
-       },
-       .pipe_dma = {
-               .count = 2, /* driver supports max of 2 currently */
-               .base = { 0x24000, 0x26000, 0x28000 },
-               .caps = MDP_PIPE_CAP_HFLIP      |
-                       MDP_PIPE_CAP_VFLIP      |
-                       MDP_PIPE_CAP_SW_PIX_EXT |
-                       0,
-       },
-       .pipe_cursor = {
-               .count = 1,
-               .base = { 0x34000 },
-               .caps = MDP_PIPE_CAP_HFLIP      |
-                       MDP_PIPE_CAP_VFLIP      |
-                       MDP_PIPE_CAP_SW_PIX_EXT |
-                       MDP_PIPE_CAP_CURSOR     |
-                       0,
-       },
-
-       .lm = {
-               .count = 4,
-               .base = { 0x44000, 0x45000, 0x46000, 0x49000 },
-               .instances = {
-                               { .id = 0, .pp = 0, .dspp = 0,
-                                 .caps = MDP_LM_CAP_DISPLAY |
-                                         MDP_LM_CAP_PAIR, },
-                               { .id = 1, .pp = 1, .dspp = 1,
-                                 .caps = MDP_LM_CAP_DISPLAY, },
-                               { .id = 2, .pp = 2, .dspp = -1,
-                                 .caps = MDP_LM_CAP_DISPLAY |
-                                         MDP_LM_CAP_PAIR, },
-                               { .id = 3, .pp = 3, .dspp = -1,
-                                 .caps = MDP_LM_CAP_WB, },
-                               },
-               .nb_stages = 8,
-               .max_width = 2560,
-               .max_height = 0xFFFF,
-       },
-       .dspp = {
-               .count = 2,
-               .base = { 0x54000, 0x56000 },
-       },
-       .ad = {
-               .count = 2,
-               .base = { 0x78000, 0x78800 },
-       },
-       .pp = {
-               .count = 5,
-               .base = { 0x70000, 0x70800, 0x71000, 0x71800, 0x72000 },
-       },
-       .cdm = {
-               .count = 1,
-               .base = { 0x79200 },
-       },
-       .dsc = {
-               .count = 2,
-               .base = { 0x80000, 0x80400 },
-       },
-       .intf = {
-               .base = { 0x6a000, 0x6a800, 0x6b000, 0x6b800 },
-               .connect = {
-                       [0] = INTF_DISABLED,
-                       [1] = INTF_DSI,
-                       [2] = INTF_DSI,
-                       [3] = INTF_HDMI,
-               },
-       },
-       .max_clk = 412500000,
-};
-
 static const struct mdp5_cfg_handler cfg_handlers_v1[] = {
        { .revision = 0, .config = { .hw = &msm8x74v1_config } },
        { .revision = 1, .config = { .hw = &msm8x26_config } },
@@ -1416,12 +1112,6 @@ static const struct mdp5_cfg_handler cfg_handlers_v1[] = {
        { .revision = 16, .config = { .hw = &msm8x53_config } },
 };
 
-static const struct mdp5_cfg_handler cfg_handlers_v3[] = {
-       { .revision = 0, .config = { .hw = &msm8998_config } },
-       { .revision = 2, .config = { .hw = &sdm660_config } },
-       { .revision = 3, .config = { .hw = &sdm630_config } },
-};
-
 const struct mdp5_cfg_hw *mdp5_cfg_get_hw_config(struct mdp5_cfg_handler *cfg_handler)
 {
        return cfg_handler->config.hw;
@@ -1455,10 +1145,6 @@ struct mdp5_cfg_handler *mdp5_cfg_init(struct mdp5_kms *mdp5_kms,
                cfg_handlers = cfg_handlers_v1;
                num_handlers = ARRAY_SIZE(cfg_handlers_v1);
                break;
-       case 3:
-               cfg_handlers = cfg_handlers_v3;
-               num_handlers = ARRAY_SIZE(cfg_handlers_v3);
-               break;
        default:
                DRM_DEV_ERROR(dev->dev, "unexpected MDP major version: v%d.%d\n",
                                major, minor);

diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c
index 7e977fec4100792394dccf59097a01c2b2556608..abee7149a9e87415a3ca9323573bcbd1d6b9bc50 100644 (file)
--- a/drivers/gpu/drm/msm/msm_drv.c
+++ b/drivers/gpu/drm/msm/msm_drv.c
@@ -960,23 +960,33 @@ static bool prefer_mdp5 = true;
 MODULE_PARM_DESC(prefer_mdp5, "Select whether MDP5 or DPU driver should be preferred");
 module_param(prefer_mdp5, bool, 0444);
 
+/* list all platforms that have been migrated from mdp5 to dpu driver */
+static const char *const msm_mdp5_dpu_migrated[] = {
+       /* there never was qcom,msm8998-mdp5 */
+       "qcom,sdm630-mdp5",
+       "qcom,sdm660-mdp5",
+       NULL
+};
+
 /* list all platforms supported by both mdp5 and dpu drivers */
 static const char *const msm_mdp5_dpu_migration[] = {
        "qcom,msm8917-mdp5",
        "qcom,msm8937-mdp5",
        "qcom,msm8953-mdp5",
        "qcom,msm8996-mdp5",
-       "qcom,sdm630-mdp5",
-       "qcom,sdm660-mdp5",
        NULL,
 };
 
 bool msm_disp_drv_should_bind(struct device *dev, bool dpu_driver)
 {
-       /* If it is not an MDP5 device, do not try MDP5 driver */
+       /* If it is not an MDP5 device, use DPU */
        if (!of_device_is_compatible(dev->of_node, "qcom,mdp5"))
                return dpu_driver;
 
+       /* If it is no longer supported by MDP5, use DPU */
+       if (of_device_compatible_match(dev->of_node, msm_mdp5_dpu_migrated))
+               return dpu_driver;
+
        /* If it is not in the migration list, use MDP5 */
        if (!of_device_compatible_match(dev->of_node, msm_mdp5_dpu_migration))
                return !dpu_driver;