drm/msm/dpu: drop VBIF_NRT handling

The second VBIF instance, VBIF_NRT, is only used for the separate inline
rotator block. It is unsupported by the DPU driver and will require a
separate driver (or separate instance of the DPU device).

The only possible user of VBIF_NRT is writeback on MSM8996, however
writeback on that platform is currently unsupported and it's not worth
keeping extra complexity for the sake of that single legacy platform.

None of the hardware catalogs entries actually declare VBIF_NRT, so it
is left in its default state.

Stop pretending that DPU driver cares about VBIF_NRT and drop it.

Reported-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Patchwork: https://patchwork.freedesktop.org/patch/707773/
Link: https://lore.kernel.org/r/20260227-drop-vbif-nrt-v1-1-2b97d0438182@oss.qualcomm.com

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_mdss.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_mdss.h
index 046b683d4c66d69152bdc33f1f564dc5918cb226..f3cb827034cc88bed73b2529c8b013a368934a38 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_mdss.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_mdss.h
@@ -286,7 +286,6 @@ enum dpu_wd_timer {
 
 enum dpu_vbif {
        VBIF_RT,
-       VBIF_NRT,
        VBIF_MAX,
 };
 

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
index 19512042d42bde1cdd15442412dfaa147da2e76c..151592373551dc1a373729e711cbd31db53446d5 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
@@ -1357,14 +1357,6 @@ static int dpu_kms_mmap_mdp5(struct dpu_kms *dpu_kms)
                return ret;
        }
 
-       dpu_kms->vbif[VBIF_NRT] = msm_ioremap_mdss(mdss_dev,
-                                                  dpu_kms->pdev,
-                                                  "vbif_nrt_phys");
-       if (IS_ERR(dpu_kms->vbif[VBIF_NRT])) {
-               dpu_kms->vbif[VBIF_NRT] = NULL;
-               DPU_DEBUG("VBIF NRT is not defined");
-       }
-
        return 0;
 }
 
@@ -1390,12 +1382,6 @@ static int dpu_kms_mmap_dpu(struct dpu_kms *dpu_kms)
                return ret;
        }
 
-       dpu_kms->vbif[VBIF_NRT] = msm_ioremap_quiet(pdev, "vbif_nrt");
-       if (IS_ERR(dpu_kms->vbif[VBIF_NRT])) {
-               dpu_kms->vbif[VBIF_NRT] = NULL;
-               DPU_DEBUG("VBIF NRT is not defined");
-       }
-
        return 0;
 }
 

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c
index 2a551e455aa30de548a97461ca98b9ba1f75f23f..ede38b3c6f8c18aad5a5b20f4182888a54200a10 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c
@@ -24,8 +24,6 @@ static const char *dpu_vbif_name(enum dpu_vbif idx)
        switch (idx) {
        case VBIF_RT:
                return "VBIF_RT";
-       case VBIF_NRT:
-               return "VBIF_NRT";
        default:
                return "??";
        }