xf86-video-intel: Branch 'xf86-video-intel-2.4-branch' - 6 commits - configure.ac Makefile.am src/i830_debug.c src/i830_hdmi.c src/i965_render.c src/reg_dumper/.gitignore src/reg_dumper/hotplug.c src/reg_dumper/Makefile.am
Zhenyu Wang
zhen at kemper.freedesktop.org
Wed Jul 23 01:20:10 PDT 2008
Makefile.am | 1
configure.ac | 2
src/i830_debug.c | 6 +
src/i830_hdmi.c | 2
src/i965_render.c | 2
src/reg_dumper/.gitignore | 1
src/reg_dumper/Makefile.am | 9 ++
src/reg_dumper/hotplug.c | 151 +++++++++++++++++++++++++++++++++++++++++++++
8 files changed, 170 insertions(+), 4 deletions(-)
New commits:
commit f3b72c59e5000bcdb07cbdf080e09c55b9826eff
Author: Zhenyu Wang <zhenyu.z.wang at intel.com>
Date: Wed Jul 23 16:02:02 2008 +0800
Bump version 2.4.0
diff --git a/configure.ac b/configure.ac
index 2dabd4f..6694773 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-intel],
- 2.2.0,
+ 2.4.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-intel)
commit 5c447fa50ecd4fe7f971b1e6deb8908e98afa61b
Author: Zhenyu Wang <zhenyu.z.wang at intel.com>
Date: Wed Jul 23 15:10:07 2008 +0800
shut up gcc warning
(cherry picked from commit 6ac352f146bafe3b4bb5832340eb0ccb730565d2)
diff --git a/src/i965_render.c b/src/i965_render.c
index 1cbfe24..8360be4 100644
--- a/src/i965_render.c
+++ b/src/i965_render.c
@@ -862,7 +862,7 @@ i965_set_picture_surface_state(ScrnInfoPtr pScrn, struct brw_surface_state *ss,
memset(&local_ss, 0, sizeof(local_ss));
local_ss.ss0.surface_type = BRW_SURFACE_2D;
if (is_dst) {
- uint32_t dst_format;
+ uint32_t dst_format = 0;
Bool ret = TRUE;
ret = i965_get_dest_format(pPicture, &dst_format);
commit e6d0586db95cab1cdf2f8485a1a1a895f18118e4
Author: Zhenyu Wang <zhenyu.z.wang at intel.com>
Date: Wed Jul 23 15:07:48 2008 +0800
Fix distcheck for clean doltcompile
(cherry picked from commit 075cf7fce57da4e51acafb3bfd3d61ba1a8096d5)
diff --git a/Makefile.am b/Makefile.am
index 8cbe4a9..b2398a8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,3 +22,4 @@ AUTOMAKE_OPTIONS = foreign
SUBDIRS = src man
EXTRA_DIST = README
+DISTCLEANFILES = doltcompile
commit fe9fba38e9c4bdb1b242760b9e565852f717de09
Author: Zhenyu Wang <zhenyu.z.wang at intel.com>
Date: Wed Jul 23 11:16:14 2008 +0800
Fix HDMI output number
Output 33 is confusing.
(cherry picked from commit 29d982c6bf873c6685bd0e395a8b0e5e3b1063e0)
diff --git a/src/i830_hdmi.c b/src/i830_hdmi.c
index b738463..58d1c49 100644
--- a/src/i830_hdmi.c
+++ b/src/i830_hdmi.c
@@ -229,5 +229,5 @@ i830_hdmi_init(ScrnInfoPtr pScrn, int output_reg)
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"HDMI output %d detected\n",
- 1 + (output_reg - SDVOB));
+ (output_reg == SDVOB) ? 1 : 2);
}
commit 3f5c9bd512907238a2fd6746a41d8703aefe39e9
Author: Eric Anholt <eric at anholt.net>
Date: Thu Mar 6 13:59:06 2008 -0800
Add little hotplug detector app.
(cherry picked from commit b60bbbfd7b7dcf31726ad615a493f34f17cc6309)
diff --git a/src/reg_dumper/hotplug.c b/src/reg_dumper/hotplug.c
new file mode 100644
index 0000000..68fe584
--- /dev/null
+++ b/src/reg_dumper/hotplug.c
@@ -0,0 +1,151 @@
+/*
+ * Copyright © 2007 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ * Eric Anholt <eric at anholt.net>
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdarg.h>
+#include <pciaccess.h>
+#include <err.h>
+#include <unistd.h>
+
+#include "reg_dumper.h"
+#include "../i810_reg.h"
+
+struct idle_flags {
+ uint32_t instdone_flag;
+ char *name;
+ unsigned int count;
+};
+
+int main(int argc, char **argv)
+{
+ struct pci_device *dev;
+ I830Rec i830;
+ I830Ptr pI830 = &i830;
+ ScrnInfoRec scrn;
+ int err, mmio_bar;
+ void *mmio;
+ int i;
+
+ err = pci_system_init();
+ if (err != 0) {
+ fprintf(stderr, "Couldn't initialize PCI system: %s\n", strerror(err));
+ exit(1);
+ }
+
+ /* Grab the graphics card */
+ dev = pci_device_find_by_slot(0, 0, 2, 0);
+ if (dev == NULL)
+ errx(1, "Couldn't find graphics card");
+
+ err = pci_device_probe(dev);
+ if (err != 0) {
+ fprintf(stderr, "Couldn't probe graphics card: %s\n", strerror(err));
+ exit(1);
+ }
+
+ if (dev->vendor_id != 0x8086)
+ errx(1, "Graphics card is non-intel");
+
+ i830.PciInfo = &i830.pci_info_rec;
+ i830.PciInfo->chipType = dev->device_id;
+
+ i830.pci_dev = dev;
+
+ mmio_bar = IS_I9XX((&i830)) ? 0 : 1;
+
+ err = pci_device_map_range (dev,
+ dev->regions[mmio_bar].base_addr,
+ dev->regions[mmio_bar].size,
+ PCI_DEV_MAP_FLAG_WRITABLE,
+ &mmio);
+
+ if (err != 0) {
+ fprintf(stderr, "Couldn't map MMIO region: %s\n", strerror(err));
+ exit(1);
+ }
+ i830.mmio = mmio;
+
+ scrn.scrnIndex = 0;
+ scrn.pI830 = &i830;
+
+ OUTREG(SDVOB, (0x0 << 10));
+ OUTREG(SDVOC, (0x0 << 10));
+
+ OUTREG(PORT_HOTPLUG_EN,
+ (1 << 29) |
+ (1 << 28) |
+ (1 << 27) |
+ SDVOB_HOTPLUG_INT_EN |
+ SDVOC_HOTPLUG_INT_EN |
+ (1 << 24) |
+ CRT_HOTPLUG_INT_EN |
+ TV_HOTPLUG_INT_EN |
+ CRT_HOTPLUG_INT_EN);
+
+ for (i = 0;; i++) {
+ OUTREG(PORT_HOTPLUG_STAT,
+ (1 << 20) |
+ (1 << 19) |
+ (1 << 18) |
+ (1 << 17) |
+ CRT_HOTPLUG_INT_STATUS |
+ TV_HOTPLUG_INT_STATUS |
+ SDVOC_HOTPLUG_INT_STATUS |
+ SDVOB_HOTPLUG_INT_STATUS);
+ INREG(PORT_HOTPLUG_STAT);
+
+ usleep(500 * 1000);
+
+ printf("%5d: 0x%08x\n", i, INREG(PORT_HOTPLUG_STAT));
+ sleep(1);
+ }
+
+ return 0;
+}
+
+void xf86DrvMsg(int scrnIndex, int severity, const char *format, ...)
+{
+ va_list va;
+
+ switch (severity) {
+ case X_INFO:
+ printf("(II): ");
+ break;
+ case X_WARNING:
+ printf("(WW): ");
+ break;
+ case X_ERROR:
+ printf("(EE): ");
+ break;
+ }
+
+ va_start(va, format);
+ vprintf(format, va);
+ va_end(va);
+}
commit 202811e253be85c4415bba3eaae13508b1e2ce71
Author: Eric Anholt <eric at anholt.net>
Date: Thu Mar 6 14:00:18 2008 -0800
Remove VGA regs from debug output.
(cherry picked from commit 52a414d1158aa7512fb79560dc220e2a78456a2d)
diff --git a/src/i830_debug.c b/src/i830_debug.c
index 856e31a..a7f1683 100644
--- a/src/i830_debug.c
+++ b/src/i830_debug.c
@@ -722,6 +722,7 @@ void i830CompareRegsToSnapshot(ScrnInfoPtr pScrn, char *where)
}
#endif /* !REG_DUMPER */
+#if 0
static void i830DumpIndexed (ScrnInfoPtr pScrn, char *name, int id, int val, int min, int max)
{
I830Ptr pI830 = I830PTR(pScrn);
@@ -762,6 +763,7 @@ static void i830DumpAR(ScrnInfoPtr pScrn)
OUTREG8(0x3c0, orig_arx);
INREG8(st01); /* switch back to index mode */
}
+#endif
void i830DumpRegs (ScrnInfoPtr pScrn)
{
@@ -773,8 +775,10 @@ void i830DumpRegs (ScrnInfoPtr pScrn)
int ref;
int dot;
int phase;
+#if 0
int msr;
int crt;
+#endif
xf86DrvMsg (pScrn->scrnIndex, X_INFO, "DumpRegsBegin\n");
for (i = 0; i < NUM_I830_SNAPSHOTREGS; i++) {
@@ -792,6 +796,7 @@ void i830DumpRegs (ScrnInfoPtr pScrn)
i830_snapshot[i].name, (unsigned int)val);
}
}
+#if 0
i830DumpIndexed (pScrn, "SR", 0x3c4, 0x3c5, 0, 7);
msr = INREG8(0x3cc);
xf86DrvMsg (pScrn->scrnIndex, X_INFO, "%20.20s: 0x%02x\n",
@@ -803,6 +808,7 @@ void i830DumpRegs (ScrnInfoPtr pScrn)
else
crt = 0x3b0;
i830DumpIndexed (pScrn, "CR", crt + 4, crt + 5, 0, 0x24);
+#endif
for (pipe = 0; pipe <= 1; pipe++)
{
fp = INREG(pipe == 0 ? FPA0 : FPB0);
diff --git a/src/reg_dumper/.gitignore b/src/reg_dumper/.gitignore
index f72a165..b0f9b6f 100644
--- a/src/reg_dumper/.gitignore
+++ b/src/reg_dumper/.gitignore
@@ -1,3 +1,4 @@
+intel_hotplug
intel_idle
intel_reg_dumper
intel_stepping
diff --git a/src/reg_dumper/Makefile.am b/src/reg_dumper/Makefile.am
index b840b24..d49a59b 100644
--- a/src/reg_dumper/Makefile.am
+++ b/src/reg_dumper/Makefile.am
@@ -1,4 +1,4 @@
-noinst_PROGRAMS = intel_reg_dumper intel_idle intel_stepping
+noinst_PROGRAMS = intel_reg_dumper intel_idle intel_stepping intel_hotplug
intel_reg_dumper_SOURCES = \
main.c \
@@ -12,9 +12,16 @@ intel_idle_SOURCES = \
xprintf.c \
../i830_debug.c
+intel_hotplug_SOURCES = \
+ hotplug.c \
+ reg_dumper.h \
+ xprintf.c \
+ ../i830_debug.c
+
intel_stepping_SOURCES = \
stepping.c
+intel_hotplug_LDADD = $(PCIACCESS_LIBS)
intel_reg_dumper_LDADD = $(PCIACCESS_LIBS)
intel_idle_LDADD = $(PCIACCESS_LIBS)
intel_stepping_LDADD = $(PCIACCESS_LIBS)
More information about the xorg-commit
mailing list