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

Commit 91677d92 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mdss: mdp: ad calc worker cleanup"

parents ca0dd196 c9aac88c

drivers/video/msm/mdss/mdss.h

+1 −0
Original line number Diff line number Diff line
@@ -386,6 +386,7 @@ struct mdss_data_type { 
	u32 nad_cfgs;

	u32 nmax_concurrent_ad_hw;

	struct workqueue_struct *ad_calc_wq;

	u32 ad_debugen;



	struct mdss_intr hist_intr;

drivers/video/msm/mdss/mdss_debug.c

+6 −0
Original line number Diff line number Diff line
@@ -1105,6 +1105,12 @@ int mdss_debugfs_init(struct mdss_data_type *mdata) 
		goto err;

	}



	mdd->postproc = debugfs_create_dir("postproc", mdd->root);

	if (IS_ERR_OR_NULL(mdd->postproc)) {

		pr_err("debugfs_create_dir postproc for mdp failed, error %ld\n",

		       PTR_ERR(mdd->postproc));

		goto err;

	}

	mdss_debugfs_perf_init(mdd, mdata);



	if (mdss_create_xlog_debug(mdd))

drivers/video/msm/mdss/mdss_debug.h

+1 −0
Original line number Diff line number Diff line
@@ -99,6 +99,7 @@ struct mdss_debug_data { 
	struct dentry *root;

	struct dentry *perf;

	struct dentry *bordercolor;

	struct dentry *postproc;

	struct list_head base_list;

};

drivers/video/msm/mdss/mdss_fb.c

+7 −0
Original line number Diff line number Diff line
@@ -2521,6 +2521,13 @@ static int mdss_fb_release_all(struct fb_info *info, bool release_all) 
		if (mfd->mdp.release_fnc)

			mfd->mdp.release_fnc(mfd, NULL);



		if (mfd->mdp.ad_shutdown_cleanup) {

			ret = (*mfd->mdp.ad_shutdown_cleanup)(mfd);

			if (ret)

				pr_err("AD shutdown cleanup failed ret %d\n",

				       ret);

		}



		ret = mdss_fb_blank_sub(FB_BLANK_POWERDOWN, info,

			mfd->op_enable);

		if (ret) {

drivers/video/msm/mdss/mdss_fb.h

+1 −0
Original line number Diff line number Diff line
@@ -232,6 +232,7 @@ struct msm_mdp_interface { 
	int (*configure_panel)(struct msm_fb_data_type *mfd, int mode,

				int dest_ctrl);

	int (*input_event_handler)(struct msm_fb_data_type *mfd);

	int (*ad_shutdown_cleanup)(struct msm_fb_data_type *mfd);

	void *private1;

};