Commit f8706bff authored by Dmitry Baryshkov's avatar Dmitry Baryshkov
Browse files

drm/msm: move msm_display_topology to the DPU driver 



The struct msm_display_topology is only used by the DPU driver. Remove
it from the global header and move it to DPU-specific header.

Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: default avatarAbhinav Kumar <quic_abhinavk@quicinc.com>
Patchwork: https://patchwork.freedesktop.org/patch/622534/
Link: https://lore.kernel.org/r/20241031-dpu-move-topology-v1-1-8ffa8122d3b6@linaro.org
parent 20c7b42d

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

+16 −0
Original line number Diff line number Diff line
@@ -37,6 +37,22 @@ struct dpu_rm { 
	struct dpu_hw_blk *cdm_blk;

};



/**

 * struct msm_display_topology - defines a display topology pipeline

 * @num_lm:       number of layer mixers used

 * @num_intf:     number of interfaces the panel is mounted on

 * @num_dspp:     number of dspp blocks used

 * @num_dsc:      number of Display Stream Compression (DSC) blocks used

 * @needs_cdm:    indicates whether cdm block is needed for this display topology

 */

struct msm_display_topology {

	u32 num_lm;

	u32 num_intf;

	u32 num_dspp;

	u32 num_dsc;

	bool needs_cdm;

};



/**

 * dpu_rm_init - Read hardware catalog and create reservation tracking objects

 *	for all HW blocks.

drivers/gpu/drm/msm/msm_drv.h

+0 −16
Original line number Diff line number Diff line
@@ -73,22 +73,6 @@ enum msm_dsi_controller { 
#define MSM_GPU_MAX_RINGS 4

#define MAX_H_TILES_PER_DISPLAY 2



/**

 * struct msm_display_topology - defines a display topology pipeline

 * @num_lm:       number of layer mixers used

 * @num_intf:     number of interfaces the panel is mounted on

 * @num_dspp:     number of dspp blocks used

 * @num_dsc:      number of Display Stream Compression (DSC) blocks used

 * @needs_cdm:    indicates whether cdm block is needed for this display topology

 */

struct msm_display_topology {

	u32 num_lm;

	u32 num_intf;

	u32 num_dspp;

	u32 num_dsc;

	bool needs_cdm;

};



/* Commit/Event thread specific structure */

struct msm_drm_thread {

	struct drm_device *dev;