From 4c1eb416f36c190728eb26107c202be84d44e56d Mon Sep 17 00:00:00 2001
From: Konstantin Makariev <hcv867@motorola.com>
Date: Wed, 1 Aug 2018 15:16:01 -0500
Subject: [PATCH] fixup! (CR) synaptics_mmi: DSI bound suspend/resume

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
---
 drivers/input/touchscreen/synaptics_mmi/synaptics_dsx_i2c.c | 1 -
 drivers/input/touchscreen/synaptics_mmi/synaptics_dsx_i2c.h | 5 ++++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/input/touchscreen/synaptics_mmi/synaptics_dsx_i2c.c b/drivers/input/touchscreen/synaptics_mmi/synaptics_dsx_i2c.c
index 37c542c33ecf..a98b8118a5bf 100644
--- a/drivers/input/touchscreen/synaptics_mmi/synaptics_dsx_i2c.c
+++ b/drivers/input/touchscreen/synaptics_mmi/synaptics_dsx_i2c.c
@@ -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"
diff --git a/drivers/input/touchscreen/synaptics_mmi/synaptics_dsx_i2c.h b/drivers/input/touchscreen/synaptics_mmi/synaptics_dsx_i2c.h
index 49e851e811e9..2797ebd92e56 100644
--- a/drivers/input/touchscreen/synaptics_mmi/synaptics_dsx_i2c.h
+++ b/drivers/input/touchscreen/synaptics_mmi/synaptics_dsx_i2c.h
@@ -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;