summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/soc/intel/common/block/graphics/graphics.c30
-rw-r--r--src/soc/intel/common/block/include/intelblocks/graphics.h4
2 files changed, 27 insertions, 7 deletions
diff --git a/src/soc/intel/common/block/graphics/graphics.c b/src/soc/intel/common/block/graphics/graphics.c
index efbc3e7cc5..e1eb6fe6fb 100644
--- a/src/soc/intel/common/block/graphics/graphics.c
+++ b/src/soc/intel/common/block/graphics/graphics.c
@@ -18,6 +18,7 @@
#include <device/mmio.h>
#include <device/pci.h>
#include <device/pci_ids.h>
+#include <drivers/intel/gma/i915.h>
#include <intelblocks/graphics.h>
#include <soc/pci_devs.h>
@@ -32,6 +33,20 @@ __weak void graphics_soc_init(struct device *dev)
pci_dev_init(dev);
}
+__weak const struct i915_gpu_controller_info *
+intel_igd_get_controller_info(struct device *device)
+{
+ return NULL;
+}
+
+static void gma_generate_ssdt(struct device *device)
+{
+ const struct i915_gpu_controller_info *gfx = intel_igd_get_controller_info(device);
+
+ if (gfx)
+ drivers_intel_gma_displays_ssdt_generate(gfx);
+}
+
static int is_graphics_disabled(struct device *dev)
{
/* Check if Graphics PCI device is disabled */
@@ -111,15 +126,16 @@ void graphics_gtt_rmw(unsigned long reg, uint32_t andmask, uint32_t ormask)
}
static const struct device_operations graphics_ops = {
- .read_resources = pci_dev_read_resources,
- .set_resources = pci_dev_set_resources,
- .enable_resources = pci_dev_enable_resources,
- .init = graphics_soc_init,
- .ops_pci = &pci_dev_ops_pci,
+ .read_resources = pci_dev_read_resources,
+ .set_resources = pci_dev_set_resources,
+ .enable_resources = pci_dev_enable_resources,
+ .init = graphics_soc_init,
+ .ops_pci = &pci_dev_ops_pci,
#if CONFIG(HAVE_ACPI_TABLES)
- .write_acpi_tables = graphics_soc_write_acpi_opregion,
+ .write_acpi_tables = graphics_soc_write_acpi_opregion,
+ .acpi_fill_ssdt_generator = gma_generate_ssdt,
#endif
- .scan_bus = scan_generic_bus,
+ .scan_bus = scan_generic_bus,
};
static const unsigned short pci_device_ids[] = {
diff --git a/src/soc/intel/common/block/include/intelblocks/graphics.h b/src/soc/intel/common/block/include/intelblocks/graphics.h
index 8e98228424..153f9d8184 100644
--- a/src/soc/intel/common/block/include/intelblocks/graphics.h
+++ b/src/soc/intel/common/block/include/intelblocks/graphics.h
@@ -44,6 +44,10 @@ void graphics_soc_init(struct device *dev);
uintptr_t graphics_soc_write_acpi_opregion(struct device *device,
uintptr_t current, struct acpi_rsdp *rsdp);
+/* i915 controller info for ACPI backlight controls */
+const struct i915_gpu_controller_info *
+intel_igd_get_controller_info(struct device *device);
+
/* Graphics MMIO register read/write APIs */
uint32_t graphics_gtt_read(unsigned long reg);
void graphics_gtt_write(unsigned long reg, uint32_t data);