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

Commit 35c55246 authored by Ujwal Patel's avatar Ujwal Patel Committed by Adrian Salido-Moreno
Browse files

msm: mdss: remove obsolete code related to write-back and rotator 



Remove write-back and rotator related obsolete code in order to reduce
dead code maintenance.

CRs-Fixed: 987777
Change-Id: I917d9b5b777fb41f3f87213d8d9e6e7ddf73f92c
Signed-off-by: default avatarUjwal Patel <ujwalp@codeaurora.org>
Signed-off-by: default avatarAdrian Salido-Moreno <adrianm@codeaurora.org>
parent 839f2cbb

drivers/video/msm/mdss/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ mdss-mdp-objs += mdss_mdp_pp.o mdss_mdp_pp_debug.o mdss_mdp_pp_cache_config.o 
mdss-mdp-objs += mdss_mdp_intf_video.o

mdss-mdp-objs += mdss_mdp_intf_cmd.o

mdss-mdp-objs += mdss_mdp_intf_writeback.o

mdss-mdp-objs += mdss_mdp_rotator.o

mdss-mdp-objs += mdss_rotator.o

mdss-mdp-objs += mdss_mdp_overlay.o

mdss-mdp-objs += mdss_mdp_layer.o

drivers/video/msm/mdss/mdss_fb.c

