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

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

Merge "fbdev: msm: Fix compilation issues in FB driver"

parents 80d5ac83 3b8866b4

drivers/video/fbdev/msm/mdss_fb.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -2136,7 +2136,7 @@ void mdss_fb_free_fb_ion_memory(struct msm_fb_data_type *mfd) 




int mdss_fb_alloc_fb_ion_memory(struct msm_fb_data_type *mfd, size_t fb_size)

int mdss_fb_alloc_fb_ion_memory(struct msm_fb_data_type *mfd, size_t fb_size)

{

{

	int rc = 0, fd = 0;

	int rc = 0;

	void *vaddr;

	void *vaddr;

	int domain;

	int domain;

drivers/video/fbdev/msm/mdss_mdp_pp.c

+4 −6
Original line number Original line Diff line number Diff line
@@ -3132,12 +3132,10 @@ static int pp_ad_calc_bl(struct msm_fb_data_type *mfd, int bl_in, int *bl_out, 
		return -EPERM;

		return -EPERM;

	}

	}





	if (!ad->bl_mfd || !ad->bl_mfd->panel_info ||

	if (!ad->bl_mfd || !ad->bl_mfd->panel_info) {

		!ad->bl_att_lut) {

		pr_err("Invalid ad info: bl_mfd = 0x%pK, ad->bl_mfd->panel_info = 0x%pK\n",

		pr_err("Invalid ad info: bl_mfd = 0x%pK, ad->bl_mfd->panel_info = 0x%pK, bl_att_lut = 0x%pK\n",

			ad->bl_mfd,

			ad->bl_mfd,

			(!ad->bl_mfd) ? NULL : ad->bl_mfd->panel_info,

			(!ad->bl_mfd) ? NULL : ad->bl_mfd->panel_info);

			ad->bl_att_lut);

		mutex_unlock(&ad->lock);

		mutex_unlock(&ad->lock);

		return -EINVAL;

		return -EINVAL;

	}

	}
@@ -6672,7 +6670,7 @@ static int is_valid_calib_dspp_addr(char __iomem *ptr) 
			ret = MDP_PP_OPS_READ | MDP_PP_OPS_WRITE;

			ret = MDP_PP_OPS_READ | MDP_PP_OPS_WRITE;

			break;

			break;

		/* Dither enable/disable */

		/* Dither enable/disable */

		} else if ((ptr == base + MDSS_MDP_REG_DSPP_DITHER_DEPTH)) {

		} else if (ptr == (base + MDSS_MDP_REG_DSPP_DITHER_DEPTH)) {

			ret = MDP_PP_OPS_READ | MDP_PP_OPS_WRITE;

			ret = MDP_PP_OPS_READ | MDP_PP_OPS_WRITE;

			break;

			break;

		/* Six zone and mem color */

		/* Six zone and mem color */