mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 10:40:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

drm/tidss: dispc: Get rid of FLD_VAL

Browse source 
The FLD_VAL function is an equivalent to what FIELD_PREP + GENMASK
provide, so let's drop it and switch to the latter.

Signed-off-by: Maxime Ripard <mripard@kernel.org>
Link: https://lore.kernel.org/r/20250827-drm-tidss-field-api-v3-4-7689b664cc63@kernel.org
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
This commit is contained in:
Maxime Ripard 2025-08-27 17:12:35 +02:00 committed by Tomi Valkeinen
parent db7c13ebf2
commit 9accc8b10d
1 changed files with 26 additions and 32 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

58
drivers/gpu/drm/tidss/tidss_dispc.c
View file

@ -594,13 +594,6 @@ void tidss_disable_oldi(struct tidss_device *tidss, u32 hw_videoport)
* number. For example 7:0 * number. For example 7:0
*/ */
#define FLD_VAL(val, start, end) \
({ \
int _end_inner = (end); \
u32 _new_val = ((val) << _end_inner) & GENMASK((start), _end_inner); \
_new_val; \
})
#define FLD_GET(val, start, end) \ #define FLD_GET(val, start, end) \
({ \ ({ \
int _end = (end); \ int _end = (end); \
@ -612,7 +605,7 @@ void tidss_disable_oldi(struct tidss_device *tidss, u32 hw_videoport)
({ \ ({ \
int _start = (start), _end = (end); \ int _start = (start), _end = (end); \
u32 _masked_val = (orig) & ~GENMASK(_start, _end); \ u32 _masked_val = (orig) & ~GENMASK(_start, _end); \
u32 _new_val = _masked_val | FLD_VAL((val), _start, _end); \ u32 _new_val = _masked_val | FIELD_PREP(GENMASK(_start, _end), (val)); \
_new_val; \ _new_val; \
}) })
@ -1220,14 +1213,14 @@ void dispc_vp_enable(struct dispc_device *dispc, u32 hw_videoport,
vbp = mode->crtc_vtotal - mode->crtc_vsync_end; vbp = mode->crtc_vtotal - mode->crtc_vsync_end;
dispc_vp_write(dispc, hw_videoport, DISPC_VP_TIMING_H, dispc_vp_write(dispc, hw_videoport, DISPC_VP_TIMING_H,
FLD_VAL(hsw - 1, 7, 0) | FIELD_PREP(GENMASK(7, 0), hsw - 1) |
FLD_VAL(hfp - 1, 19, 8) | FIELD_PREP(GENMASK(19, 8), hfp - 1) |
FLD_VAL(hbp - 1, 31, 20)); FIELD_PREP(GENMASK(31, 20), hbp - 1));
dispc_vp_write(dispc, hw_videoport, DISPC_VP_TIMING_V, dispc_vp_write(dispc, hw_videoport, DISPC_VP_TIMING_V,
FLD_VAL(vsw - 1, 7, 0) | FIELD_PREP(GENMASK(7, 0), vsw - 1) |
FLD_VAL(vfp, 19, 8) | FIELD_PREP(GENMASK(19, 8), vfp) |
FLD_VAL(vbp, 31, 20)); FIELD_PREP(GENMASK(31, 20), vbp));
ivs = !!(mode->flags & DRM_MODE_FLAG_NVSYNC); ivs = !!(mode->flags & DRM_MODE_FLAG_NVSYNC);
@ -1250,17 +1243,17 @@ void dispc_vp_enable(struct dispc_device *dispc, u32 hw_videoport,
ieo = false; ieo = false;
dispc_vp_write(dispc, hw_videoport, DISPC_VP_POL_FREQ, dispc_vp_write(dispc, hw_videoport, DISPC_VP_POL_FREQ,
FLD_VAL(align, 18, 18) | FIELD_PREP(GENMASK(18, 18), align) |
FLD_VAL(onoff, 17, 17) | FIELD_PREP(GENMASK(17, 17), onoff) |
FLD_VAL(rf, 16, 16) | FIELD_PREP(GENMASK(16, 16), rf) |
FLD_VAL(ieo, 15, 15) | FIELD_PREP(GENMASK(15, 15), ieo) |
FLD_VAL(ipc, 14, 14) | FIELD_PREP(GENMASK(14, 14), ipc) |
FLD_VAL(ihs, 13, 13) | FIELD_PREP(GENMASK(13, 13), ihs) |
FLD_VAL(ivs, 12, 12)); FIELD_PREP(GENMASK(12, 12), ivs));
dispc_vp_write(dispc, hw_videoport, DISPC_VP_SIZE_SCREEN, dispc_vp_write(dispc, hw_videoport, DISPC_VP_SIZE_SCREEN,
FLD_VAL(mode->crtc_hdisplay - 1, 11, 0) | FIELD_PREP(GENMASK(11, 0), mode->crtc_hdisplay - 1) |
FLD_VAL(mode->crtc_vdisplay - 1, 27, 16)); FIELD_PREP(GENMASK(27, 16), mode->crtc_vdisplay - 1));
VP_REG_FLD_MOD(dispc, hw_videoport, DISPC_VP_CONTROL, 1, 0, 0); VP_REG_FLD_MOD(dispc, hw_videoport, DISPC_VP_CONTROL, 1, 0, 0);
} }
@ -1576,14 +1569,14 @@ struct dispc_csc_coef {
static static
void dispc_csc_offset_regval(const struct dispc_csc_coef *csc, u32 *regval) void dispc_csc_offset_regval(const struct dispc_csc_coef *csc, u32 *regval)
{ {
#define OVAL(x, y) (FLD_VAL(x, 15, 3) | FLD_VAL(y, 31, 19)) #define OVAL(x, y) (FIELD_PREP(GENMASK(15, 3), x) | FIELD_PREP(GENMASK(31, 19), y))
regval[5] = OVAL(csc->preoffset[0], csc->preoffset[1]); regval[5] = OVAL(csc->preoffset[0], csc->preoffset[1]);
regval[6] = OVAL(csc->preoffset[2], csc->postoffset[0]); regval[6] = OVAL(csc->preoffset[2], csc->postoffset[0]);
regval[7] = OVAL(csc->postoffset[1], csc->postoffset[2]); regval[7] = OVAL(csc->postoffset[1], csc->postoffset[2]);
#undef OVAL #undef OVAL
} }
#define CVAL(x, y) (FLD_VAL(x, 10, 0) | FLD_VAL(y, 26, 16)) #define CVAL(x, y) (FIELD_PREP(GENMASK(10, 0), x) | FIELD_PREP(GENMASK(26, 16), y))
static static
void dispc_csc_yuv2rgb_regval(const struct dispc_csc_coef *csc, u32 *regval) void dispc_csc_yuv2rgb_regval(const struct dispc_csc_coef *csc, u32 *regval)
{ {
@ -1822,7 +1815,8 @@ static void dispc_vid_write_fir_coefs(struct dispc_device *dispc,
c1 = coefs->c1[phase]; c1 = coefs->c1[phase];
c2 = coefs->c2[phase]; c2 = coefs->c2[phase];
c12 = FLD_VAL(c1, 19, 10) | FLD_VAL(c2, 29, 20); c12 = FIELD_PREP(GENMASK(19, 10), c1) | FIELD_PREP(GENMASK(29, 20),
c2);
dispc_vid_write(dispc, hw_plane, reg, c12); dispc_vid_write(dispc, hw_plane, reg, c12);
} }
@ -2320,14 +2314,14 @@ static void dispc_vid_set_mflag_threshold(struct dispc_device *dispc,
u32 hw_plane, u32 low, u32 high) u32 hw_plane, u32 low, u32 high)
{ {
dispc_vid_write(dispc, hw_plane, DISPC_VID_MFLAG_THRESHOLD, dispc_vid_write(dispc, hw_plane, DISPC_VID_MFLAG_THRESHOLD,
FLD_VAL(high, 31, 16) | FLD_VAL(low, 15, 0)); FIELD_PREP(GENMASK(31, 16), high) | FIELD_PREP(GENMASK(15, 0), low));
} }
static void dispc_vid_set_buf_threshold(struct dispc_device *dispc, static void dispc_vid_set_buf_threshold(struct dispc_device *dispc,
u32 hw_plane, u32 low, u32 high) u32 hw_plane, u32 low, u32 high)
{ {
dispc_vid_write(dispc, hw_plane, DISPC_VID_BUF_THRESHOLD, dispc_vid_write(dispc, hw_plane, DISPC_VID_BUF_THRESHOLD,
FLD_VAL(high, 31, 16) | FLD_VAL(low, 15, 0)); FIELD_PREP(GENMASK(31, 16), high) | FIELD_PREP(GENMASK(15, 0), low));
} }
static void dispc_k2g_plane_init(struct dispc_device *dispc) static void dispc_k2g_plane_init(struct dispc_device *dispc)
@ -2468,8 +2462,8 @@ static void dispc_initial_config(struct dispc_device *dispc)
/* Note: Hardcoded DPI routing on J721E for now */ /* Note: Hardcoded DPI routing on J721E for now */
if (dispc->feat->subrev == DISPC_J721E) { if (dispc->feat->subrev == DISPC_J721E) {
dispc_write(dispc, DISPC_CONNECTIONS, dispc_write(dispc, DISPC_CONNECTIONS,
FLD_VAL(2, 3, 0) | /* VP1 to DPI0 */ FIELD_PREP(GENMASK(3, 0), 2) | /* VP1 to DPI0 */
FLD_VAL(8, 7, 4) /* VP3 to DPI1 */ FIELD_PREP(GENMASK(7, 4), 8) /* VP3 to DPI1 */
); );
} }
} }
@ -2647,8 +2641,8 @@ static void dispc_k2g_cpr_from_ctm(const struct drm_color_ctm *ctm,
cpr->m[CSC_BB] = dispc_S31_32_to_s2_8(ctm->matrix[8]); cpr->m[CSC_BB] = dispc_S31_32_to_s2_8(ctm->matrix[8]);
} }
#define CVAL(xR, xG, xB) (FLD_VAL(xR, 9, 0) | FLD_VAL(xG, 20, 11) | \ #define CVAL(xR, xG, xB) (FIELD_PREP(GENMASK(9, 0), xR) | FIELD_PREP(GENMASK(20, 11), xG) | \
FLD_VAL(xB, 31, 22)) FIELD_PREP(GENMASK(31, 22), xB))
static void dispc_k2g_vp_csc_cpr_regval(const struct dispc_csc_coef *csc, static void dispc_k2g_vp_csc_cpr_regval(const struct dispc_csc_coef *csc,
u32 *regval) u32 *regval)