From 22a3c5a8424731048806421c38a474b3ddf1d7ac Mon Sep 17 00:00:00 2001
From: Raviteja Tamatam <quic_travitej@quicinc.com>
Date: Thu, 13 Oct 2022 16:09:54 -0700
Subject: [PATCH] disp: msm: fix display compilation for 6.0 kernel upgrade

Fix display compilation issues for 6.0 kernel upgrade.

Change-Id: Ied1940e653ceaa1de18a8aedeab01197c235603c
Signed-off-by: Raviteja Tamatam <quic_travitej@quicinc.com>
---
 msm/dsi/dsi_drm.c     | 1 +
 msm/msm_drv.h         | 1 +
 msm/sde/sde_encoder.c | 1 +
 msm/sde/sde_hw_mdss.h | 1 +
 msm/sde/sde_kms.h     | 1 +
 msm/sde/sde_plane.c   | 1 +
 6 files changed, 6 insertions(+)

diff --git a/msm/dsi/dsi_drm.c b/msm/dsi/dsi_drm.c
index 33a2f50808..fb28b39d92 100644
--- a/msm/dsi/dsi_drm.c
+++ b/msm/dsi/dsi_drm.c
@@ -7,6 +7,7 @@
 
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_atomic.h>
+#include <drm/drm_edid.h>
 
 #include "msm_kms.h"
 #include "sde_connector.h"
diff --git a/msm/msm_drv.h b/msm/msm_drv.h
index 313e183f84..c98b71cd95 100644
--- a/msm/msm_drv.h
+++ b/msm/msm_drv.h
@@ -55,6 +55,7 @@
 #include <drm/drm_dsc.h>
 #endif
 #include <drm/drm_bridge.h>
+#include <drm/drm_framebuffer.h>
 
 #include "sde_power_handle.h"
 
diff --git a/msm/sde/sde_encoder.c b/msm/sde/sde_encoder.c
index e3fa43232b..6838c5c890 100644
--- a/msm/sde/sde_encoder.c
+++ b/msm/sde/sde_encoder.c
@@ -28,6 +28,7 @@
 #include "sde_kms.h"
 #include <drm/drm_crtc.h>
 #include <drm/drm_probe_helper.h>
+#include <drm/drm_edid.h>
 #include "sde_hwio.h"
 #include "sde_hw_catalog.h"
 #include "sde_hw_intf.h"
diff --git a/msm/sde/sde_hw_mdss.h b/msm/sde/sde_hw_mdss.h
index 58e49ffcb7..6249c4dd04 100644
--- a/msm/sde/sde_hw_mdss.h
+++ b/msm/sde/sde_hw_mdss.h
@@ -12,6 +12,7 @@
 
 #include <drm/sde_drm.h>
 #include <drm/msm_drm_pp.h>
+#include <drm/drm_fourcc.h>
 
 #include "msm_drv.h"
 
diff --git a/msm/sde/sde_kms.h b/msm/sde/sde_kms.h
index d82c5ea6d9..dd5a600d34 100644
--- a/msm/sde/sde_kms.h
+++ b/msm/sde/sde_kms.h
@@ -22,6 +22,7 @@
 
 #include <linux/pm_domain.h>
 #include <linux/pm_qos.h>
+#include <drm/drm_framebuffer.h>
 
 #include "msm_drv.h"
 #include "msm_kms.h"
diff --git a/msm/sde/sde_plane.c b/msm/sde/sde_plane.c
index b7f33c84fb..82697ab942 100644
--- a/msm/sde/sde_plane.c
+++ b/msm/sde/sde_plane.c
@@ -24,6 +24,7 @@
 #include <drm/sde_drm.h>
 #include <drm/msm_drm_pp.h>
 #include <linux/version.h>
+#include <drm/drm_blend.h>
 
 #include "msm_prop.h"
 #include "msm_drv.h"