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

Commit 6057c243 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "fbdev: msm: Fix 32 bit compilation on qcs405"

parents d0e597c2 6dee0129

drivers/video/fbdev/msm/mdss_fb.c

+5 −1
Original line number Diff line number Diff line
@@ -1329,6 +1329,9 @@ static int mdss_fb_probe(struct platform_device *pdev) 
	if (!lcd_backlight_registered) {

		backlight_led.brightness = mfd->panel_info->brightness_max;

		backlight_led.max_brightness = mfd->panel_info->brightness_max;

		if (led_classdev_register(&pdev->dev, &backlight_led))

			pr_err("led_classdev_register failed\n");

		else

			lcd_backlight_registered = 1;

	}
@@ -1426,6 +1429,7 @@ static int mdss_fb_remove(struct platform_device *pdev) 


	if (lcd_backlight_registered) {

		lcd_backlight_registered = 0;

		led_classdev_unregister(&backlight_led);

	}



	return 0;

drivers/video/fbdev/msm/mdss_mdp_overlay.c

+4 −1
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ 
#define DFPS_DATA_MAX_FPS 0x7fffffff

#define DFPS_DATA_MAX_CLK_RATE 250000



struct mdp_overlay tmp;

static int mdss_mdp_overlay_free_fb_pipe(struct msm_fb_data_type *mfd);

static int mdss_mdp_overlay_fb_parse_dt(struct msm_fb_data_type *mfd);

static int mdss_mdp_overlay_off(struct msm_fb_data_type *mfd);
@@ -5354,7 +5355,9 @@ static int __mdss_overlay_map(struct mdp_overlay *ovs, 


static inline void __overlay_swap_func(void *a, void *b, int size)

{

	swap(*(struct mdp_overlay *)a, *(struct mdp_overlay *)b);

	tmp = *(struct mdp_overlay *)a;

	*(struct mdp_overlay *)a = *(struct mdp_overlay *)b;

	*(struct mdp_overlay *)b = tmp;

}



static inline int __zorder_dstx_cmp_func(const void *a, const void *b)