drm/msm/dpu: remove dev from RM (3763f1a5) · Commits · 戴 / test

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

+1 −2

Original line number	Diff line number	Diff line
		@@ -877,8 +877,7 @@ static int dpu_kms_hw_init(struct msm_kms *kms)
		goto power_error;
		}

		rc = dpu_rm_init(&dpu_kms->rm, dpu_kms->catalog, dpu_kms->mmio,
		dpu_kms->dev);
		rc = dpu_rm_init(&dpu_kms->rm, dpu_kms->catalog, dpu_kms->mmio);
		if (rc) {
		DPU_ERROR("rm init failed: %d\n", rc);
		goto power_error;

+2 −5

Original line number	Diff line number	Diff line
		@@ -224,13 +224,12 @@ static int _dpu_rm_hw_blk_create(

		int dpu_rm_init(struct dpu_rm *rm,
		struct dpu_mdss_cfg *cat,
		void __iomem *mmio,
		struct drm_device *dev)
		void __iomem *mmio)
		{
		int rc, i;
		enum dpu_hw_blk_type type;

		if (!rm \|\| !cat \|\| !mmio \|\| !dev) {
		if (!rm \|\| !cat \|\| !mmio) {
		DPU_ERROR("invalid kms\n");
		return -EINVAL;
		}
		@@ -243,8 +242,6 @@ int dpu_rm_init(struct dpu_rm *rm,
		for (type = 0; type < DPU_HW_BLK_MAX; type++)
		INIT_LIST_HEAD(&rm->hw_blks[type]);

		rm->dev = dev;

		/* Some of the sub-blocks require an mdptop to be created */
		rm->hw_mdp = dpu_hw_mdptop_init(MDP_TOP, mmio, cat);
		if (IS_ERR_OR_NULL(rm->hw_mdp)) {

+1 −5

Original line number	Diff line number	Diff line
		@@ -22,7 +22,6 @@

		/**
		* struct dpu_rm - DPU dynamic hardware resource manager
		* @dev: device handle for event logging purposes
		* @hw_blks: array of lists of hardware resources present in the system, one
		* list per type of hardware block
		* @hw_mdp: hardware object for mdp_top
		@@ -30,7 +29,6 @@
		* @rm_lock: resource manager mutex
		*/
		struct dpu_rm {
		struct drm_device *dev;
		struct list_head hw_blks[DPU_HW_BLK_MAX];
		struct dpu_hw_mdp *hw_mdp;
		uint32_t lm_max_width;
		@@ -63,13 +61,11 @@ struct dpu_rm_hw_iter {
		* @rm: DPU Resource Manager handle
		* @cat: Pointer to hardware catalog
		* @mmio: mapped register io address of MDP
		* @dev: device handle for event logging purposes
		* @Return: 0 on Success otherwise -ERROR
		*/
		int dpu_rm_init(struct dpu_rm *rm,
		struct dpu_mdss_cfg *cat,
		void __iomem *mmio,
		struct drm_device *dev);
		void __iomem *mmio);

		/**
		* dpu_rm_destroy - Free all memory allocated by dpu_rm_init