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

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

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

parents 7ca5e3d3 35c55246

arch/arm/boot/dts/qcom/msmcobalt-mdss.dtsi

+13 −6
Original line number Diff line number Diff line
@@ -58,11 +58,12 @@ 


		qcom,mdss-pipe-vig-off = <0x00005000 0x00007000

					  0x00009000 0x0000b000>;

		qcom,mdss-pipe-dma-off = <0x00025000 0x00027000>;

		qcom,mdss-pipe-dma-off = <0x00025000 0x00027000

					  0x00029000 0x0002b000>;

		qcom,mdss-pipe-cursor-off = <0x00035000 0x00037000>;



		qcom,mdss-pipe-vig-xin-id = <0 4 8 12>;

		qcom,mdss-pipe-dma-xin-id = <1 5>;

		qcom,mdss-pipe-dma-xin-id = <1 5 9 13>;

		qcom,mdss-pipe-cursor-xin-id = <2 10>;



		/* These Offsets are relative to
@@ -73,7 +74,9 @@ 
						      <0x2bc 0 0>,

						      <0x2c4 0 0>;

		qcom,mdss-pipe-dma-clk-ctrl-offsets = <0x2ac  8 12>,

						      <0x2b4 8 12>;

						      <0x2b4  8 12>,

						      <0x2c4  8 12>,

						      <0x2c4 12 14>;

		qcom,mdss-pipe-cursor-clk-ctrl-offsets = <0x3a8 16 15>,

							 <0x3b0 16 15>;
@@ -103,6 +106,7 @@ 
		clocks = <&clock_mmss clk_mmss_mdss_ahb_clk>,

			 <&clock_mmss clk_mmss_mdss_axi_clk>,

			 <&clock_mmss clk_mdp_clk_src>,

			 <&clock_mmss clk_mmss_mdss_mdp_clk>,

			 <&clock_mmss clk_mmss_mdss_vsync_clk>;

		clock-names = "iface_clk", "bus_clk", "core_clk_src",

				"core_clk", "vsync_clk";
@@ -121,8 +125,10 @@ 
				     <0x09200 0x09230>,

				     <0x0b000 0x0b150>,

				     <0x0b200 0x0b230>,

				     <0x25000 0x25150>,

				     <0x27000 0x27150>,

				     <0x25000 0x25184>,

				     <0x27000 0x27184>,

				     <0x29000 0x29184>,

				     <0x2b000 0x2b184>,

				     <0x35000 0x35150>,

				     <0x37000 0x37150>,

				     <0x45000 0x452bc>,
@@ -149,6 +155,7 @@ 
			"VIG0_SSPP", "VIG0",  "VIG1_SSPP", "VIG1",

			"VIG2_SSPP", "VIG2",  "VIG3_SSPP", "VIG3",

			"DMA0_SSPP", "DMA1_SSPP",

			"DMA2_SSPP", "DMA3_SSPP",

			"CURSOR0_SSPP", "CURSOR1_SSPP",

			"LAYER_0", "LAYER_1", "LAYER_2",

			"LAYER_3", "LAYER_4", "LAYER_5",

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) {