[coreboot-gerrit] Change in coreboot[master]: drivers/intel/gma: put controller in separate header

[Matt DeVillier (Code Review)]

Matt DeVillier has submitted this change. ( https://review.coreboot.org/c/coreboot/+/40592 )

Change subject: drivers/intel/gma: put controller in separate header
......................................................................

drivers/intel/gma: put controller in separate header

Including i915.h just for the GMA/SSDT related functions means
dragging along all of i915_reg.h as well, which is problematic
since some platforms (like Apollo Lake) use overlapping symbols.
To avoid this conflict, break out the GMA/SSDT bits into their
own header which can be included without conflict.

Change-Id: I73fb7ef01abaafdcdbc44f1e3f5eb1883fc31616
Signed-off-by: Matt DeVillier 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/40592
Tested-by: build bot (Jenkins) 
Reviewed-by: Nico Huber 
---
A src/drivers/intel/gma/gma.h
M src/drivers/intel/gma/i915.h
2 files changed, 23 insertions(+), 15 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Nico Huber: Looks good to me, approved

diff --git a/src/drivers/intel/gma/gma.h b/src/drivers/intel/gma/gma.h
new file mode 100644
index 0000000..7d20e6b
--- /dev/null
+++ b/src/drivers/intel/gma/gma.h
@@ -0,0 +1,22 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/* This file is part of the coreboot project. */
+
+#ifndef _GMA_H_
+#define _GMA_H_
+
+#include <stdint.h>
+
+struct i915_gpu_controller_info {
+	int use_spread_spectrum_clock;
+	int ndid;
+	u32 did[5];
+};
+
+#define GMA_STATIC_DISPLAYS(ssc) {			\
+	.use_spread_spectrum_clock = (ssc),		\
+	.ndid = 3, .did = { 0x0100, 0x0240, 0x0410, }	\
+}
+
+void drivers_intel_gma_displays_ssdt_generate(const struct i915_gpu_controller_info *conf);
+
+#endif
diff --git a/src/drivers/intel/gma/i915.h b/src/drivers/intel/gma/i915.h
index f8721a2..e18c795 100644
--- a/src/drivers/intel/gma/i915.h
+++ b/src/drivers/intel/gma/i915.h
@@ -6,6 +6,7 @@

#include <drivers/intel/gma/i915_reg.h>
 #include <drivers/intel/gma/drm_dp_helper.h>
+#include <drivers/intel/gma/gma.h>
 #include <edid.h>

/* port types. We stick with the same defines as the kernel */
@@ -75,21 +76,6 @@
 void gtt_write(u32 reg, u32 data);
 u32 gtt_read(u32 reg);

-struct i915_gpu_controller_info
-{
-	int use_spread_spectrum_clock;
-	int ndid;
-	u32 did[5];
-};
-
-#define GMA_STATIC_DISPLAYS(ssc) {			\
-	.use_spread_spectrum_clock = (ssc),		\
-	.ndid = 3, .did = { 0x0100, 0x0240, 0x0410, }	\
-}
-
-void
-drivers_intel_gma_displays_ssdt_generate(const struct i915_gpu_controller_info *conf);
-
 /* vbt.c */
 struct device;
 void