Add a few definitions to it that are already shared and that will
be shared in the future (like the number of stolen entries).
No functional changes in here.
Signed-off-by: Daniel Vetter <daniel.vet...@ffwll.ch>
---
drivers/char/agp/intel-gtt.c | 42 +++++++++++++++++---------------------
drivers/gpu/drm/i915/i915_dma.c | 2 -
drivers/gpu/drm/i915/i915_drv.h | 1 +
include/drm/intel-gtt.h | 18 ++++++++++++++++
4 files changed, 38 insertions(+), 25 deletions(-)
create mode 100644 include/drm/intel-gtt.h
diff --git a/drivers/char/agp/intel-gtt.c b/drivers/char/agp/intel-gtt.c
index 425be6a..70c0095 100644
--- a/drivers/char/agp/intel-gtt.c
+++ b/drivers/char/agp/intel-gtt.c
@@ -24,6 +24,7 @@
#include <asm/smp.h>
#include "agp.h"
#include "intel-agp.h"
+#include <drm/intel-gtt.h>
/*
* If we have Intel graphics, we're not going to have anything other than
@@ -60,17 +61,11 @@ static struct gatt_mask intel_i810_masks[] =
};
static struct _intel_private {
+ struct intel_gtt base;
struct pci_dev *pcidev; /* device one */
u8 __iomem *registers;
u32 __iomem *gtt; /* I915G */
int num_dcache_entries;
- /* gtt_entries is the number of gtt entries that are already mapped
- * to stolen memory. Stolen memory is larger than the memory mapped
- * through gtt_entries, as it includes some reserved space for the BIOS
- * popup and for the GTT.
- */
- int gtt_entries; /* i830+ */
- int gtt_total_size;
union {
void __iomem *i9xx_flush_page;
void *i8xx_flush_page;
@@ -742,7 +737,7 @@ static void intel_i830_init_gtt_entries(void)
gtt_entries = 0;
}
- intel_private.gtt_entries = gtt_entries;
+ intel_private.base.gtt_stolen_entries = gtt_entries;
}
static void intel_i830_fini_flush(void)
@@ -819,7 +814,7 @@ static int intel_i830_create_gatt_table(struct
agp_bridge_data *bridge)
/* we have to call this as early as possible after the MMIO base
address is known */
intel_i830_init_gtt_entries();
- if (intel_private.gtt_entries == 0) {
+ if (intel_private.base.gtt_stolen_entries == 0) {
iounmap(intel_private.registers);
return -ENOMEM;
}
@@ -889,7 +884,7 @@ static int intel_i830_configure(void)
readl(intel_private.registers+I810_PGETBL_CTL); /* PCI Posting. */
if (agp_bridge->driver->needs_scratch_page) {
- for (i = intel_private.gtt_entries; i <
current_size->num_entries; i++) {
+ for (i = intel_private.base.gtt_stolen_entries; i <
current_size->num_entries; i++) {
writel(agp_bridge->scratch_page,
intel_private.registers+I810_PTE_BASE+(i*4));
}
readl(intel_private.registers+I810_PTE_BASE+((i-1)*4)); /* PCI
Posting. */
@@ -920,10 +915,10 @@ static int intel_i830_insert_entries(struct agp_memory
*mem, off_t pg_start,
temp = agp_bridge->current_size;
num_entries = A_SIZE_FIX(temp)->num_entries;
- if (pg_start < intel_private.gtt_entries) {
+ if (pg_start < intel_private.base.gtt_stolen_entries) {
dev_printk(KERN_DEBUG, &intel_private.pcidev->dev,
- "pg_start == 0x%.8lx, intel_private.gtt_entries ==
0x%.8x\n",
- pg_start, intel_private.gtt_entries);
+ "pg_start == 0x%.8lx, gtt_stolen_entries ==
0x%.8x\n",
+ pg_start, intel_private.base.gtt_stolen_entries);
dev_info(&intel_private.pcidev->dev,
"trying to insert into local/stolen memory\n");
@@ -971,7 +966,7 @@ static int intel_i830_remove_entries(struct agp_memory
*mem, off_t pg_start,
if (mem->page_count == 0)
return 0;
- if (pg_start < intel_private.gtt_entries) {
+ if (pg_start < intel_private.base.gtt_stolen_entries) {
dev_info(&intel_private.pcidev->dev,
"trying to disable local/stolen memory\n");
return -EINVAL;
@@ -1106,7 +1101,8 @@ static int intel_i9xx_configure(void)
readl(intel_private.registers+I810_PGETBL_CTL); /* PCI Posting. */
if (agp_bridge->driver->needs_scratch_page) {
- for (i = intel_private.gtt_entries; i <
intel_private.gtt_total_size; i++) {
+ for (i = intel_private.base.gtt_stolen_entries; i <
+ intel_private.base.gtt_total_entries; i++) {
writel(agp_bridge->scratch_page, intel_private.gtt+i);
}
readl(intel_private.gtt+i-1); /* PCI Posting. */
@@ -1151,10 +1147,10 @@ static int intel_i915_insert_entries(struct agp_memory
*mem, off_t pg_start,
temp = agp_bridge->current_size;
num_entries = A_SIZE_FIX(temp)->num_entries;
- if (pg_start < intel_private.gtt_entries) {
+ if (pg_start < intel_private.base.gtt_stolen_entries) {
dev_printk(KERN_DEBUG, &intel_private.pcidev->dev,
- "pg_start == 0x%.8lx, intel_private.gtt_entries ==
0x%.8x\n",
- pg_start, intel_private.gtt_entries);
+ "pg_start == 0x%.8lx, gtt_stolen_entries ==
0x%.8x\n",
+ pg_start, intel_private.base.gtt_stolen_entries);
dev_info(&intel_private.pcidev->dev,
"trying to insert into local/stolen memory\n");
@@ -1197,7 +1193,7 @@ static int intel_i915_remove_entries(struct agp_memory
*mem, off_t pg_start,
if (mem->page_count == 0)
return 0;
- if (pg_start < intel_private.gtt_entries) {
+ if (pg_start < intel_private.base.gtt_stolen_entries) {
dev_info(&intel_private.pcidev->dev,
"trying to disable local/stolen memory\n");
return -EINVAL;
@@ -1293,7 +1289,7 @@ static int intel_i915_create_gatt_table(struct
agp_bridge_data *bridge)
if (!intel_private.gtt)
return -ENOMEM;
- intel_private.gtt_total_size = gtt_map_size / 4;
+ intel_private.base.gtt_total_entries = gtt_map_size / 4;
temp &= 0xfff80000;
@@ -1308,7 +1304,7 @@ static int intel_i915_create_gatt_table(struct
agp_bridge_data *bridge)
/* we have to call this as early as possible after the MMIO base
address is known */
intel_i830_init_gtt_entries();
- if (intel_private.gtt_entries == 0) {
+ if (intel_private.base.gtt_stolen_entries == 0) {
iounmap(intel_private.gtt);
iounmap(intel_private.registers);
return -ENOMEM;
@@ -1418,7 +1414,7 @@ static int intel_i965_create_gatt_table(struct
agp_bridge_data *bridge)
if (!intel_private.gtt)
return -ENOMEM;
- intel_private.gtt_total_size = gtt_size / 4;
+ intel_private.base.gtt_total_entries = gtt_size / 4;
intel_private.registers = ioremap(temp, 128 * 4096);
if (!intel_private.registers) {
@@ -1431,7 +1427,7 @@ static int intel_i965_create_gatt_table(struct
agp_bridge_data *bridge)
/* we have to call this as early as possible after the MMIO base
address is known */
intel_i830_init_gtt_entries();
- if (intel_private.gtt_entries == 0) {
+ if (intel_private.base.gtt_stolen_entries == 0) {
iounmap(intel_private.gtt);
iounmap(intel_private.registers);
return -ENOMEM;
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index 6b67d17..4ff0a49 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -41,8 +41,6 @@
#include <linux/vga_switcheroo.h>
#include <linux/slab.h>
-extern int intel_max_stolen; /* from AGP driver */
-
/**
* Sets up the hardware status page for devices that need a physical address
* in the register.
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 11dff01..21cae69 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -34,6 +34,7 @@
#include "intel_bios.h"
#include "intel_ringbuffer.h"
#include <linux/io-mapping.h>
+#include <drm/intel-gtt.h>
/* General customization:
*/
diff --git a/include/drm/intel-gtt.h b/include/drm/intel-gtt.h
new file mode 100644
index 0000000..6769cb7
--- /dev/null
+++ b/include/drm/intel-gtt.h
@@ -0,0 +1,18 @@
+/* Common header for intel-gtt.ko and i915.ko */
+
+#ifndef _DRM_INTEL_GTT_H
+#define _DRM_INTEL_GTT_H
+extern int intel_max_stolen; /* from AGP driver */
+
+struct intel_gtt {
+ /* Number of stolen gtt entries at the beginning. */
+ unsigned int gtt_stolen_entries;
+ /* Total number of gtt entries. */
+ unsigned int gtt_total_entries;
+ /* Part of the gtt that is mappable by the cpu, for those chips where
+ * this is not the full gtt. */
+ unsigned int gtt_mappable_entries;
+};
+
+#endif
+
--
1.7.2.2
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
