xf86-video-intel: Branch 'intel-kernelmode' - 3 commits - src/i830_dri.c src/i830_driver.c src/intel_bufmgr_ttm.c
Dave Airlie
airlied at kemper.freedesktop.org
Wed Mar 5 23:06:42 PST 2008
src/i830_dri.c | 26 ++++++++++++++------------
src/i830_driver.c | 2 +-
src/intel_bufmgr_ttm.c | 2 +-
3 files changed, 16 insertions(+), 14 deletions(-)
New commits:
commit ba04fa5e07d7aac891e74782e11ec907429c67aa
Author: Dave Airlie <airlied at panoply-rh.(none)>
Date: Thu Mar 6 17:05:12 2008 +1000
i965: make modesetting branch start on 965
diff --git a/src/i830_driver.c b/src/i830_driver.c
index 8c13a15..ef9ac24 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -3166,7 +3166,7 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
if (serverGeneration == 1)
xf86ShowUnusedOptions(pScrn->scrnIndex, pScrn->options);
- if (IS_I965G(pI830)) {
+ if (!pI830->use_drm_mode && IS_I965G(pI830)) {
/* turn off clock gating */
#if 0
OUTREG(0x6204, 0x70804000);
commit 3770a6b5cefffe691718a8371df106b45f6a5717
Author: Dave Airlie <airlied at panoply-rh.(none)>
Date: Thu Mar 6 16:36:33 2008 +1000
ttm: print out handle as well
diff --git a/src/intel_bufmgr_ttm.c b/src/intel_bufmgr_ttm.c
index 6d8719d..5652889 100644
--- a/src/intel_bufmgr_ttm.c
+++ b/src/intel_bufmgr_ttm.c
@@ -374,7 +374,7 @@ dri_ttm_alloc(dri_bufmgr *bufmgr, const char *name,
ttm_buf->validate_index = -1;
ttm_buf->map_count = 0;
- DBG("bo_create: %p (%s) %ldb\n", &ttm_buf->bo, ttm_buf->name, size);
+ DBG("bo_create: %p %08x (%s) %ldb\n", &ttm_buf->bo, ttm_buf->drm_bo.handle, ttm_buf->name, size);
return &ttm_buf->bo;
}
commit d3cb7bff79ce0b79d82c224f522a6740c6204889
Author: Dave Airlie <airlied at panoply-rh.(none)>
Date: Thu Mar 6 16:30:22 2008 +1000
DRI2: fixup modesetting drm fd sharing
diff --git a/src/i830_dri.c b/src/i830_dri.c
index 7cfe806..cfe7220 100644
--- a/src/i830_dri.c
+++ b/src/i830_dri.c
@@ -1899,22 +1899,24 @@ I830DRI2Prepare(ScreenPtr pScreen)
char busId[64];
drmVersionPtr version;
+ if (!pI830->use_drm_mode) {
#if XSERVER_LIBPCIACCESS
- sprintf(busId, "pci:%04x:%02x:%02x.%d",
- pI830->PciInfo->domain, pI830->PciInfo->bus,
- pI830->PciInfo->dev, pI830->PciInfo->func);
+ sprintf(busId, "pci:%04x:%02x:%02x.%d",
+ pI830->PciInfo->domain, pI830->PciInfo->bus,
+ pI830->PciInfo->dev, pI830->PciInfo->func);
#else
- snprintf(busId, "PCI:%d:%d:%d",
- ((pciConfigPtr) pI830->PciInfo->thisCard)->busnum,
- ((pciConfigPtr) pI830->PciInfo->thisCard)->devnum,
- ((pciConfigPtr) pI830->PciInfo->thisCard)->funcnum);
+ snprintf(busId, "PCI:%d:%d:%d",
+ ((pciConfigPtr) pI830->PciInfo->thisCard)->busnum,
+ ((pciConfigPtr) pI830->PciInfo->thisCard)->devnum,
+ ((pciConfigPtr) pI830->PciInfo->thisCard)->funcnum);
#endif
- /* Low level DRM open */
- pI830->drmSubFD = drmOpen("i915", busId);
- if (pI830->drmSubFD < 0) {
- xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "[DRI2] drmOpen failed\n");
- return;
+ /* Low level DRM open */
+ pI830->drmSubFD = drmOpen("i915", busId);
+ if (pI830->drmSubFD < 0) {
+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "[DRI2] drmOpen failed\n");
+ return;
+ }
}
version = drmGetVersion(pI830->drmSubFD);
More information about the xorg-commit
mailing list