Merge "msm: fbdev: Fix compilation error for user build" (17b78200) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/video/fbdev/msm/Makefile

+1 −2

Original line number	Diff line number	Diff line
		@@ -20,7 +20,6 @@ mdss-mdp-objs += mdss_smmu.o
		mdss-mdp-objs += mdss_mdp_wfd.o
		mdss-mdp-objs += mdss_io_util.o
		obj-$(CONFIG_FB_MSM_MDSS) += mdss-mdp.o
		obj-$(CONFIG_FB_MSM_MDSS) += mdss_mdp_debug.o

		mdss-mdp-objs += mdss_mdp_pp_v1_7.o
		mdss-mdp-objs += mdss_mdp_pp_v3.o
		@@ -28,7 +27,7 @@ mdss-mdp-objs += mdss_mdp_pp_common.o
		mdss-mdp-objs += mdss_mdp_pp_stub.o

		ifeq ($(CONFIG_FB_MSM_MDSS),y)
		obj-$(CONFIG_DEBUG_FS) += mdss_debug.o mdss_debug_xlog.o
		obj-$(CONFIG_DEBUG_FS) += mdss_debug.o mdss_debug_xlog.o mdss_mdp_debug.o
		endif

		ifeq ($(CONFIG_FB_MSM_MDSS_FRC_DEBUG),y)

+5 −4

Original line number	Diff line number	Diff line
		@@ -203,14 +203,15 @@ static inline void mdss_xlog(const char *name, int line, int flag, ...) { }
		static inline void mdss_dsi_debug_check_te(struct mdss_panel_data *pdata) { }
		static inline void mdss_xlog_tout_handler_default(bool queue,
		const char *name, ...) { }
		u32 get_dump_range(struct dump_offset *range_node, size_t max_offset)
		static inline u32 get_dump_range(struct dump_offset *range_node,
		size_t max_offset)
		{
		return 0;
		}
		void mdss_dump_reg(const char dump_name, u32 reg_dump_flag, char addr,
		int len, u32 **dump_mem, bool from_isr)
		static inline void mdss_dump_reg(const char *dump_name, u32 reg_dump_flag,
		char addr, int len, u32 *dump_mem, bool from_isr)
		{ }
		void mdss_mdp_debug_mid(u32 mid) { }
		static inline void mdss_mdp_debug_mid(u32 mid) { }
		#endif

		int mdss_dump_misr_data(char **buf, u32 size);

+2 −2

Original line number	Diff line number	Diff line
		@@ -3698,9 +3698,9 @@ static int mdss_dsi_ctrl_probe(struct platform_device *pdev)
		ctrl_pdata->shared_data->dsi0_active = true;
		else
		ctrl_pdata->shared_data->dsi1_active = true;

		#ifdef CONFIG_DEBUG_FS
		mdss_dsi_debug_bus_init(mdss_dsi_res);

		#endif
		return 0;

		error_shadow_clk_deinit:

+2 −2

Original line number	Diff line number	Diff line
		@@ -2083,9 +2083,9 @@ static void mdss_mdp_hw_rev_caps_init(struct mdss_data_type *mdata)
		mdata->enable_gate = true;
		mdata->pixel_ram_size = 0;
		mem_protect_sd_ctrl_id = MEM_PROTECT_SD_CTRL_FLAT;

		#ifdef CONFIG_DEBUG_FS
		mdss_mdp_hw_rev_debug_caps_init(mdata);

		#endif
		switch (mdata->mdp_rev) {
		case MDSS_MDP_HW_REV_107:
		mdss_set_quirk(mdata, MDSS_QUIRK_ROTCDP);

+2 −2

Original line number	Diff line number	Diff line
		@@ -4072,9 +4072,9 @@ static ssize_t msm_misr_en_show(struct device *dev,
		pr_err("Invalid ctl structure\n");
		return -EINVAL;
		}

		#ifdef CONFIG_DEBUG_FS
		ret = mdss_dump_misr_data(&buf, PAGE_SIZE);

		#endif
		return ret;
		}