Skip to content

Commit 1d0a6c9

Browse files
krzklumag
authored andcommitted
drm/msm/dpu: Add missing "fetch" name to set_active_pipes()
The set_active_pipes() callback configures CTL_FETCH_PIPE_ACTIVE and newer DPU v12.0 comes with CTL_PIPE_ACTIVE, thus rename it to set_active_fetch_pipes() to better match the purpose. Reviewed-by: Dmitry Baryshkov <[email protected]> Reviewed-by: Jessica Zhang <[email protected]> Signed-off-by: Krzysztof Kozlowski <[email protected]> Patchwork: https://patchwork.freedesktop.org/patch/651261/ Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Dmitry Baryshkov <[email protected]>
1 parent 666832f commit 1d0a6c9

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -445,9 +445,9 @@ static void _dpu_crtc_blend_setup_mixer(struct drm_crtc *crtc,
445445

446446
uint32_t lm_idx;
447447
bool bg_alpha_enable = false;
448-
DECLARE_BITMAP(fetch_active, SSPP_MAX);
448+
DECLARE_BITMAP(active_fetch, SSPP_MAX);
449449

450-
memset(fetch_active, 0, sizeof(fetch_active));
450+
memset(active_fetch, 0, sizeof(active_fetch));
451451
drm_atomic_crtc_for_each_plane(plane, crtc) {
452452
state = plane->state;
453453
if (!state)
@@ -464,15 +464,15 @@ static void _dpu_crtc_blend_setup_mixer(struct drm_crtc *crtc,
464464
if (pstate->stage == DPU_STAGE_BASE && format->alpha_enable)
465465
bg_alpha_enable = true;
466466

467-
set_bit(pstate->pipe.sspp->idx, fetch_active);
467+
set_bit(pstate->pipe.sspp->idx, active_fetch);
468468
_dpu_crtc_blend_setup_pipe(crtc, plane,
469469
mixer, cstate->num_mixers,
470470
pstate->stage,
471471
format, fb ? fb->modifier : 0,
472472
&pstate->pipe, 0, stage_cfg);
473473

474474
if (pstate->r_pipe.sspp) {
475-
set_bit(pstate->r_pipe.sspp->idx, fetch_active);
475+
set_bit(pstate->r_pipe.sspp->idx, active_fetch);
476476
_dpu_crtc_blend_setup_pipe(crtc, plane,
477477
mixer, cstate->num_mixers,
478478
pstate->stage,
@@ -492,8 +492,8 @@ static void _dpu_crtc_blend_setup_mixer(struct drm_crtc *crtc,
492492
}
493493
}
494494

495-
if (ctl->ops.set_active_pipes)
496-
ctl->ops.set_active_pipes(ctl, fetch_active);
495+
if (ctl->ops.set_active_fetch_pipes)
496+
ctl->ops.set_active_fetch_pipes(ctl, active_fetch);
497497

498498
_dpu_crtc_program_lm_output_roi(crtc);
499499
}

drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -711,8 +711,8 @@ static void dpu_hw_ctl_reset_intf_cfg_v1(struct dpu_hw_ctl *ctx,
711711
}
712712
}
713713

714-
static void dpu_hw_ctl_set_fetch_pipe_active(struct dpu_hw_ctl *ctx,
715-
unsigned long *fetch_active)
714+
static void dpu_hw_ctl_set_active_fetch_pipes(struct dpu_hw_ctl *ctx,
715+
unsigned long *fetch_active)
716716
{
717717
int i;
718718
u32 val = 0;
@@ -775,7 +775,7 @@ static void _setup_ctl_ops(struct dpu_hw_ctl_ops *ops,
775775
ops->update_pending_flush_dspp = dpu_hw_ctl_update_pending_flush_dspp;
776776

777777
if (cap & BIT(DPU_CTL_FETCH_ACTIVE))
778-
ops->set_active_pipes = dpu_hw_ctl_set_fetch_pipe_active;
778+
ops->set_active_fetch_pipes = dpu_hw_ctl_set_active_fetch_pipes;
779779
};
780780

781781
/**

drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ struct dpu_hw_ctl_ops {
256256
void (*setup_blendstage)(struct dpu_hw_ctl *ctx,
257257
enum dpu_lm lm, struct dpu_hw_stage_cfg *cfg);
258258

259-
void (*set_active_pipes)(struct dpu_hw_ctl *ctx,
259+
void (*set_active_fetch_pipes)(struct dpu_hw_ctl *ctx,
260260
unsigned long *fetch_active);
261261
};
262262

0 commit comments

Comments
 (0)