github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-29 17:43:52 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

drm/msm/dpu: drop VBIF index from the struct dpu_hw_vbif

Browse Source 
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
This commit is contained in:
Dmitry Baryshkov 2026-02-27 20:36:46 +02:00
parent 1ce6168887
commit 7c5166fd79
4 changed files with 8 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_mdss.h
View File

@ -284,10 +284,6 @@ enum dpu_wd_timer {
WD_TIMER_MAX
};
enum dpu_vbif {
VBIF_RT,
};
/**
* enum dpu_3d_blend_mode
* Desribes how the 3d data is blended

1
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_vbif.c
View File

@ -236,7 +236,6 @@ struct dpu_hw_vbif *dpu_hw_vbif_init(struct drm_device *dev,
/*
* Assign ops
*/
c->idx = VBIF_RT;
c->cap = cfg;
_setup_vbif_ops(&c->ops, c->cap->features);

1
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_vbif.h
View File

@ -98,7 +98,6 @@ struct dpu_hw_vbif {
struct dpu_hw_blk_reg_map hw;
/* vbif */
enum dpu_vbif idx;
const struct dpu_vbif_cfg *cap;
/* ops */

30
drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c
View File

@ -11,16 +11,6 @@
#include "dpu_hw_vbif.h"
#include "dpu_trace.h"
static const char *dpu_vbif_name(enum dpu_vbif idx)
{
switch (idx) {
case VBIF_RT:
return "VBIF_RT";
default:
return "??";
}
}
/**
* _dpu_vbif_wait_for_xin_halt - wait for the xin to halt
* @vbif: Pointer to hardware vbif driver
@ -52,12 +42,10 @@ static int _dpu_vbif_wait_for_xin_halt(struct dpu_hw_vbif *vbif, u32 xin_id)
if (!status) {
rc = -ETIMEDOUT;
DPU_ERROR("%s client %d not halting. TIMEDOUT.\n",
dpu_vbif_name(vbif->idx), xin_id);
DPU_ERROR("VBIF client %d not halting. TIMEDOUT.\n", xin_id);
} else {
rc = 0;
DRM_DEBUG_ATOMIC("%s client %d is halted\n",
dpu_vbif_name(vbif->idx), xin_id);
DRM_DEBUG_ATOMIC("VBIF client %d is halted\n", xin_id);
}
return rc;
@ -97,10 +85,10 @@ static void _dpu_vbif_apply_dynamic_ot_limit(struct dpu_hw_vbif *vbif,
}
}
DRM_DEBUG_ATOMIC("%s xin:%d w:%d h:%d fps:%d pps:%llu ot:%u\n",
dpu_vbif_name(vbif->idx), params->xin_id,
params->width, params->height, params->frame_rate,
pps, *ot_lim);
DRM_DEBUG_ATOMIC("VBIF xin:%d w:%d h:%d fps:%d pps:%llu ot:%u\n",
params->xin_id,
params->width, params->height, params->frame_rate,
pps, *ot_lim);
}
/**
@ -143,8 +131,7 @@ static u32 _dpu_vbif_get_ot_limit(struct dpu_hw_vbif *vbif,
}
exit:
DRM_DEBUG_ATOMIC("%s xin:%d ot_lim:%d\n",
dpu_vbif_name(vbif->idx), params->xin_id, ot_lim);
DRM_DEBUG_ATOMIC("VBIF xin:%d ot_lim:%d\n", params->xin_id, ot_lim);
return ot_lim;
}
@ -252,8 +239,7 @@ void dpu_vbif_clear_errors(struct dpu_kms *dpu_kms)
if (vbif && vbif->ops.clear_errors) {
vbif->ops.clear_errors(vbif, &pnd, &src);
if (pnd || src) {
DRM_DEBUG_KMS("%s: pnd 0x%X, src 0x%X\n",
dpu_vbif_name(vbif->idx), pnd, src);
DRM_DEBUG_KMS("VBIF: pnd 0x%X, src 0x%X\n", pnd, src);
}
}
}