xserver: Branch 'master' - 3 commits
Eric Anholt
anholt at kemper.freedesktop.org
Mon Jun 19 05:54:36 EEST 2006
GL/glx/.gitignore | 5 ++++
GL/mesa/.gitignore | 32 ++++++++++++++++++++++++++++++
doc/.gitignore | 2 +
exa/exa.c | 20 ++++++++++++++++++
exa/exa_offscreen.c | 5 ----
hw/vfb/.gitignore | 2 +
hw/xfree86/ddc/xf86DDC.c | 22 ++++++++++++++++++++
hw/xfree86/doc/man/.gitignore | 4 +++
hw/xfree86/exa/examodule.c | 35 +++++++++++++++++++++++++++++++--
hw/xfree86/fbdevhw/.gitignore | 2 +
hw/xfree86/getconfig/.gitignore | 4 +++
hw/xfree86/utils/gtf/.gitignore | 2 +
hw/xfree86/utils/pcitweak/.gitignore | 3 ++
hw/xfree86/utils/scanpci/.gitignore | 2 +
hw/xfree86/utils/xorgcfg/.gitignore | 2 +
hw/xfree86/utils/xorgconfig/.gitignore | 1
hw/xnest/.gitignore | 2 +
17 files changed, 138 insertions(+), 7 deletions(-)
New commits:
diff-tree 76aaf7eae7409162c5ed2963f2e27d019cb30263 (from 6aaf0e5b581b06fc73e56f863a26cd9d684eb9c0)
Author: Eric Anholt <anholt at FreeBSD.org>
Date: Sun Jun 18 19:47:29 2006 -0700
Add a couple of (doxygen) comments I wrote while looking at modesetting.
diff --git a/hw/xfree86/ddc/xf86DDC.c b/hw/xfree86/ddc/xf86DDC.c
index c989cd2..8822bac 100644
--- a/hw/xfree86/ddc/xf86DDC.c
+++ b/hw/xfree86/ddc/xf86DDC.c
@@ -130,6 +130,17 @@ DDCAvailableOptions(void *unused)
}
#endif
+/**
+ * Attempts to probe the monitor for EDID information, if NoDDC and NoDDC1 are
+ * unset. EDID information blocks are interpreted and the results returned in
+ * an xf86MonPtr.
+ *
+ * This function does not affect the list of modes used by drivers -- it is up
+ * to the driver to decide policy on what to do with EDID information.
+ *
+ * @return pointer to a new xf86MonPtr containing the EDID information.
+ * @return NULL if no monitor attached or failure to interpret the EDID.
+ */
xf86MonPtr
xf86DoEDID_DDC1(
int scrnIndex, DDC1SetSpeedProc DDC1SetSpeed,
@@ -170,6 +181,17 @@ xf86DoEDID_DDC1(
return tmp;
}
+/**
+ * Attempts to probe the monitor for EDID information, if NoDDC and NoDDC2 are
+ * unset. EDID information blocks are interpreted and the results returned in
+ * an xf86MonPtr.
+ *
+ * This function does not affect the list of modes used by drivers -- it is up
+ * to the driver to decide policy on what to do with EDID information.
+ *
+ * @return pointer to a new xf86MonPtr containing the EDID information.
+ * @return NULL if no monitor attached or failure to interpret the EDID.
+ */
xf86MonPtr
xf86DoEDID_DDC2(int scrnIndex, I2CBusPtr pBus)
{
diff-tree 6aaf0e5b581b06fc73e56f863a26cd9d684eb9c0 (from 21ef7e17ef6dca177461c9438b9df707a4d664a2)
Author: Eric Anholt <anholt at FreeBSD.org>
Date: Sun Jun 18 19:12:15 2006 -0700
Add options to disable EXA acceleration for Composite/UTS/DFS, and always print
out how much memory EXA is managing for offscreen pixmaps.
diff --git a/exa/exa.c b/exa/exa.c
index 75d5c0d..4b96af8 100644
--- a/exa/exa.c
+++ b/exa/exa.c
@@ -623,6 +623,10 @@ exaDriverInit (ScreenPtr pScreen,
pExaScr->SavedDestroyPixmap = pScreen->DestroyPixmap;
pScreen->DestroyPixmap = exaDestroyPixmap;
+
+ LogMessage(X_INFO, "EXA(%d): Offscreen pixmap area of %d bytes\n",
+ pScreen->myNum,
+ pExaScr->info->memorySize - pExaScr->info->offScreenBase);
}
else
{
@@ -641,6 +645,22 @@ exaDriverInit (ScreenPtr pScreen,
}
}
+ LogMessage(X_INFO, "EXA(%d): Driver registered support for the following"
+ " operations:\n", pScreen->myNum);
+ assert(pScreenInfo->PrepareSolid != NULL);
+ LogMessage(X_INFO, " Solid\n");
+ assert(pScreenInfo->PrepareCopy != NULL);
+ LogMessage(X_INFO, " Copy\n");
+ if (pScreenInfo->PrepareComposite != NULL) {
+ LogMessage(X_INFO, " Composite (RENDER acceleration)\n");
+ }
+ if (pScreenInfo->UploadToScreen != NULL) {
+ LogMessage(X_INFO, " UploadToScreen\n");
+ }
+ if (pScreenInfo->DownloadFromScreen != NULL) {
+ LogMessage(X_INFO, " DownloadFromScreen\n");
+ }
+
return TRUE;
}
diff --git a/exa/exa_offscreen.c b/exa/exa_offscreen.c
index b55802e..9e0aa5d 100644
--- a/exa/exa_offscreen.c
+++ b/exa/exa_offscreen.c
@@ -413,7 +413,6 @@ exaOffscreenInit (ScreenPtr pScreen)
if (!area)
return FALSE;
-
area->state = ExaOffscreenAvail;
area->base_offset = pExaScr->info->offScreenBase;
area->offset = area->base_offset;
@@ -422,10 +421,6 @@ exaOffscreenInit (ScreenPtr pScreen)
area->next = NULL;
area->score = 0;
-#if DEBUG_OFFSCREEN
- ErrorF("============ initial memory block of %d\n", area->size);
-#endif
-
/* Add it to the free areas */
pExaScr->info->offScreenAreas = area;
diff --git a/hw/xfree86/exa/examodule.c b/hw/xfree86/exa/examodule.c
index 0a7b361..4dce58f 100644
--- a/hw/xfree86/exa/examodule.c
+++ b/hw/xfree86/exa/examodule.c
@@ -47,11 +47,22 @@ static int exaXorgScreenPrivateIndex;
typedef enum {
EXAOPT_MIGRATION_HEURISTIC,
+ EXAOPT_NO_COMPOSITE,
+ EXAOPT_NO_UTS,
+ EXAOPT_NO_DFS,
} EXAOpts;
static const OptionInfoRec EXAOptions[] = {
- { EXAOPT_MIGRATION_HEURISTIC, "MigrationHeuristic", OPTV_ANYSTR, {0}, FALSE },
- { -1, NULL, OPTV_NONE, {0}, FALSE }
+ { EXAOPT_MIGRATION_HEURISTIC, "MigrationHeuristic",
+ OPTV_ANYSTR, {0}, FALSE },
+ { EXAOPT_NO_COMPOSITE, "EXANoComposite",
+ OPTV_BOOLEAN, {0}, FALSE },
+ { EXAOPT_NO_UTS, "EXANoUploadToScreen",
+ OPTV_BOOLEAN, {0}, FALSE },
+ { EXAOPT_NO_DFS, "EXANoDownloadFromScreen",
+ OPTV_BOOLEAN, {0}, FALSE },
+ { -1, NULL,
+ OPTV_NONE, {0}, FALSE }
};
static Bool
@@ -135,6 +146,26 @@ exaDDXDriverInit(ScreenPtr pScreen)
}
}
+ if (xf86IsOptionSet(pScreenPriv->options, EXAOPT_NO_COMPOSITE)) {
+ xf86DrvMsg(pScreen->myNum, X_INFO,
+ "EXA: Disabling Composite operation "
+ "(RENDER acceleration)\n");
+ pExaScr->info->CheckComposite = NULL;
+ pExaScr->info->PrepareComposite = NULL;
+ }
+
+ if (xf86IsOptionSet(pScreenPriv->options, EXAOPT_NO_UTS)) {
+ xf86DrvMsg(pScreen->myNum, X_INFO,
+ "EXA: Disabling UploadToScreen\n");
+ pExaScr->info->UploadToScreen = NULL;
+ }
+
+ if (xf86IsOptionSet(pScreenPriv->options, EXAOPT_NO_DFS)) {
+ xf86DrvMsg(pScreen->myNum, X_INFO,
+ "EXA: Disabling DownloadFromScreen\n");
+ pExaScr->info->DownloadFromScreen = NULL;
+ }
+
pScreen->devPrivates[exaXorgScreenPrivateIndex].ptr = pScreenPriv;
pScreenPriv->SavedEnableDisableFBAccess = pScrn->EnableDisableFBAccess;
diff-tree 21ef7e17ef6dca177461c9438b9df707a4d664a2 (from 71fbda8049f64c7fefae8ab817fb5f37ee2ee134)
Author: Eric Anholt <anholt at FreeBSD.org>
Date: Sun Jun 18 18:57:55 2006 -0700
Add some missing .gitignore stuff for Mesa symlinks and other generated files.
diff --git a/GL/glx/.gitignore b/GL/glx/.gitignore
new file mode 100644
index 0000000..5cf6f0a
--- /dev/null
+++ b/GL/glx/.gitignore
@@ -0,0 +1,5 @@
+indirect_size.h
+glcontextmodes.c
+glcontextmodes.h
+glapi.c
+glthread.c
diff --git a/GL/mesa/.gitignore b/GL/mesa/.gitignore
new file mode 100644
index 0000000..82ab827
--- /dev/null
+++ b/GL/mesa/.gitignore
@@ -0,0 +1,32 @@
+X/drivers
+X/glxheader.h
+X/xmesaP.h
+X/xm*.c
+array_cache/*.c
+array_cache/*.h
+mesa/drivers
+mesa/glxheader.h
+mesa/xm*.c
+glapi/*.c
+glapi/*.h
+main/*.c
+main/*.h
+math/*.c
+math/*.h
+ppc
+shader/*.c
+shader/*.h
+shader/slang/*.c
+shader/slang/*.h
+shader/slang/library
+shader/grammar/*.c
+shader/grammar/*.h
+sparc
+swrast/*.c
+swrast/*.h
+swrast_setup/*.c
+swrast_setup/*.h
+tnl/*.c
+tnl/*.h
+x86
+x86-64
diff --git a/doc/.gitignore b/doc/.gitignore
new file mode 100644
index 0000000..fa5407d
--- /dev/null
+++ b/doc/.gitignore
@@ -0,0 +1,2 @@
+Xserver.1
+Xserver.1x
diff --git a/hw/vfb/.gitignore b/hw/vfb/.gitignore
new file mode 100644
index 0000000..e3225f6
--- /dev/null
+++ b/hw/vfb/.gitignore
@@ -0,0 +1,2 @@
+Xvfb.1
+Xvfb.1x
diff --git a/hw/xfree86/doc/man/.gitignore b/hw/xfree86/doc/man/.gitignore
new file mode 100644
index 0000000..d412e51
--- /dev/null
+++ b/hw/xfree86/doc/man/.gitignore
@@ -0,0 +1,4 @@
+Xorg.1
+Xorg.1x
+xorg.conf.5
+xorg.conf.5x
diff --git a/hw/xfree86/fbdevhw/.gitignore b/hw/xfree86/fbdevhw/.gitignore
new file mode 100644
index 0000000..4c8446c
--- /dev/null
+++ b/hw/xfree86/fbdevhw/.gitignore
@@ -0,0 +1,2 @@
+fbdevhw.4
+fbdevhw.4x
diff --git a/hw/xfree86/getconfig/.gitignore b/hw/xfree86/getconfig/.gitignore
new file mode 100644
index 0000000..dc5d5cb
--- /dev/null
+++ b/hw/xfree86/getconfig/.gitignore
@@ -0,0 +1,4 @@
+getconfig.1
+getconfig.1x
+getconfig.5
+getconfig.5x
diff --git a/hw/xfree86/utils/gtf/.gitignore b/hw/xfree86/utils/gtf/.gitignore
new file mode 100644
index 0000000..741071d
--- /dev/null
+++ b/hw/xfree86/utils/gtf/.gitignore
@@ -0,0 +1,2 @@
+gtf.1
+gtf.1x
diff --git a/hw/xfree86/utils/pcitweak/.gitignore b/hw/xfree86/utils/pcitweak/.gitignore
new file mode 100644
index 0000000..c866baf
--- /dev/null
+++ b/hw/xfree86/utils/pcitweak/.gitignore
@@ -0,0 +1,3 @@
+pcitweak.1
+pcitweak.1x
+
diff --git a/hw/xfree86/utils/scanpci/.gitignore b/hw/xfree86/utils/scanpci/.gitignore
new file mode 100644
index 0000000..b752c74
--- /dev/null
+++ b/hw/xfree86/utils/scanpci/.gitignore
@@ -0,0 +1,2 @@
+scanpci.1
+scanpci.1x
diff --git a/hw/xfree86/utils/xorgcfg/.gitignore b/hw/xfree86/utils/xorgcfg/.gitignore
new file mode 100644
index 0000000..378869b
--- /dev/null
+++ b/hw/xfree86/utils/xorgcfg/.gitignore
@@ -0,0 +1,2 @@
+xorgcfg.1
+xorgcfg.1x
diff --git a/hw/xfree86/utils/xorgconfig/.gitignore b/hw/xfree86/utils/xorgconfig/.gitignore
new file mode 100644
index 0000000..6f3cabd
--- /dev/null
+++ b/hw/xfree86/utils/xorgconfig/.gitignore
@@ -0,0 +1 @@
+xorgconfig.1
diff --git a/hw/xnest/.gitignore b/hw/xnest/.gitignore
new file mode 100644
index 0000000..fc92eb1
--- /dev/null
+++ b/hw/xnest/.gitignore
@@ -0,0 +1,2 @@
+Xnest.1
+Xnest.1x
More information about the xorg-commit
mailing list