xf86-video-intel: Branch 'modesetting' - 3 commits - configure.ac src/bios_reader/bios_dumper.c src/bios_reader/.gitignore src/bios_reader/Makefile.am src/i830_xaa.c
Eric Anholt
anholt at kemper.freedesktop.org
Mon Mar 5 03:35:36 EET 2007
configure.ac | 4 -
src/bios_reader/.gitignore | 1
src/bios_reader/Makefile.am | 11 ++++
src/bios_reader/bios_dumper.c | 98 ++++++++++++++++++++++++++++++++++++++++++
src/i830_xaa.c | 6 +-
5 files changed, 115 insertions(+), 5 deletions(-)
New commits:
diff-tree b27fa2c257ccc49c6f29a20a3e672ebaaf58e7aa (from fc7d43c2b6b98be597152fbd88024273edd931d0)
Author: Eric Anholt <eric at anholt.net>
Date: Sun Mar 4 17:15:45 2007 -0800
Fix a crash with XAA and DRI disabled after the allocation rework.
diff --git a/src/i830_xaa.c b/src/i830_xaa.c
index f095138..9ecf706 100644
--- a/src/i830_xaa.c
+++ b/src/i830_xaa.c
@@ -279,12 +279,14 @@ CheckTiling(ScrnInfoPtr pScrn)
if (IS_I965G(pI830)) {
if (pI830->bufferOffset == pScrn->fbOffset && pI830->front_tiled == FENCE_XMAJOR)
tiled = 1;
- if (pI830->bufferOffset == pI830->back_buffer->offset &&
+ if (pI830->back_buffer != NULL &&
+ pI830->bufferOffset == pI830->back_buffer->offset &&
pI830->back_tiled == FENCE_XMAJOR) {
tiled = 1;
}
/* not really supported as it's always YMajor tiled */
- if (pI830->bufferOffset == pI830->depth_buffer->offset &&
+ if (pI830->depth_buffer != NULL &&
+ pI830->bufferOffset == pI830->depth_buffer->offset &&
pI830->depth_tiled == FENCE_XMAJOR) {
tiled = 1;
}
diff-tree fc7d43c2b6b98be597152fbd88024273edd931d0 (from b7b6063e62927dd135e118c433f48b4d0b5fe246)
Author: Eric Anholt <eric at anholt.net>
Date: Sun Mar 4 17:14:30 2007 -0800
Use -f for ln of server source. Otherwise, changing paths didn't take effect.
diff --git a/configure.ac b/configure.ac
index 775e87f..772b40b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -145,13 +145,13 @@ if test -d "$XSERVER_SOURCE"; then
if test -f src/modes/xf86Modes.h; then
:
else
- ln -s $XSERVER_SOURCE/hw/xfree86/modes src/modes
+ ln -sf $XSERVER_SOURCE/hw/xfree86/modes src/modes
fi
if test -f src/parser/xf86Parser.h; then
:
else
- ln -s $XSERVER_SOURCE/hw/xfree86/parser src/parser
+ ln -sf $XSERVER_SOURCE/hw/xfree86/parser src/parser
fi
fi
AC_SUBST([XMODES_CFLAGS])
diff-tree b7b6063e62927dd135e118c433f48b4d0b5fe246 (from 6aeb855b9d4e03d458773240a9c0c9c1edd3e403)
Author: Eric Anholt <eric at anholt.net>
Date: Sun Mar 4 15:53:50 2007 -0800
Add a little BIOS dumper program.
This isn't actually tested yet as libpciaccess doesn't do rom access on
non-linux yet.
diff --git a/src/bios_reader/.gitignore b/src/bios_reader/.gitignore
index 3e32507..49312f2 100644
--- a/src/bios_reader/.gitignore
+++ b/src/bios_reader/.gitignore
@@ -1 +1,2 @@
+bios_dumper
bios_reader
diff --git a/src/bios_reader/Makefile.am b/src/bios_reader/Makefile.am
index a5c81a6..bba969b 100644
--- a/src/bios_reader/Makefile.am
+++ b/src/bios_reader/Makefile.am
@@ -1,4 +1,13 @@
AM_CFLAGS = @XORG_CFLAGS@ @XMODES_CFLAGS@
-noinst_PROGRAMS = bios_reader
+noinst_PROGRAMS = bios_reader $(BIOS_DUMPER)
+if HAVE_PCIACCESS
+BIOS_DUMPER = bios_dumper
+
+bios_dumper_SOURCES = bios_dumper.c
+
+bios_dumper_CFLAGS = $(PCIACCESS_CFLAGS)
+bios_dumper_LDADD = $(PCIACCESS_LIBS)
+
+endif
diff --git a/src/bios_reader/bios_dumper.c b/src/bios_reader/bios_dumper.c
new file mode 100644
index 0000000..071419b
--- /dev/null
+++ b/src/bios_reader/bios_dumper.c
@@ -0,0 +1,98 @@
+/*
+ * 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 <fcntl.h>
+#include <errno.h>
+#include <pciaccess.h>
+#include <err.h>
+
+static void usage(void)
+{
+ fprintf(stderr, "usage: bios_dumper <filename>\n");
+ exit(1);
+}
+
+int main(int argc, char **argv)
+{
+ struct pci_device *dev;
+ void *bios;
+ int err, fd;
+
+ if (argc != 2)
+ usage();
+
+ 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");
+
+ if (dev->vendor_id != 0x8086)
+ errx(1, "Graphics card is non-intel");
+
+ err = pci_device_probe(dev);
+ if (err != 0) {
+ fprintf(stderr, "Couldn't probe graphics card: %s\n", strerror(err));
+ exit(1);
+ }
+
+ bios = malloc(dev->rom_size);
+ if (bios == NULL)
+ errx(1, "Couldn't allocate memory for BIOS data\n");
+
+ err = pci_device_read_rom(dev, bios);
+ if (err != 0) {
+ fprintf(stderr, "Couldn't read graphics card ROM: %s\n",
+ strerror(err));
+ exit(1);
+ }
+
+ fd = open(argv[1], O_RDWR | O_CREAT | O_TRUNC);
+ if (fd < 0) {
+ fprintf(stderr, "Couldn't open output: %s\n", strerror(errno));
+ exit(1);
+ }
+
+ if (write(fd, bios, dev->rom_size) < dev->rom_size) {
+ fprintf(stderr, "Couldn't write BIOS data: %s\n", strerror(errno));
+ exit(1);
+ }
+
+ close(fd);
+ pci_system_cleanup();
+
+ return 0;
+}
More information about the xorg-commit
mailing list