Merge "msm: mdp3: Remove panic ctrl duing ctrl off" (6085f0ad) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/video/fbdev/msm/mdp3.c

+1 −12

Original line number	Diff line number	Diff line
		/* Copyright (c) 2013-2018, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2013-2019, The Linux Foundation. All rights reserved.
		* Copyright (C) 2007 Google Incorporated
		*
		* This software is licensed under the terms of the GNU General Public
		@@ -916,17 +916,6 @@ u64 mdp3_get_panic_lut_cfg(u32 panel_width)
		return panic_config;
		}

		int mdp3_enable_panic_ctrl(void)
		{
		int rc = 0;

		if (MDP3_REG_READ(MDP3_PANIC_ROBUST_CTRL) == 0) {
		pr_err("%s: Enable Panic Control\n", __func__);
		MDP3_REG_WRITE(MDP3_PANIC_ROBUST_CTRL, BIT(0));
		}
		return rc;
		}

		int mdp3_qos_remapper_setup(struct mdss_panel_data *panel)
		{
		int rc = 0;

+1 −2

Original line number	Diff line number	Diff line
		/* Copyright (c) 2013-2014, 2016-2018, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2013-2014, 2016-2019, The Linux Foundation. All rights reserved.
		* Copyright (C) 2007 Google Incorporated
		*
		* This program is free software; you can redistribute it and/or modify
		@@ -281,7 +281,6 @@ u64 mdp3_clk_round_off(u64 clk_rate);
		void mdp3_calc_dma_res(struct mdss_panel_info panel_info, u64 clk_rate,
		u64 ab, u64 ib, uint32_t bpp);
		void mdp3_clear_irq(u32 interrupt_mask);
		int mdp3_enable_panic_ctrl(void);

		void mdss_spi_panel_bl_ctrl_update(struct mdss_panel_data *pdata, u32 bl_level);

+3 −5

Original line number	Diff line number	Diff line
		@@ -961,8 +961,6 @@ static int mdp3_ctrl_on(struct msm_fb_data_type *mfd)
		MDSS_EVENT_UNBLANK, NULL);
		rc \|= panel->event_handler(panel,
		MDSS_EVENT_PANEL_ON, NULL);
		if (mdss_fb_is_power_on_lp(mfd))
		rc \|= mdp3_enable_panic_ctrl();
		mdp3_clk_enable(0, 0);
		}
		}