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

Commit 58ad9931 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 extra panel info element in the fb_data_type"

parents c5243f2f b2110a1e

drivers/video/msm/mdss/mdss_fb.c

+5 −15
Original line number Diff line number Diff line
@@ -2940,26 +2940,16 @@ static int mdss_fb_check_var(struct fb_var_screeninfo *var, 
		return -EINVAL;



	if (mfd->panel_info) {

		struct mdss_panel_info *panel_info;

		int rc;

		panel_info = kzalloc(sizeof(struct mdss_panel_info),

				GFP_KERNEL);

		if (!panel_info) {

			pr_err("panel info is NULL\n");

			return -ENOMEM;

		}



		memcpy(panel_info, mfd->panel_info,

				sizeof(struct mdss_panel_info));

		mdss_fb_var_to_panelinfo(var, panel_info);

		memcpy(&mfd->reconfig_panel_info, mfd->panel_info,

				sizeof(mfd->reconfig_panel_info));

		mdss_fb_var_to_panelinfo(var, &mfd->reconfig_panel_info);

		rc = mdss_fb_send_panel_event(mfd, MDSS_EVENT_CHECK_PARAMS,

			panel_info);

		if (IS_ERR_VALUE(rc)) {

			kfree(panel_info);

			&mfd->reconfig_panel_info);

		if (IS_ERR_VALUE(rc))

			return rc;

		}

		mfd->panel_reconfig = rc;

		kfree(panel_info);

	}



	return 0;

drivers/video/msm/mdss/mdss_fb.h

+1 −0
Original line number Diff line number Diff line
@@ -230,6 +230,7 @@ struct msm_fb_data_type { 


	struct panel_id panel;

	struct mdss_panel_info *panel_info;

	struct mdss_panel_info reconfig_panel_info;

	int split_mode;

	int split_fb_left;

	int split_fb_right;