A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-09 13:49:24 -04:00
Code Issues Projects Releases Packages Wiki Activity

fixup! (CR) synaptics_mmi: DSI bound suspend/resume

Browse source 
Include MSM DRM header conditionally. Both CONFIG_DRM and CONFIG_FB are
enabled in DRM controlled framework, thus check CONFIG_DRM first.

CRs-fixed: (CR)

Signed-off-by: Konstantin Makariev <hcv867@motorola.com>
Change-Id: I3fe70ff79f2050acce256aff7c3c36d2e2cf04b3
Reviewed-on: https://gerrit.mot.com/1219402
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Ryan Lattrel <ryanl@motorola.com>
Reviewed-by: Konstantin Makariev <kmakariev@motorola.com>
Submit-Approved: Jira Key
This commit is contained in:
Konstantin Makariev 2018-08-01 15:16:01 -05:00 • committed by Konstantin Makariev
commit 4c1eb416f3
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
drivers/input/touchscreen/synaptics_mmi/synaptics_dsx_i2c.c
View file

@ -36,7 +36,6 @@
#include <linux/pinctrl/consumer.h>
#include <linux/input/mt.h>
#include <linux/input/synaptics_dsx_mmi.h>
#include <linux/msm_drm_notify.h>
#include "synaptics_dsx_i2c.h"
#include "synaptics_dsx_dropbox.h"

5
drivers/input/touchscreen/synaptics_mmi/synaptics_dsx_i2c.h
View file

@ -35,6 +35,9 @@
#endif
#if defined(CONFIG_MMI_PANEL_NOTIFICATIONS)
#include <linux/mmi_panel_notifier.h>
#elif defined(CONFIG_DRM)
#include <linux/notifier.h>
#include <linux/msm_drm_notify.h>
#elif defined(CONFIG_FB)
#include <linux/notifier.h>
#include <linux/fb.h>
@ -474,7 +477,7 @@ struct synaptics_rmi4_data {
struct mutex state_mutex;
#if defined(CONFIG_MMI_PANEL_NOTIFICATIONS)
struct mmi_notifier panel_nb;
#elif defined(CONFIG_FB)
#elif (defined(CONFIG_FB) || defined(CONFIG_DRM))
struct notifier_block panel_nb;
#endif
atomic_t panel_off_flag;