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

Commit 76dcbfb6 authored by Xianzhu ZHANG's avatar Xianzhu ZHANG
Browse files

Revert "[ALM:10872955] [FP4]:TP drm notifier debug" 

This reverts commit 7560f868.

Change-Id: I3a1d34ff2eb3b20f40c0185bdb5edfc5e794ddc3
parent 7560f868

arch/arm64/configs/vendor/fp4-perf_defconfig

+3 −2
Original line number Diff line number Diff line
@@ -343,12 +343,11 @@ CONFIG_TABLET_USB_HANWANG=y 
CONFIG_TABLET_USB_KBTAB=y

CONFIG_INPUT_TOUCHSCREEN=y

CONFIG_TOUCHSCREEN_HIMAX_CHIPSET=y

CONFIG_TOUCHSCREEN_HIMAX_I2C=y

CONFIG_TOUCHSCREEN_HIMAX_INCELL=y

CONFIG_TOUCHSCREEN_HIMAX_IC_HX83112=y

CONFIG_TOUCHSCREEN_HIMAX_INSPECT=y

CONFIG_TOUCHSCREEN_HIMAX_COMMON=y

CONFIG_TOUCHSCREEN_HIMAX_DEBUG=y

# CONFIG_TOUCHSCREEN_HIMAX_EMBEDDED_FIRMWARE=y

# CONFIG_SECURE_TOUCH_SYNAPTICS_DSX is not set

# CONFIG_TOUCHSCREEN_SYNAPTICS_TCM_REFLASH is not set

# CONFIG_TOUCHSCREEN_SYNAPTICS_TCM_RECOVERY is not set
@@ -727,3 +726,5 @@ CONFIG_TCT_PM7250_COMMON=y 
CONFIG_USB_PD_LOG_LVL=1

CONFIG_BATTERY_BQ27541_HDQ=y

CONFIG_AW8695_HAPTIC=y

#[Camera]ADD ST TOF

CONFIG_STMVL53L1=y

arch/arm64/configs/vendor/fp4_defconfig

+3 −2
Original line number Diff line number Diff line
@@ -350,12 +350,11 @@ CONFIG_TABLET_USB_HANWANG=y 
CONFIG_TABLET_USB_KBTAB=y

CONFIG_INPUT_TOUCHSCREEN=y

CONFIG_TOUCHSCREEN_HIMAX_CHIPSET=y

CONFIG_TOUCHSCREEN_HIMAX_I2C=y

CONFIG_TOUCHSCREEN_HIMAX_INCELL=y

CONFIG_TOUCHSCREEN_HIMAX_IC_HX83112=y

CONFIG_TOUCHSCREEN_HIMAX_INSPECT=y

CONFIG_TOUCHSCREEN_HIMAX_COMMON=y

CONFIG_TOUCHSCREEN_HIMAX_DEBUG=y

# CONFIG_TOUCHSCREEN_HIMAX_EMBEDDED_FIRMWARE=y

# CONFIG_SECURE_TOUCH_SYNAPTICS_DSX is not set

# CONFIG_TOUCHSCREEN_SYNAPTICS_TCM_REFLASH is not set

# CONFIG_TOUCHSCREEN_SYNAPTICS_TCM_RECOVERY is not set
@@ -795,3 +794,5 @@ CONFIG_TCT_PM7250_COMMON=y 
CONFIG_USB_PD_LOG_LVL=1

CONFIG_BATTERY_BQ27541_HDQ=y

CONFIG_AW8695_HAPTIC=y

#[Camera]ADD ST TOF

CONFIG_STMVL53L1=y

drivers/input/touchscreen/hxchipset/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -4,6 +4,10 @@ ifneq ($(filter y, $(CONFIG_KALLSYMS_ALL)),) 
	ccflags-y += -D__KERNEL_KALLSYMS_ALL_ENABLED__

endif



ifneq ($(filter y, $(CONFIG_FB)),)

	ccflags-y += -DHX_CONFIG_FB

endif



ifneq ($(filter y, $(CONFIG_DRM)),)

	ccflags-y += -DHX_CONFIG_DRM

endif

drivers/input/touchscreen/hxchipset/himax_common.c

+14 −17
Original line number Diff line number Diff line
@@ -2802,16 +2802,18 @@ static void himax_fb_register(struct work_struct *work) 
	ts->fb_notif.notifier_call = fb_notifier_callback;

	ret = fb_register_client(&ts->fb_notif);

#elif defined(HX_CONFIG_DRM)

#if defined(__HIMAX_MOD__)

	hx_msm_drm_register_client =

		(void *)kallsyms_lookup_name("msm_drm_register_client");

	if (hx_msm_drm_register_client != NULL) {

		ts->fb_notif.notifier_call = drm_notifier_callback;

	if (active_panel) {

		ret = drm_panel_notifier_register(active_panel,

			&ts->fb_notif);

		if (ret)

			E("Failed to register fb notifier client");

	}

	else {

		E("active_panel error\n");

	}

		ret = hx_msm_drm_register_client(&ts->fb_notif);

	}	else

		E("hx_msm_drm_register_client is NULL\n");

#else

	ts->fb_notif.notifier_call = drm_notifier_callback;

	ret = msm_drm_register_client(&ts->fb_notif);

#endif

#endif

	if (ret)

		E("Unable to register fb_notifier: %d\n", ret);
@@ -3070,7 +3072,7 @@ int himax_chip_common_init(void) 
		err = -ENOMEM;

		goto err_get_intr_bit_failed;

	}

	I("register fb  \n");



	INIT_DELAYED_WORK(&ts->work_att, himax_fb_register);

	queue_delayed_work(ts->himax_att_wq, &ts->work_att,

			msecs_to_jiffies(15000));
@@ -3153,7 +3155,6 @@ int himax_chip_common_init(void) 
void himax_chip_common_deinit(void)

{

	struct himax_ts_data *ts = private_ts;

	int ret = 0;



	himax_ts_unregister_interrupt();
@@ -3186,12 +3187,8 @@ void himax_chip_common_deinit(void) 
	} else

		E("hx_msm_drm_unregister_client is NULL\n");

#else

    if (active_panel) {

		ret = drm_panel_notifier_unregister(active_panel,

				&ts->fb_notif);

		if (ret < 0)

            E("Failed to unregister fb notifier client");

	}

	if (msm_drm_unregister_client(&ts->fb_notif))

		E("Error occurred while unregistering drm_notifier.\n");

#endif

	cancel_delayed_work_sync(&ts->work_att);

	destroy_workqueue(ts->himax_att_wq);

drivers/input/touchscreen/hxchipset/himax_common.h

+0 −2
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ 
#include <linux/proc_fs.h>

#include "himax_platform.h"

#include <linux/kallsyms.h>

#include <drm/drm_panel.h>



#if defined(CONFIG_OF)

	#include <linux/of_gpio.h>
@@ -573,7 +572,6 @@ extern struct himax_core_fp g_core_fp; 
extern struct himax_ts_data *private_ts;

extern struct himax_ic_data *ic_data;

extern struct device *g_device;

extern struct drm_panel *active_panel;



#if defined(CONFIG_TOUCHSCREEN_HIMAX_DEBUG)

	int himax_debug_init(void);