summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--distrib/notes/README.sgi23
-rw-r--r--etc/X11.sgi/xorg.conf32
2 files changed, 53 insertions, 2 deletions
diff --git a/distrib/notes/README.sgi b/distrib/notes/README.sgi
index 00b7f63b8..b47397996 100644
--- a/distrib/notes/README.sgi
+++ b/distrib/notes/README.sgi
@@ -1,8 +1,27 @@
Post-installation instructions for X.Org on OpenBSD/sgi
-------------------------------------------------------
-There is no X server for sgi. Only userland X.
+OpenBSD 4.3 and later use the X.Org X server on sgi.
+
+Currently, the X server is only supported on SGI O2 workstations with a gbe(4)
+frame buffer. The wsfb driver provides an unaccelerated frame buffer for use
+with the X server.
+
+The default /etc/X11/xorg.conf which is installed, provides a ready-to-run
+configuration. Due to the current lack of dynamic object lazy binding on
+OpenBSD/sgi, the `shadow' and `fb' modules need to be force loaded. This can be
+achieved by ensuring that the following is included in the xorg.conf file:
+
+ Section "Module"
+ Load "shadow"
+ Load "fb"
+ EndSection
+
+To start xdm, the X display manager, activate the xdm_flags option in
+/etc/rc.conf. You will need to disable the console getty in /etc/ttys.
+
+Alternatively, you can log in at the console and run `startx'.
problem_blurb
-$OpenBSD: README.sgi,v 1.1 2006/11/27 11:25:45 matthieu Exp $
+$OpenBSD: README.sgi,v 1.2 2008/01/06 06:26:59 jsing Exp $
diff --git a/etc/X11.sgi/xorg.conf b/etc/X11.sgi/xorg.conf
new file mode 100644
index 000000000..bdc93b45f
--- /dev/null
+++ b/etc/X11.sgi/xorg.conf
@@ -0,0 +1,32 @@
+#
+# Unaccelerated, single display configuration
+#
+# $OpenBSD: xorg.conf,v 1.1 2008/01/06 06:26:59 jsing Exp $
+#
+Section "Module"
+ Load "shadow"
+ Load "fb"
+EndSection
+
+Section "Device"
+ Identifier "Wsfb0"
+ Driver "wsfb"
+ Option "device" "/dev/ttyC0"
+EndSection
+
+Section "Screen"
+ Identifier "Screen0"
+ Device "Wsfb0"
+ SubSection "Display"
+ Depth 8
+ EndSubSection
+ SubSection "Display"
+ Depth 16
+ EndSubSection
+ SubSection "Display"
+ Depth 24
+ EndSubSection
+ SubSection "Display"
+ Depth 32
+ EndSubSection
+EndSection