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

Commit aabaf6ef 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: Add BL attenuation support for AD to PP compact layer"

parents b34ee042 1b46d651

drivers/video/msm/mdss/mdss_compat_utils.c

+12 −1
Original line number Diff line number Diff line
@@ -1432,8 +1432,17 @@ static int __from_user_ad_init( 
	    copy_in_user(&ad_init->logo_h,

			&ad_init32->logo_h,

			sizeof(uint8_t)) ||

	    copy_in_user(&ad_init->alpha,

			&ad_init32->alpha,

			sizeof(uint32_t)) ||

	    copy_in_user(&ad_init->alpha_base,

			&ad_init32->alpha_base,

			sizeof(uint32_t)) ||

	    copy_in_user(&ad_init->bl_lin_len,

			&ad_init32->bl_lin_len,

			sizeof(uint32_t)) ||

	    copy_in_user(&ad_init->bl_att_len,

			&ad_init32->bl_att_len,

			sizeof(uint32_t)))

		return -EFAULT;
@@ -1441,7 +1450,9 @@ static int __from_user_ad_init( 
	if (get_user(data, &ad_init32->bl_lin) ||

	    put_user(compat_ptr(data), &ad_init->bl_lin) ||

	    get_user(data, &ad_init32->bl_lin_inv) ||

	    put_user(compat_ptr(data), &ad_init->bl_lin_inv))

	    put_user(compat_ptr(data), &ad_init->bl_lin_inv) ||

	    get_user(data, &ad_init32->bl_att_lut) ||

	    put_user(compat_ptr(data), &ad_init->bl_att_lut))

		return -EFAULT;



	return 0;

drivers/video/msm/mdss/mdss_compat_utils.h

+4 −0
Original line number Diff line number Diff line
@@ -252,9 +252,13 @@ struct mdss_ad_init32 { 
	uint16_t frame_h;

	uint8_t logo_v;

	uint8_t logo_h;

	uint32_t alpha;

	uint32_t alpha_base;

	uint32_t bl_lin_len;

	uint32_t bl_att_len;

	compat_caddr_t bl_lin;

	compat_caddr_t bl_lin_inv;

	compat_caddr_t bl_att_lut;

};



struct mdss_ad_cfg32 {