From 86da0d309459a184d3968601fae7c66cf67c7592 Mon Sep 17 00:00:00 2001
From: Jordan Crouse <jcrouse@codeaurora.org>
Date: Mon, 9 Dec 2019 11:42:30 -0700
Subject: [PATCH] msm: kgsl: Re-export the UAPI header

Commit 7a6368ee0b14 ("msm: kgsl: Add support for the Adreno GPU") stopped
exporting the uapi header. Unfortunately not all the user-mode libraries
got the message. Start exporting it again to prevent breakage while
everybody figures out how to transition correctly.

Change-Id: Ic0dedbadc187d018b9ff34c0a93f156d525e8b16
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
---
 drivers/gpu/msm/kgsl.h                                  | 2 +-
 drivers/gpu/msm/kgsl_compat.h                           | 3 +--
 {drivers/gpu/msm/uapi => include/uapi/linux}/msm_kgsl.h | 0
 3 files changed, 2 insertions(+), 3 deletions(-)
 rename {drivers/gpu/msm/uapi => include/uapi/linux}/msm_kgsl.h (100%)

diff --git a/drivers/gpu/msm/kgsl.h b/drivers/gpu/msm/kgsl.h
index dd4310cd06f3..7477d83cbe76 100644
--- a/drivers/gpu/msm/kgsl.h
+++ b/drivers/gpu/msm/kgsl.h
@@ -10,12 +10,12 @@
 #include <linux/interrupt.h>
 #include <linux/kthread.h>
 #include <linux/mm.h>
+#include <linux/msm_kgsl.h>
 #include <linux/uaccess.h>
 
 #include "kgsl_gmu_core.h"
 #include "kgsl_pwrscale.h"
 
-#include "uapi/msm_kgsl.h"
 
 /*
  * --- kgsl drawobj flags ---
diff --git a/drivers/gpu/msm/kgsl_compat.h b/drivers/gpu/msm/kgsl_compat.h
index 6fbf3de784b6..a62c3b40d798 100644
--- a/drivers/gpu/msm/kgsl_compat.h
+++ b/drivers/gpu/msm/kgsl_compat.h
@@ -6,8 +6,7 @@
 #define __KGSL_COMPAT_H
 
 #include <linux/compat.h>
-
-#include "uapi/msm_kgsl.h"
+#include <linux/msm_kgsl.h>
 
 #ifdef CONFIG_COMPAT
 
diff --git a/drivers/gpu/msm/uapi/msm_kgsl.h b/include/uapi/linux/msm_kgsl.h
similarity index 100%
rename from drivers/gpu/msm/uapi/msm_kgsl.h
rename to include/uapi/linux/msm_kgsl.h