Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
drm/msm/dpu: drop VBIF index from the struct dpu_hw_vbif
Since we don't support and don't use VBIF_NRT, VBIF_RT is the only
possible VBIF type. To simplify the driver, drop vbif_idx from the VBIF
instance structure. As the last users of VBIF_RT and enum dpu_vbif are
gone, drop them too.
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/707779/
Link: https://lore.kernel.org/r/20260227-drop-vbif-nrt-v1-7-2b97d0438182@oss.qualcomm.com
+8
-28
-4
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_mdss.h
-4
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_mdss.h
-1
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_vbif.c
-1
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_vbif.c
-1
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_vbif.h
-1
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_vbif.h
+8
-22
drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c
+8
-22
drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c
···
11
11
#include "dpu_hw_vbif.h"
12
12
#include "dpu_trace.h"
13
13
14
-
static const char *dpu_vbif_name(enum dpu_vbif idx)
15
-
{
16
-
switch (idx) {
17
-
case VBIF_RT:
18
-
return "VBIF_RT";
19
-
default:
20
-
return "??";
21
-
}
22
-
}
23
-
24
14
/**
25
15
* _dpu_vbif_wait_for_xin_halt - wait for the xin to halt
26
16
* @vbif: Pointer to hardware vbif driver
···
42
52
43
53
if (!status) {
44
54
rc = -ETIMEDOUT;
45
-
DPU_ERROR("%s client %d not halting. TIMEDOUT.\n",
46
-
dpu_vbif_name(vbif->idx), xin_id);
55
+
DPU_ERROR("VBIF client %d not halting. TIMEDOUT.\n", xin_id);
47
56
} else {
48
57
rc = 0;
49
-
DRM_DEBUG_ATOMIC("%s client %d is halted\n",
50
-
dpu_vbif_name(vbif->idx), xin_id);
58
+
DRM_DEBUG_ATOMIC("VBIF client %d is halted\n", xin_id);
51
59
}
52
60
53
61
return rc;
···
85
97
}
86
98
}
87
99
88
-
DRM_DEBUG_ATOMIC("%s xin:%d w:%d h:%d fps:%d pps:%llu ot:%u\n",
89
-
dpu_vbif_name(vbif->idx), params->xin_id,
90
-
params->width, params->height, params->frame_rate,
91
-
pps, *ot_lim);
100
+
DRM_DEBUG_ATOMIC("VBIF xin:%d w:%d h:%d fps:%d pps:%llu ot:%u\n",
101
+
params->xin_id,
102
+
params->width, params->height, params->frame_rate,
103
+
pps, *ot_lim);
92
104
}
93
105
94
106
/**
···
131
143
}
132
144
133
145
exit:
134
-
DRM_DEBUG_ATOMIC("%s xin:%d ot_lim:%d\n",
135
-
dpu_vbif_name(vbif->idx), params->xin_id, ot_lim);
146
+
DRM_DEBUG_ATOMIC("VBIF xin:%d ot_lim:%d\n", params->xin_id, ot_lim);
136
147
return ot_lim;
137
148
}
138
149
···
239
252
if (vbif && vbif->ops.clear_errors) {
240
253
vbif->ops.clear_errors(vbif, &pnd, &src);
241
254
if (pnd || src) {
242
-
DRM_DEBUG_KMS("%s: pnd 0x%X, src 0x%X\n",
243
-
dpu_vbif_name(vbif->idx), pnd, src);
255
+
DRM_DEBUG_KMS("VBIF: pnd 0x%X, src 0x%X\n", pnd, src);
244
256
}
245
257
}
246
258
}