Commit f58a6bf4 authored by Abhinav Kumar's avatar Abhinav Kumar Committed by Dmitry Baryshkov
Browse files

drm/msm/dpu: add cdm blocks to RM 



Add the RM APIs necessary to initialize and allocate CDM
blocks to be used by the rest of the DPU pipeline.

changes in v2:
	- treat cdm_init() failure as fatal
	- fixed the commit text

Signed-off-by: default avatarAbhinav Kumar <quic_abhinavk@quicinc.com>
Reviewed-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Patchwork: https://patchwork.freedesktop.org/patch/571822/
Link: https://lore.kernel.org/r/20231212205254.12422-9-quic_abhinavk@quicinc.com


Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
parent 0afac0ba

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

+13 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
#include "dpu_kms.h"

#include "dpu_hw_lm.h"

#include "dpu_hw_ctl.h"

#include "dpu_hw_cdm.h"

#include "dpu_hw_pingpong.h"

#include "dpu_hw_sspp.h"

#include "dpu_hw_intf.h"
@@ -176,6 +177,18 @@ int dpu_rm_init(struct drm_device *dev, 
		rm->hw_sspp[sspp->id - SSPP_NONE] = hw;

	}



	if (cat->cdm) {

		struct dpu_hw_cdm *hw;



		hw = dpu_hw_cdm_init(dev, cat->cdm, mmio, cat->mdss_ver);

		if (IS_ERR(hw)) {

			rc = PTR_ERR(hw);

			DPU_ERROR("failed cdm object creation: err %d\n", rc);

			goto fail;

		}

		rm->cdm_blk = &hw->base;

	}



	return 0;



fail:

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

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ struct dpu_global_state; 
 * @hw_wb: array of wb hardware resources

 * @dspp_blks: array of dspp hardware resources

 * @hw_sspp: array of sspp hardware resources

 * @cdm_blk: cdm hardware resource

 */

struct dpu_rm {

	struct dpu_hw_blk *pingpong_blks[PINGPONG_MAX - PINGPONG_0];
@@ -33,6 +34,7 @@ struct dpu_rm { 
	struct dpu_hw_blk *merge_3d_blks[MERGE_3D_MAX - MERGE_3D_0];

	struct dpu_hw_blk *dsc_blks[DSC_MAX - DSC_0];

	struct dpu_hw_sspp *hw_sspp[SSPP_MAX - SSPP_NONE];

	struct dpu_hw_blk *cdm_blk;

};



/**