+5 −25
Original line number Diff line number Diff line
@@ -4518,7 +4518,6 @@ int mdss_fb_do_ioctl(struct fb_info *info, unsigned int cmd, 
	void __user *argp = (void __user *)arg;

	int ret = -ENOSYS;

	struct mdp_buf_sync buf_sync;

	struct msm_sync_pt_data *sync_pt_data = NULL;

	unsigned int dsi_mode = 0;

	struct mdss_panel_data *pdata = NULL;
@@ -4560,18 +4559,13 @@ int mdss_fb_do_ioctl(struct fb_info *info, unsigned int cmd, 
		if (ret)

			goto exit;



		if (mfd->mdp.get_sync_fnc)

			sync_pt_data = mfd->mdp.get_sync_fnc(mfd, &buf_sync);

		if (!sync_pt_data) {

		if ((!mfd->op_enable) || (mdss_fb_is_power_off(mfd))) {

			ret = -EPERM;

			goto exit;

		}

			sync_pt_data = &mfd->mdp_sync_pt_data;

		}



		ret = mdss_fb_handle_buf_sync_ioctl(sync_pt_data, &buf_sync);



		ret = mdss_fb_handle_buf_sync_ioctl(&mfd->mdp_sync_pt_data,

				&buf_sync);

		if (!ret)

			ret = copy_to_user(argp, &buf_sync, sizeof(buf_sync));

		break;
@@ -4626,20 +4620,6 @@ static int mdss_fb_ioctl(struct fb_info *info, unsigned int cmd, 
	return mdss_fb_do_ioctl(info, cmd, arg, file);

}



struct fb_info *msm_fb_get_writeback_fb(void)

{

	int c = 0;

	for (c = 0; c < fbi_list_index; ++c) {

		struct msm_fb_data_type *mfd;

		mfd = (struct msm_fb_data_type *)fbi_list[c]->par;

		if (mfd->panel.type == WRITEBACK_PANEL)

			return fbi_list[c];

	}



	return NULL;

}

EXPORT_SYMBOL(msm_fb_get_writeback_fb);



static int mdss_fb_register_extra_panel(struct platform_device *pdev,

	struct mdss_panel_data *pdata)

{

drivers/video/msm/mdss/mdss_fb.h

+0 −2
Original line number Diff line number Diff line
@@ -228,8 +228,6 @@ struct msm_mdp_interface { 
	u32 (*fb_stride)(u32 fb_index, u32 xres, int bpp);

	struct mdss_mdp_format_params *(*get_format_params)(u32 format);

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

	struct msm_sync_pt_data *(*get_sync_fnc)(struct msm_fb_data_type *mfd,

				const struct mdp_buf_sync *buf_sync);

	void (*check_dsi_status)(struct work_struct *work, uint32_t interval);

	int (*configure_panel)(struct msm_fb_data_type *mfd, int mode,

				int dest_ctrl);

drivers/video/msm/mdss/mdss_mdp.c

+0 −6
Original line number Diff line number Diff line
@@ -54,7 +54,6 @@ 
#include "mdss_panel.h"

#include "mdss_debug.h"

#include "mdss_mdp_debug.h"

#include "mdss_mdp_rotator.h"

#include "mdss_smmu.h"



#include "mdss_mdp_trace.h"
@@ -2267,11 +2266,6 @@ static int mdss_mdp_probe(struct platform_device *pdev) 
		pr_err("unable to register bus scaling\n");

		goto probe_done;

	}

	rc = mdss_mdp_rot_mgr_init();

	if (rc) {

		pr_err("unable to initialize rotation mgr\n");

		goto probe_done;

	}



	rc = mdss_mdp_debug_init(pdev, mdata);

	if (rc) {

drivers/video/msm/mdss/mdss_mdp.h

+31 −8
Original line number Diff line number Diff line
@@ -1313,6 +1313,37 @@ static inline bool mdss_mdp_is_map_needed(struct mdss_data_type *mdata, 
	return true;

}



static inline u32 mdss_mdp_get_rotator_dst_format(u32 in_format, u32 in_rot90,

	u32 bwc)

{

	switch (in_format) {

	case MDP_RGB_565:

	case MDP_BGR_565:

		if (in_rot90)

			return MDP_RGB_888;

		else

			return in_format;

	case MDP_RGBA_8888:

		if (bwc)

			return MDP_BGRA_8888;

		else

			return in_format;

	case MDP_Y_CBCR_H2V2_VENUS:

	case MDP_Y_CRCB_H2V2_VENUS:

	case MDP_Y_CBCR_H2V2:

		if (in_rot90)

			return MDP_Y_CRCB_H2V2;

		else

			return in_format;

	case MDP_Y_CB_CR_H2V2:

	case MDP_Y_CR_CB_GH2V2:

	case MDP_Y_CR_CB_H2V2:

		return MDP_Y_CRCB_H2V2;

	default:

		return in_format;

	}

}



irqreturn_t mdss_mdp_isr(int irq, void *ptr);

void mdss_mdp_irq_clear(struct mdss_data_type *mdata,

		u32 intr_type, u32 intf_num);
@@ -1594,9 +1625,6 @@ bool mdss_rect_overlap_check(struct mdss_rect *rect1, struct mdss_rect *rect2); 
void mdss_rect_split(struct mdss_rect *in_roi, struct mdss_rect *l_roi,

	struct mdss_rect *r_roi, u32 splitpoint);



int mdss_mdp_wb_kickoff(struct msm_fb_data_type *mfd,

		struct mdss_mdp_commit_cb *commit_cb);

int mdss_mdp_wb_ioctl_handler(struct msm_fb_data_type *mfd, u32 cmd, void *arg);



int mdss_mdp_get_ctl_mixers(u32 fb_num, u32 *mixer_id);

bool mdss_mdp_mixer_reg_has_pipe(struct mdss_mdp_mixer *mixer,
@@ -1616,14 +1644,9 @@ void mdss_mdp_set_roi(struct mdss_mdp_ctl *ctl, 
	struct mdss_rect *l_roi, struct mdss_rect *r_roi);

void mdss_mdp_mixer_update_pipe_map(struct mdss_mdp_ctl *master_ctl,

		int mixer_mux);

int mdss_mdp_wb_set_format(struct msm_fb_data_type *mfd, u32 dst_format);

int mdss_mdp_wb_get_format(struct msm_fb_data_type *mfd,

					struct mdp_mixer_cfg *mixer_cfg);



void mdss_mdp_pipe_calc_pixel_extn(struct mdss_mdp_pipe *pipe);

void mdss_mdp_pipe_calc_qseed3_cfg(struct mdss_mdp_pipe *pipe);

int mdss_mdp_wb_set_secure(struct msm_fb_data_type *mfd, int enable);

int mdss_mdp_wb_get_secure(struct msm_fb_data_type *mfd, uint8_t *enable);

void mdss_mdp_ctl_restore(bool locked);

int  mdss_mdp_ctl_reset(struct mdss_mdp_ctl *ctl, bool is_recovery);

int mdss_mdp_wait_for_xin_halt(u32 xin_id, bool is_vbif_nrt);