mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-29 13:53:33 +00:00
drm/msm/dpu: reserve cdm blocks for writeback in case of YUV output
Reserve CDM blocks for writeback if the format of the output fb is YUV. At the moment, the reservation is done only for writeback but can easily be extended by relaxing the checks once other interfaces are ready to output YUV. changes in v3: - squash CDM disable during encoder cleanup into this change changes in v2: - use needs_cdm from topology struct - drop fb related checks from atomic_mode_set() Signed-off-by: Abhinav Kumar <quic_abhinavk@quicinc.com> Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Patchwork: https://patchwork.freedesktop.org/patch/571838/ Link: https://lore.kernel.org/r/20231212205254.12422-14-quic_abhinavk@quicinc.com Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
This commit is contained in:
parent
f88c0c8fdb
commit
8b45a26f2b
1 changed files with 37 additions and 0 deletions
|
@ -16,6 +16,7 @@
|
|||
#include <drm/drm_crtc.h>
|
||||
#include <drm/drm_file.h>
|
||||
#include <drm/drm_probe_helper.h>
|
||||
#include <drm/drm_framebuffer.h>
|
||||
|
||||
#include "msm_drv.h"
|
||||
#include "dpu_kms.h"
|
||||
|
@ -26,6 +27,7 @@
|
|||
#include "dpu_hw_dspp.h"
|
||||
#include "dpu_hw_dsc.h"
|
||||
#include "dpu_hw_merge3d.h"
|
||||
#include "dpu_hw_cdm.h"
|
||||
#include "dpu_formats.h"
|
||||
#include "dpu_encoder_phys.h"
|
||||
#include "dpu_crtc.h"
|
||||
|
@ -584,6 +586,7 @@ static int dpu_encoder_virt_atomic_check(
|
|||
struct drm_display_mode *adj_mode;
|
||||
struct msm_display_topology topology;
|
||||
struct dpu_global_state *global_state;
|
||||
struct drm_framebuffer *fb;
|
||||
struct drm_dsc_config *dsc;
|
||||
int i = 0;
|
||||
int ret = 0;
|
||||
|
@ -624,6 +627,22 @@ static int dpu_encoder_virt_atomic_check(
|
|||
|
||||
topology = dpu_encoder_get_topology(dpu_enc, dpu_kms, adj_mode, crtc_state, dsc);
|
||||
|
||||
/*
|
||||
* Use CDM only for writeback at the moment as other interfaces cannot handle it.
|
||||
* if writeback itself cannot handle cdm for some reason it will fail in its atomic_check()
|
||||
* earlier.
|
||||
*/
|
||||
if (dpu_enc->disp_info.intf_type == INTF_WB && conn_state->writeback_job) {
|
||||
fb = conn_state->writeback_job->fb;
|
||||
|
||||
if (fb && DPU_FORMAT_IS_YUV(to_dpu_format(msm_framebuffer_format(fb))))
|
||||
topology.needs_cdm = true;
|
||||
if (topology.needs_cdm && !dpu_enc->cur_master->hw_cdm)
|
||||
crtc_state->mode_changed = true;
|
||||
else if (!topology.needs_cdm && dpu_enc->cur_master->hw_cdm)
|
||||
crtc_state->mode_changed = true;
|
||||
}
|
||||
|
||||
/*
|
||||
* Release and Allocate resources on every modeset
|
||||
* Dont allocate when active is false.
|
||||
|
@ -1064,6 +1083,15 @@ static void dpu_encoder_virt_atomic_mode_set(struct drm_encoder *drm_enc,
|
|||
|
||||
dpu_enc->dsc_mask = dsc_mask;
|
||||
|
||||
if (dpu_enc->disp_info.intf_type == INTF_WB && conn_state->writeback_job) {
|
||||
struct dpu_hw_blk *hw_cdm = NULL;
|
||||
|
||||
dpu_rm_get_assigned_resources(&dpu_kms->rm, global_state,
|
||||
drm_enc->base.id, DPU_HW_BLK_CDM,
|
||||
&hw_cdm, 1);
|
||||
dpu_enc->cur_master->hw_cdm = hw_cdm ? to_dpu_hw_cdm(hw_cdm) : NULL;
|
||||
}
|
||||
|
||||
cstate = to_dpu_crtc_state(crtc_state);
|
||||
|
||||
for (i = 0; i < num_lm; i++) {
|
||||
|
@ -2052,6 +2080,15 @@ void dpu_encoder_helper_phys_cleanup(struct dpu_encoder_phys *phys_enc)
|
|||
phys_enc->hw_pp->merge_3d->idx);
|
||||
}
|
||||
|
||||
if (phys_enc->hw_cdm) {
|
||||
if (phys_enc->hw_cdm->ops.bind_pingpong_blk && phys_enc->hw_pp)
|
||||
phys_enc->hw_cdm->ops.bind_pingpong_blk(phys_enc->hw_cdm,
|
||||
PINGPONG_NONE);
|
||||
if (phys_enc->hw_ctl->ops.update_pending_flush_cdm)
|
||||
phys_enc->hw_ctl->ops.update_pending_flush_cdm(phys_enc->hw_ctl,
|
||||
phys_enc->hw_cdm->idx);
|
||||
}
|
||||
|
||||
if (dpu_enc->dsc) {
|
||||
dpu_encoder_unprep_dsc(dpu_enc);
|
||||
dpu_enc->dsc = NULL;
|
||||
|
|
Loading…
Reference in a new issue