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

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

Merge "fbdev: msm: fix compilation issue in 32-bit mode"

parents c2e0b974 b6b5a0f2

drivers/clk/msm/mdss/mdss-dsi-pll-8996-util.c

+4 −3
Original line number Diff line number Diff line
@@ -485,7 +485,8 @@ static void pll_8996_dec_frac_calc(struct mdss_pll_resources *pll, 
	struct dsi_pll_input *pin = &pdb->in;

	struct dsi_pll_output *pout = &pdb->out;

	s64 multiplier = BIT(20);

	s64 dec_start_multiple, dec_start, pll_comp_val;

	s64 dec_start_multiple, dec_start;

	u64 pll_comp_val;

	s32 duration, div_frac_start;

	s64 vco_clk_rate = pll->vco_current_rate;

	s64 fref = pll->vco_ref_clk_rate;
@@ -560,8 +561,8 @@ static void pll_8996_calc_vco_count(struct dsi_pll_db *pdb, 
{

	struct dsi_pll_input *pin = &pdb->in;

	struct dsi_pll_output *pout = &pdb->out;

	s64 data;

	u32 cnt;

	u64 data;

	u64 cnt;



	data = fref * pin->vco_measure_time;

	do_div(data, 1000000);

drivers/video/fbdev/msm/mdss_fb.c

+8 −7
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ static void mdss_fb_set_bl_brightness(struct led_classdev *led_cdev, 
				      enum led_brightness value)

{

	struct msm_fb_data_type *mfd = dev_get_drvdata(led_cdev->dev->parent);

	int bl_lvl;

	u64 bl_lvl;



	if (mfd->boot_notification_led) {

		led_trigger_event(mfd->boot_notification_led, 0);
@@ -518,13 +518,13 @@ static ssize_t mdss_fb_get_fps_info(struct device *dev, 
{

	struct fb_info *fbi = dev_get_drvdata(dev);

	struct msm_fb_data_type *mfd = fbi->par;

	unsigned int fps_int, fps_float;

	u64 fps_int, fps_float;



	if (mfd->panel_power_state != MDSS_PANEL_POWER_ON)

		mfd->fps_info.measured_fps = 0;

	fps_int = (unsigned int) mfd->fps_info.measured_fps;

	fps_int = (u64) mfd->fps_info.measured_fps;

	fps_float = do_div(fps_int, 10);

	return scnprintf(buf, PAGE_SIZE, "%d.%d\n", fps_int, fps_float);

	return scnprintf(buf, PAGE_SIZE, "%llu.%llu\n", fps_int, fps_float);



}
@@ -2294,7 +2294,8 @@ static int mdss_fb_fbmem_ion_mmap(struct fb_info *info, 
			pr_debug("vm_start=%x vm_end=%x vm_page_prot=%ld\n",

				(unsigned int)vma->vm_start,

				(unsigned int)vma->vm_end,

				(unsigned long int)vma->vm_page_prot.pgprot);

				(unsigned long int)pgprot_val(

							vma->vm_page_prot));



			io_remap_pfn_range(vma, addr, page_to_pfn(page), len,

					vma->vm_page_prot);

drivers/video/fbdev/msm/mdss_fb.h

+1 −1
Original line number Diff line number Diff line
@@ -307,7 +307,7 @@ struct msm_fb_data_type { 
	u32 calib_mode;

	u32 calib_mode_bl;

	u32 ad_bl_level;

	u32 bl_level;

	u64 bl_level;

	u32 bl_scale;

	u32 bl_min_lvl;

	u32 unset_bl_level;

drivers/video/fbdev/msm/mdss_mdp_debug.c

+1 −1
Original line number Diff line number Diff line
@@ -1414,7 +1414,7 @@ static void __stats_ctl_dump(struct mdss_mdp_ctl *ctl, struct seq_file *s) 
		seq_printf(s, "vsync: %08u \tunderrun: %08u\n",

				ctl->vsync_cnt, ctl->underrun_cnt);

		if (ctl->mfd) {

			seq_printf(s, "user_bl: %08u \tmod_bl: %08u\n",

			seq_printf(s, "user_bl: %08llu \tmod_bl: %08u\n",

				ctl->mfd->bl_level, ctl->mfd->bl_level_scaled);

		}

	} else {

drivers/video/fbdev/msm/mdss_mdp_overlay.c

+2 −2
Original line number Diff line number Diff line
@@ -2015,7 +2015,7 @@ static int __compute_vsync_diff(s64 cur_ts, 
{

	int vsync_diff;

	int round_up = 0;

	s64 ts_diff = (cur_ts - base_ts) * display_fp1000s;

	u64 ts_diff = (cur_ts - base_ts) * display_fp1000s;



	do_div(ts_diff, 1000000);

	vsync_diff = (int)ts_diff;
@@ -2065,7 +2065,7 @@ static int __calculate_cadence_id(struct mdss_mdp_frc_info *frc_info, int cnt) 
	struct mdss_mdp_frc_cadence_calc *calc = &frc_info->calc;

	struct mdss_mdp_frc_data *first = &calc->samples[0];

	struct mdss_mdp_frc_data *last = &calc->samples[cnt-1];

	s64 ts_diff =

	u64 ts_diff =

		(last->timestamp - first->timestamp)

				* frc_info->display_fp1000s;

	u32 fcnt_diff =