Date: Mon, 10 Nov 2008 16:49:39 +0200 From: Andriy Gapon <avg@icyb.net.ua> To: Robert Noland <rnoland@freebsd.org> Cc: re@freebsd.org, FreeBSD-X11 <x11@freebsd.org> Subject: Re: Intel Q33 and DRM Message-ID: <49184A03.7060306@icyb.net.ua> In-Reply-To: <1226246344.3681.5.camel@wombat.2hip.net> References: <20081109104655.GA31842@yahoo-inc.com> <1226246344.3681.5.camel@wombat.2hip.net>
next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format.
--------------080203010704050508030100
Content-Type: text/plain; charset=KOI8-U
Content-Transfer-Encoding: 7bit
on 09/11/2008 17:59 Robert Noland said the following:
> On Sun, 2008-11-09 at 16:16 +0530, Shanker Balan wrote:
>> Helo,
>>
>> I just got myself Hewlett-Packard DC5800 at work which comes with a Intel Q33
>> (Bearlake) chipset and runs FreeBSD 7.1. i915.ko does not seem to attach to
>> any device on.
>>
>> Wondering if support can be added for this device.
>
> These chips should be fully supported by both agp and drm in -CURRENT
> now. MFC is not expected until after 7.1 is released.
Robert,
maybe we could try to include at least agp changes into 7.1?
I think a lot of people would be trying 7.1 as our latest and greatest
on their newer intel hardware (e.g. I have G33) and they would get a lot
of disappointment with intel xorg driver causing an X crash.
Besides, the patch is sufficiently small.
drm part of changes is quite big indeed, on the other hand, it can taken
almost verbatim from head - I needed only to comment out i915
suspend/resume methods to use in releng_7.
I am attaching agp patch (my 7-stable code against releng_7) and drm
patch (my 7-stable code against head).
--
Andriy Gapon
--------------080203010704050508030100
Content-Type: text/plain;
name="intel-agp.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename="intel-agp.patch"
diff --git a/sys/pci/agp_i810.c b/sys/pci/agp_i810.c
index f42921d..05c7cb4 100644
--- a/sys/pci/agp_i810.c
+++ b/sys/pci/agp_i810.c
@@ -70,6 +70,7 @@ enum {
CHIP_I915, /* 915G/915GM */
CHIP_I965, /* G965 */
CHIP_G33, /* G33/Q33/Q35 */
+ CHIP_G4X, /* G45/Q45 */
};
/* The i810 through i855 have the registers at BAR 1, and the GATT gets
@@ -133,7 +134,7 @@ static const struct agp_i810_match {
{0x25628086, CHIP_I830, 0x00020000,
"Intel 82845M (845M GMCH) SVGA controller"},
{0x35828086, CHIP_I855, 0x00020000,
- "Intel 82852/5"},
+ "Intel 82852/855GM SVGA controller"},
{0x25728086, CHIP_I855, 0x00020000,
"Intel 82865G (865G GMCH) SVGA controller"},
{0x25828086, CHIP_I915, 0x00020000,
@@ -154,18 +155,26 @@ static const struct agp_i810_match {
"Intel G965 SVGA controller"},
{0x29928086, CHIP_I965, 0x00020000,
"Intel Q965 SVGA controller"},
- {0x29a28086, CHIP_I965, 0x00020000,
+ {0x29A28086, CHIP_I965, 0x00020000,
"Intel G965 SVGA controller"},
- {0x29b28086, CHIP_G33, 0x00020000,
+ {0x29B28086, CHIP_G33, 0x00020000,
"Intel Q35 SVGA controller"},
- {0x29c28086, CHIP_G33, 0x00020000,
+ {0x29C28086, CHIP_G33, 0x00020000,
"Intel G33 SVGA controller"},
- {0x29d28086, CHIP_G33, 0x00020000,
+ {0x29D28086, CHIP_G33, 0x00020000,
"Intel Q33 SVGA controller"},
- {0x2a028086, CHIP_I965, 0x00020000,
+ {0x2A028086, CHIP_I965, 0x00020000,
"Intel GM965 SVGA controller"},
- {0x2a128086, CHIP_I965, 0x00020000,
+ {0x2A128086, CHIP_I965, 0x00020000,
"Intel GME965 SVGA controller"},
+ {0x2A428086, CHIP_I965, 0x00020000,
+ "Intel GM45 SVGA controller"},
+ {0x2E028086, CHIP_G4X, 0x00020000,
+ "Intel 4 Series SVGA controller"},
+ {0x2E128086, CHIP_G4X, 0x00020000,
+ "Intel Q45 SVGA controller"},
+ {0x2E228086, CHIP_G4X, 0x00020000,
+ "Intel G45 SVGA controller"},
{0, 0, 0, NULL}
};
@@ -377,6 +386,7 @@ agp_i810_attach(device_t dev)
agp_set_aperture_resource(dev, AGP_I915_GMADR);
break;
case CHIP_I965:
+ case CHIP_G4X:
sc->sc_res_spec = agp_i965_res_spec;
agp_set_aperture_resource(dev, AGP_I915_GMADR);
break;
@@ -476,7 +486,8 @@ agp_i810_attach(device_t dev)
gatt->ag_physical = pgtblctl & ~1;
} else if (sc->chiptype == CHIP_I855 || sc->chiptype == CHIP_I915 ||
- sc->chiptype == CHIP_I965 || sc->chiptype == CHIP_G33) {
+ sc->chiptype == CHIP_I965 || sc->chiptype == CHIP_G33 ||
+ sc->chiptype == CHIP_G4X) {
unsigned int gcc1, pgtblctl, stolen, gtt_size;
/* Stolen memory is set up at the beginning of the aperture by
@@ -491,7 +502,6 @@ agp_i810_attach(device_t dev)
gtt_size = 256;
break;
case CHIP_I965:
- case CHIP_G33:
switch (bus_read_4(sc->sc_res[0], AGP_I810_PGTBL_CTL) &
AGP_I810_PGTBL_SIZE_MASK) {
case AGP_I810_PGTBL_SIZE_128KB:
@@ -503,6 +513,15 @@ agp_i810_attach(device_t dev)
case AGP_I810_PGTBL_SIZE_512KB:
gtt_size = 512;
break;
+ case AGP_I965_PGTBL_SIZE_1MB:
+ gtt_size = 1024;
+ break;
+ case AGP_I965_PGTBL_SIZE_2MB:
+ gtt_size = 2048;
+ break;
+ case AGP_I965_PGTBL_SIZE_1_5MB:
+ gtt_size = 1024 + 512;
+ break;
default:
device_printf(dev, "Bad PGTBL size\n");
bus_release_resources(dev, sc->sc_res_spec,
@@ -512,6 +531,27 @@ agp_i810_attach(device_t dev)
return EINVAL;
}
break;
+ case CHIP_G33:
+ gcc1 = pci_read_config(sc->bdev, AGP_I855_GCC1, 2);
+ switch (gcc1 & AGP_G33_MGGC_GGMS_MASK) {
+ case AGP_G33_MGGC_GGMS_SIZE_1M:
+ gtt_size = 1024;
+ break;
+ case AGP_G33_MGGC_GGMS_SIZE_2M:
+ gtt_size = 2048;
+ break;
+ default:
+ device_printf(dev, "Bad PGTBL size\n");
+ bus_release_resources(dev, sc->sc_res_spec,
+ sc->sc_res);
+ free(gatt, M_AGP);
+ agp_generic_detach(dev);
+ return EINVAL;
+ }
+ break;
+ case CHIP_G4X:
+ gtt_size = 0;
+ break;
default:
device_printf(dev, "Bad chiptype\n");
bus_release_resources(dev, sc->sc_res_spec,
@@ -528,28 +568,86 @@ agp_i810_attach(device_t dev)
stolen = 1024;
break;
case AGP_I855_GCC1_GMS_STOLEN_4M:
- stolen = 4096;
+ stolen = 4 * 1024;
break;
case AGP_I855_GCC1_GMS_STOLEN_8M:
- stolen = 8192;
+ stolen = 8 * 1024;
break;
case AGP_I855_GCC1_GMS_STOLEN_16M:
- stolen = 16384;
+ stolen = 16 * 1024;
break;
case AGP_I855_GCC1_GMS_STOLEN_32M:
- stolen = 32768;
+ stolen = 32 * 1024;
break;
case AGP_I915_GCC1_GMS_STOLEN_48M:
- stolen = 49152;
+ if (sc->chiptype == CHIP_I915 ||
+ sc->chiptype == CHIP_I965 ||
+ sc->chiptype == CHIP_G33 ||
+ sc->chiptype == CHIP_G4X) {
+ stolen = 48 * 1024;
+ } else {
+ stolen = 0;
+ }
break;
case AGP_I915_GCC1_GMS_STOLEN_64M:
- stolen = 65536;
+ if (sc->chiptype == CHIP_I915 ||
+ sc->chiptype == CHIP_I965 ||
+ sc->chiptype == CHIP_G33 ||
+ sc->chiptype == CHIP_G4X) {
+ stolen = 64 * 1024;
+ } else {
+ stolen = 0;
+ }
break;
case AGP_G33_GCC1_GMS_STOLEN_128M:
- stolen = 128 * 1024;
+ if (sc->chiptype == CHIP_I965 ||
+ sc->chiptype == CHIP_G33 ||
+ sc->chiptype == CHIP_G4X) {
+ stolen = 128 * 1024;
+ } else {
+ stolen = 0;
+ }
break;
case AGP_G33_GCC1_GMS_STOLEN_256M:
- stolen = 256 * 1024;
+ if (sc->chiptype == CHIP_I965 ||
+ sc->chiptype == CHIP_G33 ||
+ sc->chiptype == CHIP_G4X) {
+ stolen = 256 * 1024;
+ } else {
+ stolen = 0;
+ }
+ break;
+ case AGP_G4X_GCC1_GMS_STOLEN_96M:
+ if (sc->chiptype == CHIP_I965 ||
+ sc->chiptype == CHIP_G4X) {
+ stolen = 96 * 1024;
+ } else {
+ stolen = 0;
+ }
+ break;
+ case AGP_G4X_GCC1_GMS_STOLEN_160M:
+ if (sc->chiptype == CHIP_I965 ||
+ sc->chiptype == CHIP_G4X) {
+ stolen = 160 * 1024;
+ } else {
+ stolen = 0;
+ }
+ break;
+ case AGP_G4X_GCC1_GMS_STOLEN_224M:
+ if (sc->chiptype == CHIP_I965 ||
+ sc->chiptype == CHIP_G4X) {
+ stolen = 224 * 1024;
+ } else {
+ stolen = 0;
+ }
+ break;
+ case AGP_G4X_GCC1_GMS_STOLEN_352M:
+ if (sc->chiptype == CHIP_I965 ||
+ sc->chiptype == CHIP_G4X) {
+ stolen = 352 * 1024;
+ } else {
+ stolen = 0;
+ }
break;
default:
device_printf(dev, "unknown memory configuration, "
@@ -560,7 +658,11 @@ agp_i810_attach(device_t dev)
agp_generic_detach(dev);
return EINVAL;
}
- sc->stolen = (stolen - gtt_size - 4) * 1024 / 4096;
+
+ if (sc->chiptype != CHIP_G4X)
+ gtt_size += 4;
+
+ sc->stolen = (stolen - gtt_size) * 1024 / 4096;
if (sc->stolen > 0)
device_printf(dev, "detected %dk stolen memory\n", sc->stolen * 4);
device_printf(dev, "aperture size is %dM\n", sc->initial_aperture / 1024 / 1024);
diff --git a/sys/pci/agpreg.h b/sys/pci/agpreg.h
index 3850444..b453cac 100644
--- a/sys/pci/agpreg.h
+++ b/sys/pci/agpreg.h
@@ -215,7 +215,7 @@
#define AGP_I855_GCC1_DEV2 0x08
#define AGP_I855_GCC1_DEV2_ENABLED 0x00
#define AGP_I855_GCC1_DEV2_DISABLED 0x08
-#define AGP_I855_GCC1_GMS 0x70
+#define AGP_I855_GCC1_GMS 0xf0 /* Top bit reserved pre-G33 */
#define AGP_I855_GCC1_GMS_STOLEN_0M 0x00
#define AGP_I855_GCC1_GMS_STOLEN_1M 0x10
#define AGP_I855_GCC1_GMS_STOLEN_4M 0x20
@@ -259,14 +259,28 @@
#define AGP_I965_MSAC_GMASIZE_128 0x00
#define AGP_I965_MSAC_GMASIZE_256 0x02
#define AGP_I965_MSAC_GMASIZE_512 0x06
+#define AGP_I965_PGTBL_SIZE_1MB (3 << 1)
+#define AGP_I965_PGTBL_SIZE_2MB (4 << 1)
+#define AGP_I965_PGTBL_SIZE_1_5MB (5 << 1)
/*
* G33 registers
*/
+#define AGP_G33_MGGC_GGMS_MASK (3 << 8)
+#define AGP_G33_MGGC_GGMS_SIZE_1M (1 << 8)
+#define AGP_G33_MGGC_GGMS_SIZE_2M (2 << 8)
#define AGP_G33_GCC1_GMS_STOLEN_128M 0x80
#define AGP_G33_GCC1_GMS_STOLEN_256M 0x90
/*
+ * G4X registers
+ */
+#define AGP_G4X_GCC1_GMS_STOLEN_96M 0xa0
+#define AGP_G4X_GCC1_GMS_STOLEN_160M 0xb0
+#define AGP_G4X_GCC1_GMS_STOLEN_224M 0xc0
+#define AGP_G4X_GCC1_GMS_STOLEN_352M 0xd0
+
+/*
* NVIDIA nForce/nForce2 registers
*/
#define AGP_NVIDIA_0_APBASE 0x10
--------------080203010704050508030100
Content-Type: text/plain;
name="drm7.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename="drm7.patch"
diff --git a/sys/dev/drm/i915_drv.c b/sys/dev/drm/i915_drv.c
index 478e62b..5790557 100644
--- a/sys/dev/drm/i915_drv.c
+++ b/sys/dev/drm/i915_drv.c
@@ -42,7 +42,7 @@ __FBSDID("$FreeBSD$");
static drm_pci_id_list_t i915_pciidlist[] = {
i915_PCI_IDS
};
-
+#if 0
static int i915_suspend(device_t nbdev)
{
struct drm_device *dev = device_get_softc(nbdev);
@@ -68,7 +68,7 @@ static int i915_resume(device_t nbdev)
return (bus_generic_resume(nbdev));
}
-
+#endif
static void i915_configure(struct drm_device *dev)
{
dev->driver->driver_features =
@@ -137,8 +137,10 @@ static device_method_t i915_methods[] = {
/* Device interface */
DEVMETHOD(device_probe, i915_probe),
DEVMETHOD(device_attach, i915_attach),
+#if 0
DEVMETHOD(device_suspend, i915_suspend),
DEVMETHOD(device_resume, i915_resume),
+#endif
DEVMETHOD(device_detach, i915_detach),
{ 0, 0 }
--------------080203010704050508030100--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?49184A03.7060306>