From 7d8e3c12f5215fad54510675087b949a0d89cf38 Mon Sep 17 00:00:00 2001
From: "H. Nikolaus Schaller" <hns@goldelico.com>
Date: Tue, 29 Oct 2024 21:51:23 +0100
Subject: [PATCH] drm: pvrsgx: 1.8.869593: fix Makefile for out-of-tree builds
 since v6.9-rc1

With upstream commit b1992c3772e69a ("kbuild: use $(src) instead of $(srctree)/$(src) for source directory")
the logic of $(srctree) and $(src) has changed.

Consequently, $(srctree)/$(src) in upstream Makefiles need to be replaced with $(src).

Bug reported: https://github.com/openpvrsgx-devgroup/linux_openpvrsgx/issues/16

Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
---
 .../drm/pvrsgx/1.8.869593/eurasia_km/Makefile | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/drivers/gpu/drm/pvrsgx/1.8.869593/eurasia_km/Makefile b/drivers/gpu/drm/pvrsgx/1.8.869593/eurasia_km/Makefile
index eddd8472438e0..5aa5057d3bb16 100644
--- a/drivers/gpu/drm/pvrsgx/1.8.869593/eurasia_km/Makefile
+++ b/drivers/gpu/drm/pvrsgx/1.8.869593/eurasia_km/Makefile
@@ -43,24 +43,24 @@ ccflags-y += \
 	-I$(srctree)/include \
 	-I$(srctree)/arch/arm/mach-omap2 \
 	-I$(srctree)/drivers/video/fbdev/omap2 \
-	-I$(srctree)/$(src)/ \
-	-I$(srctree)/$(src)/include4 \
-	-I$(srctree)/$(src)/services4/include \
-	-I$(srctree)/$(src)/services4/include/env/linux \
-	-I$(srctree)/$(src)/services4/system/include \
-	-I$(srctree)/$(src)/services4/srvkm/bridged \
-	-I$(srctree)/$(src)/services4/srvkm/bridged/sgx \
-	-I$(srctree)/$(src)/services4/srvkm/devices/sgx \
-	-I$(srctree)/$(src)/services4/srvkm/env/linux \
-	-I$(srctree)/$(src)/services4/srvkm/hwdefs \
-	-I$(srctree)/$(src)/services4/srvkm/include \
-	-I$(srctree)/$(src)/services4/3rdparty/bufferclass_ti \
+	-I$(src)/ \
+	-I$(src)/include4 \
+	-I$(src)/services4/include \
+	-I$(src)/services4/include/env/linux \
+	-I$(src)/services4/system/include \
+	-I$(src)/services4/srvkm/bridged \
+	-I$(src)/services4/srvkm/bridged/sgx \
+	-I$(src)/services4/srvkm/devices/sgx \
+	-I$(src)/services4/srvkm/env/linux \
+	-I$(src)/services4/srvkm/hwdefs \
+	-I$(src)/services4/srvkm/include \
+	-I$(src)/services4/3rdparty/bufferclass_ti \
 	-I$(srctree)/include/linux
 
 # choose SoC integration variant to choose the right source subtree
 
 ccflags-y += \
-	-I$(srctree)/$(src)/services4/system/$(SOC_FAMILY)
+	-I$(src)/services4/system/$(SOC_FAMILY)
 
 ifeq ($(SOC_FAMILY),omap)
 $(TARGET) += \
@@ -230,7 +230,7 @@ endif
 # $(TARGET) += services4/3rdparty/linux_drm/pvr_drm_stubs.o
 
 ccflags-y += -I$(srctree)/include/drm \
-	-I$(srctree)/$(src)/services4/3rdparty/linux_drm
+	-I$(src)/services4/3rdparty/linux_drm
 
 ccflags-y += -DSUPPORT_HW_RECOVERY
 ccflags-y += -DPVR_LINUX_USING_WORKQUEUES
@@ -269,7 +269,7 @@ endif
 ifneq ($(SUPPORT_OMAPLFB),)
 
 ccflags-y += \
-	-I$(srctree)/$(src)/services4/3rdparty/dc_omapfb3_linux \
+	-I$(src)/services4/3rdparty/dc_omapfb3_linux \
 	-DFBDEV_PRESENT=1 \
 	-DSUPPORT_OMAP3430_OMAPFB3 \
 	-DDISPLAY_CONTROLLER=omaplfb \