diff options
| author | Rob Clark <robdclark@chromium.org> | 2023-08-08 00:10:18 +0300 |
|---|---|---|
| committer | Rob Clark <robdclark@chromium.org> | 2023-08-08 00:10:18 +0300 |
| commit | fa0f4d0735cd0b0f059d2fb8ff6f1e5f989145f7 (patch) | |
| tree | ddb47c9ee0a1d52291952e6fb8e3bfc24bd06d1d /drivers/gpu/drm/msm/disp/dpu1 | |
| parent | d93cf453f51da168f4410ba73656f1e862096973 (diff) | |
| parent | 1b5d0ddcb34a605835051ae2950d5cfed0373dd8 (diff) | |
| download | linux-fa0f4d0735cd0b0f059d2fb8ff6f1e5f989145f7.tar.xz | |
Merge branch 'msm-fixes' into msm-next
Back-merge msm-fixes to resolve conflicts.
Signed-off-by: Rob Clark <robdclark@chromium.org>
Diffstat (limited to 'drivers/gpu/drm/msm/disp/dpu1')
| -rw-r--r-- | drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c index c278fb9d2b5b..86182c734606 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c @@ -51,7 +51,7 @@ static const u32 fetch_tbl[SSPP_MAX] = {CTL_INVALID_BIT, 16, 17, 18, 19, CTL_INVALID_BIT, CTL_INVALID_BIT, CTL_INVALID_BIT, CTL_INVALID_BIT, 0, - 1, 2, 3, CTL_INVALID_BIT, CTL_INVALID_BIT}; + 1, 2, 3, 4, 5}; static int _mixer_stages(const struct dpu_lm_cfg *mixer, int count, enum dpu_lm lm) @@ -198,6 +198,12 @@ static void dpu_hw_ctl_update_pending_flush_sspp(struct dpu_hw_ctl *ctx, case SSPP_DMA3: ctx->pending_flush_mask |= BIT(25); break; + case SSPP_DMA4: + ctx->pending_flush_mask |= BIT(13); + break; + case SSPP_DMA5: + ctx->pending_flush_mask |= BIT(14); + break; case SSPP_CURSOR0: ctx->pending_flush_mask |= BIT(22); break; |