Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 48b909a2 authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drm/msm/sde: list block interconnects as bitmasks" into msm-4.8

parents 1826a640 6b3b9dd8

drivers/gpu/drm/msm/sde/sde_encoder_phys_vid.c

+1 −1
Original line number Diff line number Diff line
@@ -482,7 +482,7 @@ static void sde_encoder_phys_vid_destroy(struct sde_encoder_phys *phys_enc) 


	DBG("intf %d", vid_enc->hw_intf->idx);

	sde_rm_release_ctl_path(phys_enc->sde_kms, phys_enc->hw_ctl->idx);

	sde_hw_intf_deinit(vid_enc->hw_intf);

	sde_hw_intf_destroy(vid_enc->hw_intf);

	sde_hw_mdp_destroy(phys_enc->hw_mdptop);

	kfree(vid_enc);

}

drivers/gpu/drm/msm/sde/sde_hw_catalog.h

+5 −5
Original line number Diff line number Diff line
@@ -351,7 +351,7 @@ struct sde_lm_cfg { 
	const struct sde_lm_sub_blks *sblk;

	u32 dspp;

	u32 pingpong;

	u32 lm_pair_mask;

	unsigned long lm_pair_mask;

};



/**
@@ -384,13 +384,13 @@ struct sde_pingpong_cfg { 
 * @id                 enum identifying this block

 * @base               register offset of this block

 * @features           bit mask identifying sub-blocks/features

 * @intf_connect       Connects to which interfaces

 * @wb_connect:        Connects to which writebacks

 * @intf_connect       Bitmask of INTF IDs this CDM can connect to

 * @wb_connect:        Bitmask of Writeback IDs this CDM can connect to

 */

struct sde_cdm_cfg   {

	SDE_HW_BLK_INFO;

	u32 intf_connect[MAX_BLOCKS];

	u32 wb_connect[MAX_BLOCKS];

	unsigned long intf_connect;

	unsigned long wb_connect;

};



/**

drivers/gpu/drm/msm/sde/sde_hw_catalog_8996.c

+2 −2
Original line number Diff line number Diff line
@@ -464,8 +464,8 @@ static inline int set_cfg_1xx_init(struct sde_mdss_cfg *cfg) 
		.cdm_count = 1,

		.cdm = {

			{.id = CDM_0, .base = 0x0007A200, .features = 0,

				.intf_connect = { BIT(INTF_3)},

				.wb_connect = { BIT(WB_2)},}

				.intf_connect = BIT(INTF_3),

				.wb_connect = BIT(WB_2),}

		},

		.intf_count = 4,

		.intf = {

drivers/gpu/drm/msm/sde/sde_hw_cdm.c

+5 −0
Original line number Diff line number Diff line
@@ -335,3 +335,8 @@ struct sde_hw_cdm *sde_hw_cdm_init(enum sde_cdm idx, 


	return c;

}



void sde_hw_cdm_destroy(struct sde_hw_cdm *cdm)

{

	kfree(cdm);

}

drivers/gpu/drm/msm/sde/sde_hw_cdm.h

+7 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ struct sde_hw_cdm { 
};



/**

 * sde_hw_cdm_init(): Initializes the cdm hw driver object.

 * sde_hw_cdm_init - initializes the cdm hw driver object.

 * should be called once before accessing every cdm.

 * @idx:  cdm index for which driver object is required

 * @addr: mapped register io address of MDP
@@ -118,4 +118,10 @@ struct sde_hw_cdm *sde_hw_cdm_init(enum sde_cdm idx, 
		struct sde_mdss_cfg *m,

		struct sde_hw_mdp *hw_mdp);



/**

 * sde_hw_cdm_destroy - destroys CDM driver context

 * @cdm:   pointer to CDM driver context

 */

void sde_hw_cdm_destroy(struct sde_hw_cdm *cdm);



#endif /*_SDE_HW_CDM_H */