diff options
| author | Nico Huber <nico.huber@secunet.com> | 2017-06-08 16:31:57 +0200 |
|---|---|---|
| committer | Nico Huber <nico.h@gmx.de> | 2017-10-28 19:45:15 +0000 |
| commit | 18228168a5e5ada33390ca96ef4b6ee80a509a89 (patch) | |
| tree | 9037023974b2c5caff0273727d7b7e8b96db4498 | |
| parent | 625160fd6acb8a638c512a71b8c1aa7986c2d68e (diff) | |
drivers/intel/gma: Put gma_gfxinit() into its own header
The current header `i915.h` is too invasive to be used everywhere where
we want to use *libgfxinit*.
Change-Id: Iba57256d536e301e598d98182448d2daa1bf9a89
Signed-off-by: Nico Huber <nico.huber@secunet.com>
Reviewed-on: https://review.coreboot.org/20112
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
| -rw-r--r-- | src/drivers/intel/gma/i915.h | 3 | ||||
| -rw-r--r-- | src/drivers/intel/gma/libgfxinit.h | 19 | ||||
| -rw-r--r-- | src/northbridge/intel/haswell/gma.c | 1 | ||||
| -rw-r--r-- | src/northbridge/intel/nehalem/gma.c | 1 | ||||
| -rw-r--r-- | src/northbridge/intel/sandybridge/gma.c | 1 |
5 files changed, 22 insertions, 3 deletions
diff --git a/src/drivers/intel/gma/i915.h b/src/drivers/intel/gma/i915.h index a4ae3069fa..0ddb2dea85 100644 --- a/src/drivers/intel/gma/i915.h +++ b/src/drivers/intel/gma/i915.h @@ -107,7 +107,4 @@ void generate_fake_intel_oprom(const struct i915_gpu_controller_info *conf, struct device *dev, const char *idstr); -/* interface to libgfxinit (gma.adb) */ -void gma_gfxinit(u64 mmio_base, u64 linear_fb, u32 phys_fb, int *success); - #endif diff --git a/src/drivers/intel/gma/libgfxinit.h b/src/drivers/intel/gma/libgfxinit.h new file mode 100644 index 0000000000..9b28f80b5f --- /dev/null +++ b/src/drivers/intel/gma/libgfxinit.h @@ -0,0 +1,19 @@ +/* + * This file is part of the coreboot project. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#ifndef DRIVERS_INTEL_GMA_LIBGFXINIT_H +#define DRIVERS_INTEL_GMA_LIBGFXINIT_H + +void gma_gfxinit(u64 mmio_base, u64 linear_fb, u32 phys_fb, int *success); + +#endif diff --git a/src/northbridge/intel/haswell/gma.c b/src/northbridge/intel/haswell/gma.c index a7b61e2ec9..535a7f0af0 100644 --- a/src/northbridge/intel/haswell/gma.c +++ b/src/northbridge/intel/haswell/gma.c @@ -23,6 +23,7 @@ #include <device/pci_ids.h> #include <drivers/intel/gma/i915_reg.h> #include <drivers/intel/gma/i915.h> +#include <drivers/intel/gma/libgfxinit.h> #include <cpu/intel/haswell/haswell.h> #include <drivers/intel/gma/opregion.h> #include <southbridge/intel/lynxpoint/nvs.h> diff --git a/src/northbridge/intel/nehalem/gma.c b/src/northbridge/intel/nehalem/gma.c index b50460ce32..591a2d6f56 100644 --- a/src/northbridge/intel/nehalem/gma.c +++ b/src/northbridge/intel/nehalem/gma.c @@ -27,6 +27,7 @@ #include <drivers/intel/gma/edid.h> #include <drivers/intel/gma/i915.h> #include <drivers/intel/gma/intel_bios.h> +#include <drivers/intel/gma/libgfxinit.h> #include <pc80/vga.h> #include <pc80/vga_io.h> #include <southbridge/intel/ibexpeak/nvs.h> diff --git a/src/northbridge/intel/sandybridge/gma.c b/src/northbridge/intel/sandybridge/gma.c index 25c9ea92f3..4cda965f4e 100644 --- a/src/northbridge/intel/sandybridge/gma.c +++ b/src/northbridge/intel/sandybridge/gma.c @@ -24,6 +24,7 @@ #include <device/pci_ops.h> #include <cpu/x86/msr.h> #include <cpu/x86/mtrr.h> +#include <drivers/intel/gma/libgfxinit.h> #include <southbridge/intel/bd82x6x/nvs.h> #include <drivers/intel/gma/opregion.h> #include <cbmem.h> |