From: Jesse Barnes <jbarnes@virtuousgeek.org>
To: Ben Widawsky <ben@bwidawsk.net>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH 08/10] drm/i915: Kill off now unused gen6+ AGP code
Date: Thu, 25 Oct 2012 14:07:23 -0700 [thread overview]
Message-ID: <20121025140723.094deaba@jbarnes-desktop> (raw)
In-Reply-To: <1350956055-3224-9-git-send-email-ben@bwidawsk.net>
On Mon, 22 Oct 2012 18:34:13 -0700
Ben Widawsky <ben@bwidawsk.net> wrote:
> Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
> ---
> drivers/char/agp/intel-agp.h | 91 -------------
> drivers/char/agp/intel-gtt.c | 307 +------------------------------------------
> include/drm/intel-gtt.h | 4 -
> 3 files changed, 3 insertions(+), 399 deletions(-)
>
> diff --git a/drivers/char/agp/intel-agp.h b/drivers/char/agp/intel-agp.h
> index 6ec0fff..1042c1b 100644
> --- a/drivers/char/agp/intel-agp.h
> +++ b/drivers/char/agp/intel-agp.h
> @@ -62,12 +62,6 @@
> #define I810_PTE_LOCAL 0x00000002
> #define I810_PTE_VALID 0x00000001
> #define I830_PTE_SYSTEM_CACHED 0x00000006
> -/* GT PTE cache control fields */
> -#define GEN6_PTE_UNCACHED 0x00000002
> -#define HSW_PTE_UNCACHED 0x00000000
> -#define GEN6_PTE_LLC 0x00000004
> -#define GEN6_PTE_LLC_MLC 0x00000006
> -#define GEN6_PTE_GFDT 0x00000008
>
> #define I810_SMRAM_MISCC 0x70
> #define I810_GFX_MEM_WIN_SIZE 0x00010000
> @@ -97,7 +91,6 @@
> #define G4x_GMCH_SIZE_VT_2M (G4x_GMCH_SIZE_2M | G4x_GMCH_SIZE_VT_EN)
>
> #define GFX_FLSH_CNTL 0x2170 /* 915+ */
> -#define GFX_FLSH_CNTL_VLV 0x101008
>
> #define I810_DRAM_CTL 0x3000
> #define I810_DRAM_ROW_0 0x00000001
> @@ -148,29 +141,6 @@
> #define INTEL_I7505_AGPCTRL 0x70
> #define INTEL_I7505_MCHCFG 0x50
>
> -#define SNB_GMCH_CTRL 0x50
> -#define SNB_GMCH_GMS_STOLEN_MASK 0xF8
> -#define SNB_GMCH_GMS_STOLEN_32M (1 << 3)
> -#define SNB_GMCH_GMS_STOLEN_64M (2 << 3)
> -#define SNB_GMCH_GMS_STOLEN_96M (3 << 3)
> -#define SNB_GMCH_GMS_STOLEN_128M (4 << 3)
> -#define SNB_GMCH_GMS_STOLEN_160M (5 << 3)
> -#define SNB_GMCH_GMS_STOLEN_192M (6 << 3)
> -#define SNB_GMCH_GMS_STOLEN_224M (7 << 3)
> -#define SNB_GMCH_GMS_STOLEN_256M (8 << 3)
> -#define SNB_GMCH_GMS_STOLEN_288M (9 << 3)
> -#define SNB_GMCH_GMS_STOLEN_320M (0xa << 3)
> -#define SNB_GMCH_GMS_STOLEN_352M (0xb << 3)
> -#define SNB_GMCH_GMS_STOLEN_384M (0xc << 3)
> -#define SNB_GMCH_GMS_STOLEN_416M (0xd << 3)
> -#define SNB_GMCH_GMS_STOLEN_448M (0xe << 3)
> -#define SNB_GMCH_GMS_STOLEN_480M (0xf << 3)
> -#define SNB_GMCH_GMS_STOLEN_512M (0x10 << 3)
> -#define SNB_GTT_SIZE_0M (0 << 8)
> -#define SNB_GTT_SIZE_1M (1 << 8)
> -#define SNB_GTT_SIZE_2M (2 << 8)
> -#define SNB_GTT_SIZE_MASK (3 << 8)
> -
> /* pci devices ids */
> #define PCI_DEVICE_ID_INTEL_E7221_HB 0x2588
> #define PCI_DEVICE_ID_INTEL_E7221_IG 0x258a
> @@ -219,66 +189,5 @@
> #define PCI_DEVICE_ID_INTEL_IRONLAKE_MA_HB 0x0062
> #define PCI_DEVICE_ID_INTEL_IRONLAKE_MC2_HB 0x006a
> #define PCI_DEVICE_ID_INTEL_IRONLAKE_M_IG 0x0046
> -#define PCI_DEVICE_ID_INTEL_SANDYBRIDGE_HB 0x0100 /* Desktop */
> -#define PCI_DEVICE_ID_INTEL_SANDYBRIDGE_GT1_IG 0x0102
> -#define PCI_DEVICE_ID_INTEL_SANDYBRIDGE_GT2_IG 0x0112
> -#define PCI_DEVICE_ID_INTEL_SANDYBRIDGE_GT2_PLUS_IG 0x0122
> -#define PCI_DEVICE_ID_INTEL_SANDYBRIDGE_M_HB 0x0104 /* Mobile */
> -#define PCI_DEVICE_ID_INTEL_SANDYBRIDGE_M_GT1_IG 0x0106
> -#define PCI_DEVICE_ID_INTEL_SANDYBRIDGE_M_GT2_IG 0x0116
> -#define PCI_DEVICE_ID_INTEL_SANDYBRIDGE_M_GT2_PLUS_IG 0x0126
> -#define PCI_DEVICE_ID_INTEL_SANDYBRIDGE_S_HB 0x0108 /* Server */
> -#define PCI_DEVICE_ID_INTEL_SANDYBRIDGE_S_IG 0x010A
> -#define PCI_DEVICE_ID_INTEL_IVYBRIDGE_HB 0x0150 /* Desktop */
> -#define PCI_DEVICE_ID_INTEL_IVYBRIDGE_GT1_IG 0x0152
> -#define PCI_DEVICE_ID_INTEL_IVYBRIDGE_GT2_IG 0x0162
> -#define PCI_DEVICE_ID_INTEL_IVYBRIDGE_M_HB 0x0154 /* Mobile */
> -#define PCI_DEVICE_ID_INTEL_IVYBRIDGE_M_GT1_IG 0x0156
> -#define PCI_DEVICE_ID_INTEL_IVYBRIDGE_M_GT2_IG 0x0166
> -#define PCI_DEVICE_ID_INTEL_IVYBRIDGE_S_HB 0x0158 /* Server */
> -#define PCI_DEVICE_ID_INTEL_IVYBRIDGE_S_GT1_IG 0x015A
> -#define PCI_DEVICE_ID_INTEL_IVYBRIDGE_S_GT2_IG 0x016A
> -#define PCI_DEVICE_ID_INTEL_VALLEYVIEW_HB 0x0F00 /* VLV1 */
> -#define PCI_DEVICE_ID_INTEL_VALLEYVIEW_IG 0x0F30
> -#define PCI_DEVICE_ID_INTEL_HASWELL_HB 0x0400 /* Desktop */
> -#define PCI_DEVICE_ID_INTEL_HASWELL_D_GT1_IG 0x0402
> -#define PCI_DEVICE_ID_INTEL_HASWELL_D_GT2_IG 0x0412
> -#define PCI_DEVICE_ID_INTEL_HASWELL_D_GT2_PLUS_IG 0x0422
> -#define PCI_DEVICE_ID_INTEL_HASWELL_M_HB 0x0404 /* Mobile */
> -#define PCI_DEVICE_ID_INTEL_HASWELL_M_GT1_IG 0x0406
> -#define PCI_DEVICE_ID_INTEL_HASWELL_M_GT2_IG 0x0416
> -#define PCI_DEVICE_ID_INTEL_HASWELL_M_GT2_PLUS_IG 0x0426
> -#define PCI_DEVICE_ID_INTEL_HASWELL_S_HB 0x0408 /* Server */
> -#define PCI_DEVICE_ID_INTEL_HASWELL_S_GT1_IG 0x040a
> -#define PCI_DEVICE_ID_INTEL_HASWELL_S_GT2_IG 0x041a
> -#define PCI_DEVICE_ID_INTEL_HASWELL_S_GT2_PLUS_IG 0x042a
> -#define PCI_DEVICE_ID_INTEL_HASWELL_E_HB 0x0c04
> -#define PCI_DEVICE_ID_INTEL_HASWELL_SDV_D_GT1_IG 0x0C02
> -#define PCI_DEVICE_ID_INTEL_HASWELL_SDV_D_GT2_IG 0x0C12
> -#define PCI_DEVICE_ID_INTEL_HASWELL_SDV_D_GT2_PLUS_IG 0x0C22
> -#define PCI_DEVICE_ID_INTEL_HASWELL_SDV_M_GT1_IG 0x0C06
> -#define PCI_DEVICE_ID_INTEL_HASWELL_SDV_M_GT2_IG 0x0C16
> -#define PCI_DEVICE_ID_INTEL_HASWELL_SDV_M_GT2_PLUS_IG 0x0C26
> -#define PCI_DEVICE_ID_INTEL_HASWELL_SDV_S_GT1_IG 0x0C0A
> -#define PCI_DEVICE_ID_INTEL_HASWELL_SDV_S_GT2_IG 0x0C1A
> -#define PCI_DEVICE_ID_INTEL_HASWELL_SDV_S_GT2_PLUS_IG 0x0C2A
> -#define PCI_DEVICE_ID_INTEL_HASWELL_ULT_D_GT1_IG 0x0A02
> -#define PCI_DEVICE_ID_INTEL_HASWELL_ULT_D_GT2_IG 0x0A12
> -#define PCI_DEVICE_ID_INTEL_HASWELL_ULT_D_GT2_PLUS_IG 0x0A22
> -#define PCI_DEVICE_ID_INTEL_HASWELL_ULT_M_GT1_IG 0x0A06
> -#define PCI_DEVICE_ID_INTEL_HASWELL_ULT_M_GT2_IG 0x0A16
> -#define PCI_DEVICE_ID_INTEL_HASWELL_ULT_M_GT2_PLUS_IG 0x0A26
> -#define PCI_DEVICE_ID_INTEL_HASWELL_ULT_S_GT1_IG 0x0A0A
> -#define PCI_DEVICE_ID_INTEL_HASWELL_ULT_S_GT2_IG 0x0A1A
> -#define PCI_DEVICE_ID_INTEL_HASWELL_ULT_S_GT2_PLUS_IG 0x0A2A
> -#define PCI_DEVICE_ID_INTEL_HASWELL_CRW_D_GT1_IG 0x0D12
> -#define PCI_DEVICE_ID_INTEL_HASWELL_CRW_D_GT2_IG 0x0D22
> -#define PCI_DEVICE_ID_INTEL_HASWELL_CRW_D_GT2_PLUS_IG 0x0D32
> -#define PCI_DEVICE_ID_INTEL_HASWELL_CRW_M_GT1_IG 0x0D16
> -#define PCI_DEVICE_ID_INTEL_HASWELL_CRW_M_GT2_IG 0x0D26
> -#define PCI_DEVICE_ID_INTEL_HASWELL_CRW_M_GT2_PLUS_IG 0x0D36
> -#define PCI_DEVICE_ID_INTEL_HASWELL_CRW_S_GT1_IG 0x0D1A
> -#define PCI_DEVICE_ID_INTEL_HASWELL_CRW_S_GT2_IG 0x0D2A
> -#define PCI_DEVICE_ID_INTEL_HASWELL_CRW_S_GT2_PLUS_IG 0x0D3A
>
> #endif
> diff --git a/drivers/char/agp/intel-gtt.c b/drivers/char/agp/intel-gtt.c
> index 4dfbb80..c2d6002 100644
> --- a/drivers/char/agp/intel-gtt.c
> +++ b/drivers/char/agp/intel-gtt.c
> @@ -367,62 +367,6 @@ static unsigned int intel_gtt_stolen_size(void)
> stolen_size = 0;
> break;
> }
> - } else if (INTEL_GTT_GEN == 6) {
> - /*
> - * SandyBridge has new memory control reg at 0x50.w
> - */
> - u16 snb_gmch_ctl;
> - pci_read_config_word(intel_private.pcidev, SNB_GMCH_CTRL, &snb_gmch_ctl);
> - switch (snb_gmch_ctl & SNB_GMCH_GMS_STOLEN_MASK) {
> - case SNB_GMCH_GMS_STOLEN_32M:
> - stolen_size = MB(32);
> - break;
> - case SNB_GMCH_GMS_STOLEN_64M:
> - stolen_size = MB(64);
> - break;
> - case SNB_GMCH_GMS_STOLEN_96M:
> - stolen_size = MB(96);
> - break;
> - case SNB_GMCH_GMS_STOLEN_128M:
> - stolen_size = MB(128);
> - break;
> - case SNB_GMCH_GMS_STOLEN_160M:
> - stolen_size = MB(160);
> - break;
> - case SNB_GMCH_GMS_STOLEN_192M:
> - stolen_size = MB(192);
> - break;
> - case SNB_GMCH_GMS_STOLEN_224M:
> - stolen_size = MB(224);
> - break;
> - case SNB_GMCH_GMS_STOLEN_256M:
> - stolen_size = MB(256);
> - break;
> - case SNB_GMCH_GMS_STOLEN_288M:
> - stolen_size = MB(288);
> - break;
> - case SNB_GMCH_GMS_STOLEN_320M:
> - stolen_size = MB(320);
> - break;
> - case SNB_GMCH_GMS_STOLEN_352M:
> - stolen_size = MB(352);
> - break;
> - case SNB_GMCH_GMS_STOLEN_384M:
> - stolen_size = MB(384);
> - break;
> - case SNB_GMCH_GMS_STOLEN_416M:
> - stolen_size = MB(416);
> - break;
> - case SNB_GMCH_GMS_STOLEN_448M:
> - stolen_size = MB(448);
> - break;
> - case SNB_GMCH_GMS_STOLEN_480M:
> - stolen_size = MB(480);
> - break;
> - case SNB_GMCH_GMS_STOLEN_512M:
> - stolen_size = MB(512);
> - break;
> - }
> } else {
> switch (gmch_ctrl & I855_GMCH_GMS_MASK) {
> case I855_GMCH_GMS_STOLEN_1M:
> @@ -556,29 +500,9 @@ static unsigned int i965_gtt_total_entries(void)
>
> static unsigned int intel_gtt_total_entries(void)
> {
> - int size;
> -
> if (IS_G33 || INTEL_GTT_GEN == 4 || INTEL_GTT_GEN == 5)
> return i965_gtt_total_entries();
> - else if (INTEL_GTT_GEN == 6) {
> - u16 snb_gmch_ctl;
> -
> - pci_read_config_word(intel_private.pcidev, SNB_GMCH_CTRL, &snb_gmch_ctl);
> - switch (snb_gmch_ctl & SNB_GTT_SIZE_MASK) {
> - default:
> - case SNB_GTT_SIZE_0M:
> - printk(KERN_ERR "Bad GTT size mask: 0x%04x.\n", snb_gmch_ctl);
> - size = MB(0);
> - break;
> - case SNB_GTT_SIZE_1M:
> - size = MB(1);
> - break;
> - case SNB_GTT_SIZE_2M:
> - size = MB(2);
> - break;
> - }
> - return size/4;
> - } else {
> + else {
> /* On previous hardware, the GTT size was just what was
> * required to map the aperture.
> */
> @@ -778,9 +702,6 @@ bool intel_enable_gtt(void)
> {
> u8 __iomem *reg;
>
> - if (INTEL_GTT_GEN >= 6)
> - return true;
> -
> if (INTEL_GTT_GEN == 2) {
> u16 gmch_ctrl;
>
> @@ -1149,85 +1070,6 @@ static void i965_write_entry(dma_addr_t addr,
> writel(addr | pte_flags, intel_private.gtt + entry);
> }
>
> -static bool gen6_check_flags(unsigned int flags)
> -{
> - return true;
> -}
> -
> -static void haswell_write_entry(dma_addr_t addr, unsigned int entry,
> - unsigned int flags)
> -{
> - unsigned int type_mask = flags & ~AGP_USER_CACHED_MEMORY_GFDT;
> - unsigned int gfdt = flags & AGP_USER_CACHED_MEMORY_GFDT;
> - u32 pte_flags;
> -
> - if (type_mask == AGP_USER_MEMORY)
> - pte_flags = HSW_PTE_UNCACHED | I810_PTE_VALID;
> - else if (type_mask == AGP_USER_CACHED_MEMORY_LLC_MLC) {
> - pte_flags = GEN6_PTE_LLC_MLC | I810_PTE_VALID;
> - if (gfdt)
> - pte_flags |= GEN6_PTE_GFDT;
> - } else { /* set 'normal'/'cached' to LLC by default */
> - pte_flags = GEN6_PTE_LLC | I810_PTE_VALID;
> - if (gfdt)
> - pte_flags |= GEN6_PTE_GFDT;
> - }
> -
> - /* gen6 has bit11-4 for physical addr bit39-32 */
> - addr |= (addr >> 28) & 0xff0;
> - writel(addr | pte_flags, intel_private.gtt + entry);
> -}
> -
> -static void gen6_write_entry(dma_addr_t addr, unsigned int entry,
> - unsigned int flags)
> -{
> - unsigned int type_mask = flags & ~AGP_USER_CACHED_MEMORY_GFDT;
> - unsigned int gfdt = flags & AGP_USER_CACHED_MEMORY_GFDT;
> - u32 pte_flags;
> -
> - if (type_mask == AGP_USER_MEMORY)
> - pte_flags = GEN6_PTE_UNCACHED | I810_PTE_VALID;
> - else if (type_mask == AGP_USER_CACHED_MEMORY_LLC_MLC) {
> - pte_flags = GEN6_PTE_LLC_MLC | I810_PTE_VALID;
> - if (gfdt)
> - pte_flags |= GEN6_PTE_GFDT;
> - } else { /* set 'normal'/'cached' to LLC by default */
> - pte_flags = GEN6_PTE_LLC | I810_PTE_VALID;
> - if (gfdt)
> - pte_flags |= GEN6_PTE_GFDT;
> - }
> -
> - /* gen6 has bit11-4 for physical addr bit39-32 */
> - addr |= (addr >> 28) & 0xff0;
> - writel(addr | pte_flags, intel_private.gtt + entry);
> -}
> -
> -static void valleyview_write_entry(dma_addr_t addr, unsigned int entry,
> - unsigned int flags)
> -{
> - unsigned int type_mask = flags & ~AGP_USER_CACHED_MEMORY_GFDT;
> - unsigned int gfdt = flags & AGP_USER_CACHED_MEMORY_GFDT;
> - u32 pte_flags;
> -
> - if (type_mask == AGP_USER_MEMORY)
> - pte_flags = GEN6_PTE_UNCACHED | I810_PTE_VALID;
> - else {
> - pte_flags = GEN6_PTE_LLC | I810_PTE_VALID;
> - if (gfdt)
> - pte_flags |= GEN6_PTE_GFDT;
> - }
> -
> - /* gen6 has bit11-4 for physical addr bit39-32 */
> - addr |= (addr >> 28) & 0xff0;
> - writel(addr | pte_flags, intel_private.gtt + entry);
> -
> - writel(1, intel_private.registers + GFX_FLSH_CNTL_VLV);
> -}
> -
> -static void gen6_cleanup(void)
> -{
> -}
> -
> /* Certain Gen5 chipsets require require idling the GPU before
> * unmapping anything from the GTT when VT-d is enabled.
> */
> @@ -1256,9 +1098,6 @@ static int i9xx_setup(void)
>
> reg_addr &= 0xfff80000;
>
> - if (INTEL_GTT_GEN >= 7)
> - size = MB(2);
> -
> intel_private.registers = ioremap(reg_addr, size);
> if (!intel_private.registers)
> return -ENOMEM;
> @@ -1269,22 +1108,8 @@ static int i9xx_setup(void)
> pci_read_config_dword(intel_private.pcidev,
> I915_PTEADDR, >t_addr);
> intel_private.gtt_bus_addr = gtt_addr;
> - } else {
> - u32 gtt_offset;
> -
> - switch (INTEL_GTT_GEN) {
> - case 5:
> - case 6:
> - case 7:
> - gtt_offset = MB(2);
> - break;
> - case 4:
> - default:
> - gtt_offset = KB(512);
> - break;
> - }
> - intel_private.gtt_bus_addr = reg_addr + gtt_offset;
> - }
> + } else
> + intel_private.gtt_bus_addr = reg_addr + KB(512);
>
> if (needs_idle_maps())
> intel_private.base.do_idle_maps = 1;
> @@ -1395,32 +1220,6 @@ static const struct intel_gtt_driver ironlake_gtt_driver = {
> .check_flags = i830_check_flags,
> .chipset_flush = i9xx_chipset_flush,
> };
> -static const struct intel_gtt_driver sandybridge_gtt_driver = {
> - .gen = 6,
> - .setup = i9xx_setup,
> - .cleanup = gen6_cleanup,
> - .write_entry = gen6_write_entry,
> - .dma_mask_size = 40,
> - .check_flags = gen6_check_flags,
> - .chipset_flush = i9xx_chipset_flush,
> -};
> -static const struct intel_gtt_driver haswell_gtt_driver = {
> - .gen = 6,
> - .setup = i9xx_setup,
> - .cleanup = gen6_cleanup,
> - .write_entry = haswell_write_entry,
> - .dma_mask_size = 40,
> - .check_flags = gen6_check_flags,
> - .chipset_flush = i9xx_chipset_flush,
> -};
> -static const struct intel_gtt_driver valleyview_gtt_driver = {
> - .gen = 7,
> - .setup = i9xx_setup,
> - .cleanup = gen6_cleanup,
> - .write_entry = valleyview_write_entry,
> - .dma_mask_size = 40,
> - .check_flags = gen6_check_flags,
> -};
>
> /* Table to describe Intel GMCH and AGP/PCIE GART drivers. At least one of
> * driver and gmch_driver must be non-null, and find_gmch will determine
> @@ -1501,106 +1300,6 @@ static const struct intel_gtt_driver_description {
> "HD Graphics", &ironlake_gtt_driver },
> { PCI_DEVICE_ID_INTEL_IRONLAKE_M_IG,
> "HD Graphics", &ironlake_gtt_driver },
> - { PCI_DEVICE_ID_INTEL_SANDYBRIDGE_GT1_IG,
> - "Sandybridge", &sandybridge_gtt_driver },
> - { PCI_DEVICE_ID_INTEL_SANDYBRIDGE_GT2_IG,
> - "Sandybridge", &sandybridge_gtt_driver },
> - { PCI_DEVICE_ID_INTEL_SANDYBRIDGE_GT2_PLUS_IG,
> - "Sandybridge", &sandybridge_gtt_driver },
> - { PCI_DEVICE_ID_INTEL_SANDYBRIDGE_M_GT1_IG,
> - "Sandybridge", &sandybridge_gtt_driver },
> - { PCI_DEVICE_ID_INTEL_SANDYBRIDGE_M_GT2_IG,
> - "Sandybridge", &sandybridge_gtt_driver },
> - { PCI_DEVICE_ID_INTEL_SANDYBRIDGE_M_GT2_PLUS_IG,
> - "Sandybridge", &sandybridge_gtt_driver },
> - { PCI_DEVICE_ID_INTEL_SANDYBRIDGE_S_IG,
> - "Sandybridge", &sandybridge_gtt_driver },
> - { PCI_DEVICE_ID_INTEL_IVYBRIDGE_GT1_IG,
> - "Ivybridge", &sandybridge_gtt_driver },
> - { PCI_DEVICE_ID_INTEL_IVYBRIDGE_GT2_IG,
> - "Ivybridge", &sandybridge_gtt_driver },
> - { PCI_DEVICE_ID_INTEL_IVYBRIDGE_M_GT1_IG,
> - "Ivybridge", &sandybridge_gtt_driver },
> - { PCI_DEVICE_ID_INTEL_IVYBRIDGE_M_GT2_IG,
> - "Ivybridge", &sandybridge_gtt_driver },
> - { PCI_DEVICE_ID_INTEL_IVYBRIDGE_S_GT1_IG,
> - "Ivybridge", &sandybridge_gtt_driver },
> - { PCI_DEVICE_ID_INTEL_IVYBRIDGE_S_GT2_IG,
> - "Ivybridge", &sandybridge_gtt_driver },
> - { PCI_DEVICE_ID_INTEL_VALLEYVIEW_IG,
> - "ValleyView", &valleyview_gtt_driver },
> - { PCI_DEVICE_ID_INTEL_HASWELL_D_GT1_IG,
> - "Haswell", &haswell_gtt_driver },
> - { PCI_DEVICE_ID_INTEL_HASWELL_D_GT2_IG,
> - "Haswell", &haswell_gtt_driver },
> - { PCI_DEVICE_ID_INTEL_HASWELL_D_GT2_PLUS_IG,
> - "Haswell", &haswell_gtt_driver },
> - { PCI_DEVICE_ID_INTEL_HASWELL_M_GT1_IG,
> - "Haswell", &haswell_gtt_driver },
> - { PCI_DEVICE_ID_INTEL_HASWELL_M_GT2_IG,
> - "Haswell", &haswell_gtt_driver },
> - { PCI_DEVICE_ID_INTEL_HASWELL_M_GT2_PLUS_IG,
> - "Haswell", &haswell_gtt_driver },
> - { PCI_DEVICE_ID_INTEL_HASWELL_S_GT1_IG,
> - "Haswell", &haswell_gtt_driver },
> - { PCI_DEVICE_ID_INTEL_HASWELL_S_GT2_IG,
> - "Haswell", &haswell_gtt_driver },
> - { PCI_DEVICE_ID_INTEL_HASWELL_S_GT2_PLUS_IG,
> - "Haswell", &haswell_gtt_driver },
> - { PCI_DEVICE_ID_INTEL_HASWELL_SDV_D_GT1_IG,
> - "Haswell", &haswell_gtt_driver },
> - { PCI_DEVICE_ID_INTEL_HASWELL_SDV_D_GT2_IG,
> - "Haswell", &haswell_gtt_driver },
> - { PCI_DEVICE_ID_INTEL_HASWELL_SDV_D_GT2_PLUS_IG,
> - "Haswell", &haswell_gtt_driver },
> - { PCI_DEVICE_ID_INTEL_HASWELL_SDV_M_GT1_IG,
> - "Haswell", &haswell_gtt_driver },
> - { PCI_DEVICE_ID_INTEL_HASWELL_SDV_M_GT2_IG,
> - "Haswell", &haswell_gtt_driver },
> - { PCI_DEVICE_ID_INTEL_HASWELL_SDV_M_GT2_PLUS_IG,
> - "Haswell", &haswell_gtt_driver },
> - { PCI_DEVICE_ID_INTEL_HASWELL_SDV_S_GT1_IG,
> - "Haswell", &haswell_gtt_driver },
> - { PCI_DEVICE_ID_INTEL_HASWELL_SDV_S_GT2_IG,
> - "Haswell", &haswell_gtt_driver },
> - { PCI_DEVICE_ID_INTEL_HASWELL_SDV_S_GT2_PLUS_IG,
> - "Haswell", &haswell_gtt_driver },
> - { PCI_DEVICE_ID_INTEL_HASWELL_ULT_D_GT1_IG,
> - "Haswell", &haswell_gtt_driver },
> - { PCI_DEVICE_ID_INTEL_HASWELL_ULT_D_GT2_IG,
> - "Haswell", &haswell_gtt_driver },
> - { PCI_DEVICE_ID_INTEL_HASWELL_ULT_D_GT2_PLUS_IG,
> - "Haswell", &haswell_gtt_driver },
> - { PCI_DEVICE_ID_INTEL_HASWELL_ULT_M_GT1_IG,
> - "Haswell", &haswell_gtt_driver },
> - { PCI_DEVICE_ID_INTEL_HASWELL_ULT_M_GT2_IG,
> - "Haswell", &haswell_gtt_driver },
> - { PCI_DEVICE_ID_INTEL_HASWELL_ULT_M_GT2_PLUS_IG,
> - "Haswell", &haswell_gtt_driver },
> - { PCI_DEVICE_ID_INTEL_HASWELL_ULT_S_GT1_IG,
> - "Haswell", &haswell_gtt_driver },
> - { PCI_DEVICE_ID_INTEL_HASWELL_ULT_S_GT2_IG,
> - "Haswell", &haswell_gtt_driver },
> - { PCI_DEVICE_ID_INTEL_HASWELL_ULT_S_GT2_PLUS_IG,
> - "Haswell", &haswell_gtt_driver },
> - { PCI_DEVICE_ID_INTEL_HASWELL_CRW_D_GT1_IG,
> - "Haswell", &haswell_gtt_driver },
> - { PCI_DEVICE_ID_INTEL_HASWELL_CRW_D_GT2_IG,
> - "Haswell", &haswell_gtt_driver },
> - { PCI_DEVICE_ID_INTEL_HASWELL_CRW_D_GT2_PLUS_IG,
> - "Haswell", &haswell_gtt_driver },
> - { PCI_DEVICE_ID_INTEL_HASWELL_CRW_M_GT1_IG,
> - "Haswell", &haswell_gtt_driver },
> - { PCI_DEVICE_ID_INTEL_HASWELL_CRW_M_GT2_IG,
> - "Haswell", &haswell_gtt_driver },
> - { PCI_DEVICE_ID_INTEL_HASWELL_CRW_M_GT2_PLUS_IG,
> - "Haswell", &haswell_gtt_driver },
> - { PCI_DEVICE_ID_INTEL_HASWELL_CRW_S_GT1_IG,
> - "Haswell", &haswell_gtt_driver },
> - { PCI_DEVICE_ID_INTEL_HASWELL_CRW_S_GT2_IG,
> - "Haswell", &haswell_gtt_driver },
> - { PCI_DEVICE_ID_INTEL_HASWELL_CRW_S_GT2_PLUS_IG,
> - "Haswell", &haswell_gtt_driver },
> { 0, NULL, NULL }
> };
>
> diff --git a/include/drm/intel-gtt.h b/include/drm/intel-gtt.h
> index 94e8f2c..6eb76a1 100644
> --- a/include/drm/intel-gtt.h
> +++ b/include/drm/intel-gtt.h
> @@ -40,10 +40,6 @@ void intel_gtt_clear_range(unsigned int first_entry, unsigned int num_entries);
> #define AGP_DCACHE_MEMORY 1
> #define AGP_PHYS_MEMORY 2
>
> -/* New caching attributes for gen6/sandybridge */
> -#define AGP_USER_CACHED_MEMORY_LLC_MLC (AGP_USER_TYPES + 2)
> -#define AGP_USER_UNCACHED_MEMORY (AGP_USER_TYPES + 4)
> -
> /* flag for GFDT type */
> #define AGP_USER_CACHED_MEMORY_GFDT (1 << 3)
>
Yay.
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
--
Jesse Barnes, Intel Open Source Technology Center
next prev parent reply other threads:[~2012-10-25 21:07 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-23 1:34 [PATCH 00/10] Kill AGP dependencies for Gen6+ Ben Widawsky
2012-10-23 1:34 ` [PATCH 01/10] drm/i915: No LLC_MLC for HSW Ben Widawsky
2012-10-23 10:15 ` Mika Kuoppala
2012-10-25 20:47 ` Jesse Barnes
2012-10-26 1:03 ` Ben Widawsky
2012-10-23 1:34 ` [PATCH 02/10] drm/i915: Add dev to ppgtt Ben Widawsky
2012-10-25 20:48 ` Jesse Barnes
2012-10-23 1:34 ` [PATCH 03/10] drm/i915: introduce gtt_pte_t Ben Widawsky
2012-10-25 20:49 ` Jesse Barnes
2012-10-23 1:34 ` [PATCH 04/10] drm/i915: Extract PPGTT pte encoding Ben Widawsky
2012-10-25 20:50 ` Jesse Barnes
2012-10-23 1:34 ` [PATCH 05/10] drm/i915: move more pte encoding to pte encode Ben Widawsky
2012-10-25 20:51 ` Jesse Barnes
2012-10-31 10:52 ` Daniel Vetter
2012-10-23 1:34 ` [PATCH 06/10] drm/i915: Stop using AGP layer for GEN6+ Ben Widawsky
2012-10-23 9:59 ` Chris Wilson
2012-10-23 14:57 ` Ben Widawsky
2012-10-23 14:58 ` Daniel Vetter
2012-10-23 19:57 ` Ben Widawsky
2012-10-23 20:03 ` Daniel Vetter
2012-10-23 20:27 ` Ben Widawsky
2012-10-25 20:55 ` Jesse Barnes
2012-10-25 20:54 ` Jesse Barnes
[not found] ` <878vaxwk61.fsf@gaia.fi.intel.com>
2012-10-24 17:56 ` Ben Widawsky
2012-10-26 20:54 ` [PATCH 06/10 v2] " Ben Widawsky
2012-10-29 2:08 ` [PATCH 6/9 v3] " Ben Widawsky
2012-10-31 9:57 ` Daniel Vetter
2012-10-31 15:51 ` Ben Widawsky
2012-10-31 10:37 ` [PATCH 06/10 v2] " Chris Wilson
2012-10-23 1:34 ` [PATCH 07/10] drm/i915: Calculate correct stolen size for GEN7+ Ben Widawsky
2012-10-25 21:06 ` Jesse Barnes
2012-10-25 22:15 ` Ben Widawsky
2012-10-25 22:39 ` Jesse Barnes
2012-10-23 1:34 ` [PATCH 08/10] drm/i915: Kill off now unused gen6+ AGP code Ben Widawsky
2012-10-25 21:07 ` Jesse Barnes [this message]
2012-10-23 1:34 ` [PATCH 09/10] drm/i915: flush system agent TLBs on SNB Ben Widawsky
2012-10-23 14:17 ` Jesse Barnes
2012-10-23 14:28 ` Daniel Vetter
2012-10-23 14:35 ` Jesse Barnes
2012-10-23 14:42 ` Ben Widawsky
2012-10-25 21:07 ` Jesse Barnes
2012-10-26 20:55 ` [PATCH 09/10 v2] " Ben Widawsky
2012-10-23 1:34 ` [PATCH 10/10] drm/i915: Kill off actually requiring AGP Ben Widawsky
2012-10-23 2:03 ` Ben Widawsky
2012-10-25 21:09 ` Jesse Barnes
2012-10-25 22:15 ` Ben Widawsky
2012-10-25 22:39 ` Jesse Barnes
2012-10-25 22:47 ` Daniel Vetter
2012-10-26 20:52 ` Ben Widawsky
2012-10-26 20:58 ` [PATCH 00/10] Kill AGP dependencies for Gen6+ Ben Widawsky
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20121025140723.094deaba@jbarnes-desktop \
--to=jbarnes@virtuousgeek.org \
--cc=ben@bwidawsk.net \
--cc=intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.