Skip to content

Commit 23bce13

Browse files
dumbbellsaper
authored andcommitted
Disable intel_gmch_probe() and intel_enable_gtt() - v4.15 (#73)
* drm/i915: Remove trailing spaces in intel_freebsd.c While here: * Add a space between a variable and the `+` operator. * Rename one `__notyet` to `__notyet__`. * drm/i915: Disable intel_gmch_probe() and intel_enable_gtt() They are now no-ops, like they are in `drm2` in FreeBSD base. They were used by Intel GPUs up to and including gen 5. This patch makes the driver work on those old Intel GPUs. At least it was successfully tested on an Intel 965GM coupled with an Intel Core 2 Duo from 2007.
1 parent c1b4d3a commit 23bce13

File tree

1 file changed

+10
-4
lines changed

1 file changed

+10
-4
lines changed

i915/intel_freebsd.c

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,17 +33,20 @@ uint32_t intel_gtt_read_pte(unsigned int entry);
3333

3434
#define WARN_UN() log(LOG_WARNING, "%s unimplemented", __FUNCTION__)
3535

36+
#ifdef __notyet__
3637
static struct _intel_private {
3738
struct pci_dev *bridge_dev;
3839
u8 __iomem *registers;
3940
u32 PGTBL_save;
4041
int gen;
4142
phys_addr_t gma_bus_addr;
4243
} intel_private;
44+
#endif
4345

4446
bool
4547
intel_enable_gtt(void)
4648
{
49+
#ifdef __notyet__
4750
u8 __iomem *reg;
4851

4952
DRM_DEBUG("entering %s\n", __func__);
@@ -67,36 +70,38 @@ intel_enable_gtt(void)
6770
return false;
6871
}
6972
}
70-
#endif
73+
#endif
7174

7275
/*
7376
* On the resume path we may be adjusting the PGTBL value, so
7477
* be paranoid and flush all chipset write buffers...
7578
*/
7679
if (INTEL_GTT_GEN >= 3)
77-
writel(0, intel_private.registers+ GFX_FLSH_CNTL_BSD);
80+
writel(0, intel_private.registers + GFX_FLSH_CNTL_BSD);
7881

7982
reg = intel_private.registers + AGP_I810_PGTBL_CTL;
8083
writel(intel_private.PGTBL_save, reg);
81-
#ifdef __notyet
84+
#ifdef __notyet__
8285
if (HAS_PGTBL_EN && (readl(reg) & AGP_I810_PGTBL_ENABLED) == 0) {
8386
dev_err(&intel_private.pcidev->dev,
8487
"failed to enable the GTT: PGTBL=%x [expected %x]\n",
8588
readl(reg), intel_private.PGTBL_save);
8689
return false;
8790
}
88-
#endif
91+
#endif
8992

9093
if (INTEL_GTT_GEN >= 3)
9194
writel(0, intel_private.registers + GFX_FLSH_CNTL_BSD);
9295
DRM_DEBUG("exiting %s\n", __func__);
96+
#endif
9397
return (1);
9498
}
9599

96100
int
97101
intel_gmch_probe(struct pci_dev *bridge_pdev, struct pci_dev *gpu_pdev,
98102
struct agp_bridge_data *bridge)
99103
{
104+
#ifdef __notyet__
100105
DRM_DEBUG("entering %s\n", __func__);
101106
intel_private.registers = NULL; //intel_gtt_get_registers();
102107
intel_private.gma_bus_addr = pci_bus_address(gpu_pdev, I915_GMADR_BAR);
@@ -111,6 +116,7 @@ intel_gmch_probe(struct pci_dev *bridge_pdev, struct pci_dev *gpu_pdev,
111116
intel_private.PGTBL_save |= AGP_I810_PGTBL_ENABLED;
112117

113118
DRM_DEBUG("exiting %s\n", __func__);
119+
#endif
114120
return (1);
115121
}
116122

0 commit comments

Comments
 (0)