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

Commit c1551685 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: avoid mdss specific back light calls on MSM8909"

parents c207f5f5 4ff9282d
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
@@ -5,7 +5,9 @@ obj-$(CONFIG_FB_MSM_MDSS_MHL3) += mhl3/
mdss-mdp3-objs = mdp3.o mdp3_dma.o mdp3_ctrl.o dsi_status_v2.o
mdss-mdp3-objs += mdp3_ppp.o mdp3_ppp_hwio.o mdp3_ppp_data.o
obj-$(CONFIG_FB_MSM_MDSS_MDP3) += mdss-mdp3.o

ifeq ($(CONFIG_FB_MSM_MDSS_MDP3), y)
ccflags-y += -DTARGET_HW_MDSS_MDP3
endif
mdss-mdp-objs := mdss_mdp.o mdss_mdp_ctl.o mdss_mdp_pipe.o mdss_mdp_util.o dsi_status_6g.o
mdss-mdp-objs += mdss_mdp_pp.o mdss_mdp_pp_debug.o mdss_mdp_pp_cache_config.o
mdss-mdp-objs += mdss_mdp_intf_video.o
+4 −0
Original line number Diff line number Diff line
@@ -124,7 +124,9 @@ void mdss_fb_no_update_notify_timer_cb(unsigned long data)
void mdss_fb_bl_update_notify(struct msm_fb_data_type *mfd,
		uint32_t notification_type)
{
#ifndef TARGET_HW_MDSS_MDP3
	struct mdss_overlay_private *mdp5_data = NULL;
#endif
	if (!mfd) {
		pr_err("%s mfd NULL\n", __func__);
		return;
@@ -150,6 +152,7 @@ void mdss_fb_bl_update_notify(struct msm_fb_data_type *mfd,
		mutex_lock(&mfd->no_update.lock);
	}
	mutex_unlock(&mfd->no_update.lock);
#ifndef TARGET_HW_MDSS_MDP3
	mdp5_data = mfd_to_mdp5_data(mfd);
	if (mdp5_data) {
		if (notification_type == NOTIFY_TYPE_BL_AD_ATTEN_UPDATE) {
@@ -160,6 +163,7 @@ void mdss_fb_bl_update_notify(struct msm_fb_data_type *mfd,
			sysfs_notify_dirent(mdp5_data->bl_event_sd);
		}
	}
#endif
}

static int mdss_fb_notify_update(struct msm_fb_data_type *mfd,