fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-02 00:10:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Build radeon.o from toplevel makefile.

Browse source 
Add comments to example.miniglx.conf.
Install a minglx.conf in lib directory.
Remove unused 'drmModuleName' config option
This commit is contained in:
Keith Whitwell 2003-01-20 10:53:34 +00:00
parent 78469e6e3d
commit 222a212569
5 changed files with 32 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/mesa/drivers/dri/radeon/server/radeon_dri.c
View file

@ -470,7 +470,7 @@ static int RADEONScreenInit( struct MiniGLXDisplayRec *dpy, RADEONInfoPtr info )
/* Note that drmOpen will try to load the kernel module, if needed. */
dpy->drmFD = drmOpen(dpy->drmModuleName, NULL );
dpy->drmFD = drmOpen("radeon", NULL );
if (dpy->drmFD < 0) {
/* failed to open DRM */
fprintf(stderr, "[drm] drmOpen failed\n");

4
src/miniglx/Makefile
View file

@ -26,10 +26,12 @@ libGL.so.1.2: $(OBJS) Makefile
gcc -shared -Wl,-soname,libGL.so -Wl,-Bsymbolic $(OBJS) $(LIBS) -o $@
install:
rm -f $(MESA)/lib/libGL.so*
rm -f $(MESA)/lib/libGL.so*
rm -f $(MESA)/lib/miniglx.conf
install -D libGL.so.1.2 $(MESA)/lib/libGL.so.1.2
ln -s libGL.so.1.2 $(MESA)/lib/libGL.so.1
ln -s libGL.so.1 $(MESA)/lib/libGL.so
install example.miniglx.conf $(MESA)/lib/miniglx.conf
#miniglx.a: $(OBJECTS) Makefile
# rm -f $@ && ar rcv $@ $(OBJECTS) && ranlib $@

26
src/miniglx/example.miniglx.conf
View file

@ -1,5 +1,23 @@
fbdevDevice = /dev/fb0
clientDriverName=radeon_dri.so
drmModuleName = radeon
pciBusID = PCI:1:0:0
# Example miniglx configuration file (/etc/miniglx.conf)
#
# Framebuffer device to open: Might need to change this on dual-head
# systems.
fbdevDevice=/dev/fb0
# Which driver?
# radeon_dri.so -- HW accelerated radeon driver
# fb_dri.so -- Software rasterizer
clientDriverName=radeon_dri.so
# The pci bus id of the video card. Find this with scanpci, lspci or
# look in /proc/pci.
pciBusID=PCI:1:0:0
# Virtual screen dimensions. Can reduce this to save videocard memory
# at the expense of maximum window size available.
virtualWidth=1280
virtualHeight=1024
# Screen depth. Only 16 & 32bpp supported.
bpp=32

7
src/miniglx/miniglx.c
View file

@ -22,7 +22,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
/* $Id: miniglx.c,v 1.1.4.43 2003/01/19 23:48:32 brianp Exp $ */
/* $Id: miniglx.c,v 1.1.4.44 2003/01/20 10:53:35 keithw Exp $ */
/**
@ -737,7 +737,6 @@ static int __read_config_file( Display *dpy )
*/
dpy->fbdevDevice = "/dev/fb0";
dpy->clientDriverName = "fb_dri.so";
dpy->drmModuleName = 0;
dpy->pciBus = 0;
dpy->pciDevice = 0;
dpy->pciFunc = 0;
@ -753,7 +752,7 @@ static int __read_config_file( Display *dpy )
file = fopen(fname, "r");
if (!file) {
fprintf(stderr, "couldn't open config file %s\n", fname);
fprintf(stderr, "couldn't open config file %s: %s\n", fname, strerror(errno));
return 0;
}
@ -783,8 +782,6 @@ static int __read_config_file( Display *dpy )
dpy->fbdevDevice = strdup(val);
else if (strcmp(opt, "clientDriverName") == 0)
dpy->clientDriverName = strdup(val);
else if (strcmp(opt, "drmModuleName") == 0)
dpy->drmModuleName = strdup(val);
else if (strcmp(opt, "pciBusID") == 0) {
if (sscanf(val, "PCI:%d:%d:%d",
&dpy->pciBus, &dpy->pciDevice, &dpy->pciFunc) != 3) {

5
src/miniglx/miniglxP.h
View file

@ -190,6 +190,10 @@ struct MiniGLXDriverRec {
*/
int (*validateMode)( struct MiniGLXDisplayRec *dpy );
/**
* \brief Examine mode returned by fbdev (may differ from the one
* requested), restore any hw regs clobbered by fbdev.
*/
int (*postValidateMode)( struct MiniGLXDisplayRec *dpy );
/**
@ -328,7 +332,6 @@ struct MiniGLXDisplayRec {
/*@{*/
const char *fbdevDevice;
const char *clientDriverName;
const char *drmModuleName;
const char *pciBusID;
int pciBus;
int pciDevice;