Commit Graph

364 Commits

Author SHA1 Message Date
Enrico Weigelt, metux IT consult
81a06726bc drop dead code 2025-12-08 18:57:27 +01:00
b-aaz
ef37fa448b configure: Automatically detect the default xorg-module-dir.
The module directory has changed to a per ABI folder in the xlibre-xserver.
Now the default value of `xorg-module-dir` will be detected from the `moduledir` variable in xorg-server.pc.

Signed-off-by: b-aaz <b-aazbsd.proton.me>
xlibre-xf86-video-xgi-1.6.1.2
2025-07-29 18:43:34 +02:00
Enrico Weigelt, metux IT consult
1c01a12ea0 .github: add CI pipeline
This pipeline builds the driver against the latest Xserver stable
release as well as current master.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
2025-07-29 18:34:11 +02:00
callmetango
3267c1eaf4 .github: Add issue forms
Add the following forms for issue creation:

* Bug report
* Feature request
* Code change
* Documentation update
* Organizational task

* add issue type selection page on "New Issue" call
* mention Github Discussions and the mailing list where appropriate

Part-of: X11Libre/misc#156
Signed-off-by: callmetango <callmetango@users.noreply.github.com>
2025-07-07 16:42:17 +02:00
Enrico Weigelt, metux IT consult
e73ff14a7f fix FTBS on missing typedef ulong
> ../../src/xgi_accel.c: In function 'XGIPrepareSolid':
> ../../src/xgi_accel.h:382:27: error: 'ulong' undeclared (first use in this function); did you mean 'ULong'?
>   382 |     pXGI->CommandReg |= ((ulong)(bpp))&(GENMASK(17:16)) ;
>       |                           ^~~~~

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-xgi/-/merge_requests/8>
xlibre-xf86-video-xgi-1.6.1.1
2024-07-27 22:46:16 +00:00
Enrico Weigelt, metux IT consult
75ea1ea883 fix FTBS on missing return value
> ../../src/xgi_accel.c:1055:2: error: non-void function 'XGIUploadToScratch' should return a value [-Wreturn-type]
         DisableDrawingFunctionDynamically(TRUE);
>         ^
> ../../src/xgi_accel.c:185:4: note: expanded from macro 'DisableDrawingFunctionDynamically'
>                         return; \
>                         ^

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-xgi/-/merge_requests/8>
2024-07-27 22:46:16 +00:00
Alan Coopersmith
f697a7e0df Revert "fix too small array in XGI_CRT1TableStruct"
This reverts commit 6e5981dafa.
It failed to take zero-indexing into account, and only raised the size
to 16, while using [16] means the size must be at least 17.

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-xgi/-/merge_requests/10>
2024-07-27 13:57:25 -07:00
Enrico Weigelt, metux IT consult
6e5981dafa fix too small array in XGI_CRT1TableStruct
> ../../src/init.c:553:13: warning: array index 16 is past the end of the array (which contains 15 elements) [-Warray-bounds]
>      temp = XGI_Pr->XGINEWUB_CRT1Table[index].CR[16] & 0xE0;
>             ^                                    ~~
> ../../src/vb_struct.h:377:3: note: array 'CR' declared here
>   UCHAR CR[15];
>   ^
> ../../src/init.c:556:15: warning: array index 16 is past the end of the array (which contains 15 elements) [-Warray-bounds]
>      temp = ((XGI_Pr->XGINEWUB_CRT1Table[index].CR[16]) & 0x01) << 5;
>               ^                                    ~~
> ../../src/vb_struct.h:377:3: note: array 'CR' declared here
>   UCHAR CR[15];
>   ^

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-xgi/-/merge_requests/9>
2024-06-06 13:51:21 +02:00
Enrico Weigelt, metux IT consult
6f881371d3 drop dead code
We've got lots of dead (commented-out of ifdef'ed-out) code that most likely
nobody needs anymore.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-xgi/-/merge_requests/7>
2024-05-27 16:12:15 +02:00
Enrico Weigelt, metux IT consult
58bd89aebd drop disabled ENABLE_YPBPR code path
It seems to be disabled for very long time, so probably no need for it anymore.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-xgi/-/merge_requests/6>
2024-05-24 17:16:45 +02:00
Enrico Weigelt, metux IT consult
2628472522 drop unused XGI_ARGB_CURSOR code path
It's always disabled, so probably no need for it anymore.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-xgi/-/merge_requests/6>
2024-05-24 17:14:09 +02:00
Enrico Weigelt, metux IT consult
0ed3071eff drop undef'ing non-existant XGI315DRI
It doesn't have been existing ever.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-xgi/-/merge_requests/6>
2024-05-24 17:13:51 +02:00
Enrico Weigelt, metux IT consult
65e40997a5 fix weird hack on including xgi.h
xgi.h just lacked including Xdefs.h, that's it all.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-xgi/-/merge_requests/6>
2024-05-24 17:12:09 +02:00
Enrico Weigelt, metux IT consult
8bef5f0997 drop unnecessary type guards
These aren't defined anywhere else, so no need for extra guards.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-xgi/-/merge_requests/6>
2024-05-24 16:59:02 +02:00
Enrico Weigelt, metux IT consult
0e20da3bea drop always-enabled ifdef XGI_HAVE_COMPOSITE
It's always enabled, so no need for the extra #ifdef's

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-xgi/-/merge_requests/6>
2024-05-24 16:53:42 +02:00
Enrico Weigelt, metux IT consult
dc43d5995f drop never used NEW_DGAOPENFRAMEBUFFER code path
This symbol is never defined, so we can drop the code pathes behind it.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-xgi/-/merge_requests/6>
2024-05-24 16:52:05 +02:00
Enrico Weigelt, metux IT consult
ccf7b7d3a9 drop ifdef XGIVRAMQ
It's always enabled, so no need for the extra #ifdef.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-xgi/-/merge_requests/6>
2024-05-24 16:50:06 +02:00
Enrico Weigelt, metux IT consult
4d91e8358d drop obsolete USING_BIOS_SETMODE
It's not enabled at all, so probably not needed anymore.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-xgi/-/merge_requests/6>
2024-05-24 16:48:58 +02:00
Enrico Weigelt, metux IT consult
d31abc8180 drop obsolete ifdef XGIXINERAMA
It's always enabled, so no need for the extra #ifdef's

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-xgi/-/merge_requests/6>
2024-05-24 16:47:27 +02:00
Enrico Weigelt, metux IT consult
9e133647b6 drop obsolete ifdef on LINUX_XF86
It's always enabled, so no need for the ifdefs and the disabled code pathes.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-xgi/-/merge_requests/6>
2024-05-24 16:42:41 +02:00
Enrico Weigelt, metux IT consult
e1dc37b94a drop ancient raw Linux kernel FB support
This has been disabled for aeons and probably doesn't work at all.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-xgi/-/merge_requests/6>
2024-05-24 16:30:23 +02:00
Enrico Weigelt, metux IT consult
0b9742fe3c drop compat for ancient Linux 2.5.x kernel
This is really ancient and probably doesn't work anymore at all.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-xgi/-/merge_requests/6>
2024-05-24 16:26:15 +02:00
Enrico Weigelt, metux IT consult
bb077f384b drop unused WIN2000 code path
hw/xfree86, thus this driver, doesn't run on Windows, so no need for that.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-xgi/-/merge_requests/6>
2024-05-24 16:23:45 +02:00
Enrico Weigelt, metux IT consult
732fee2815 drop ifdef XGIGAMMA
It's always enabled, so no need for the extra #ifdef.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-xgi/-/merge_requests/6>
2024-05-24 16:19:35 +02:00
Enrico Weigelt, metux IT consult
74cf2305a0 drop ifdef's on XGIMERGED
It's always enabled, so no need for the #ifdef's anymore.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-xgi/-/merge_requests/6>
2024-05-24 16:18:17 +02:00
Enrico Weigelt, metux IT consult
e3c0298c54 drop ifdef's on XGIDUALHEAD
It's always enabled, so no need for the #ifdef's anymore.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-xgi/-/merge_requests/6>
2024-05-24 16:18:17 +02:00
Enrico Weigelt, metux IT consult
5cbd1a822c drop UNLOCK_ALWAYS symbol
It's always enabled, so no need for the #ifdef's.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-xgi/-/merge_requests/6>
2024-05-24 16:18:17 +02:00
Enrico Weigelt, metux IT consult
05eac74cbd drop unused XGI_CP code pathes
These seem never to have been enabled, so probably not needed at all.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-xgi/-/merge_requests/6>
2024-05-24 16:18:17 +02:00
Enrico Weigelt, metux IT consult
c044bc1def drop compat with ancient xserver versions
We're relying on at least 1.18 now.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-xgi/-/merge_requests/6>
2024-05-24 16:18:13 +02:00
Enrico Weigelt, metux IT consult
d71549781e drop obsolete XAA support
Since recent commits require xserver-1.18.0 or later to build against,
there's no reason leaving behind big chunks of code that can only build
against the XAA support removed in xserver-1.13.0 (released in 2012).

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-xgi/-/merge_requests/6>
2024-05-24 15:21:09 +02:00
Enrico Weigelt, metux IT consult
3d7d54d48b drop compat for ancient and dead XFree86
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-xgi/-/merge_requests/6>
2024-05-23 21:23:20 +02:00
Enrico Weigelt, metux IT consult
bcb7c3a1d7 bump minimal xorg version to 1.18
1.18 was released a decade ago, so it seems reasonable stop supporting
older ones.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-xgi/-/merge_requests/6>
2024-05-14 16:34:04 +02:00
Enrico Weigelt, metux IT consult
0ebba9ea62 use XNFcallocarray() instead of xnfcalloc macro
xnfcalloc is just an alias for XNFcallocarray() that doesn't seem to serve
any practical purpose, so it can go away once all drivers stopped using it.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-xgi/-/merge_requests/5>
2024-05-08 17:27:40 +02:00
Enrico Weigelt, metux IT consult
a0da5b01a5 use XNFalloc() instead of xnfalloc
xnfalloc is just an alias for XNFalloc() that doesn't seem to serve
any practical purpose, so it can go away once all drivers stopped using it.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-xgi/-/merge_requests/5>
2024-05-08 13:23:03 +02:00
Alan Coopersmith
c904d2e1c3 configure: Use LT_INIT from libtool 2 instead of deprecated AC_PROG_LIBTOOL
AC_PROG_LIBTOOL was replaced by LT_INIT in libtool 2 in 2008,
so it's time to rely on it.

Clears autoconf warnings:

configure.ac:47: warning: The macro 'AC_PROG_LIBTOOL' is obsolete.
configure.ac:47: You should run autoupdate.
aclocal.m4:3551: AC_PROG_LIBTOOL is expanded from...
configure.ac:47: the top level

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2024-01-16 17:00:36 -08:00
Alan Coopersmith
a76ae9bff2 gitlab CI: ensure libtool is installed in build container
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2023-10-07 09:38:00 -07:00
Alan Coopersmith
dec0beddbe Fix -Wimplicit-function-declaration warning
xgi_setup.c:637:5: warning: implicit declaration of function
  ‘XGI_New_GetVBType’; did you mean ‘XGI_GetRegByte’?
  [-Wimplicit-function-declaration]
     XGI_New_GetVBType(pXGI->XGI_Pr, pHwDevInfo); //yilin
     ^~~~~~~~~~~~~~~~~

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2022-12-09 13:20:16 -08:00
Alan Coopersmith
360c88c0d4 XGIErrorLog: add printf attribute
xgi_driver.c: In function ‘XGIErrorLog’:
xgi_driver.c:729:5: warning: function ‘XGIErrorLog’ might be a candidate
  for ‘gnu_printf’ format attribute [-Wsuggest-attribute=format]
     xf86VDrvMsgVerb(pScrn->scrnIndex, X_ERROR, 1, format, ap);
     ^~~~~~~~~~~~~~~

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2022-12-09 13:02:00 -08:00
Alan Coopersmith
f6ffb479c3 Fix -Wdiscarded-qualifiers warnings
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2022-12-09 12:55:19 -08:00
Alan Coopersmith
aa970d8d25 Stop including deprecated xf86PciInfo.h
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2022-12-09 12:46:55 -08:00
Alan Coopersmith
0d35e771a4 gitlab CI: stop requiring Signed-off-by in commits
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2022-12-09 12:42:30 -08:00
Alan Coopersmith
3143bdee58 Fix building with -fno-common
This is the default in gcc 10 & later, and causes build failures with:
/usr/sbin/ld: .libs/xgi_driver.o:/builds/alanc/xf86-video-xgi/_builddir/src/../../src/xgi_accel.h:125: multiple definition of `Alignment'; .libs/xgi_accel.o:/builds/alanc/xf86-video-xgi/_builddir/src/../../src/xgi_accel.h:125: first defined here
/usr/sbin/ld: .libs/xgi_driver.o:/builds/alanc/xf86-video-xgi/_builddir/src/../../src/xgi_accel.h:124: multiple definition of `G2CmdQueLen'; .libs/xgi_accel.o:/builds/alanc/xf86-video-xgi/_builddir/src/../../src/xgi_accel.h:124: first defined here
/usr/sbin/ld: .libs/xgi_driver.o:/builds/alanc/xf86-video-xgi/_builddir/src/../../src/xgi_accel.h:122: multiple definition of `w_port'; .libs/xgi_accel.o:/builds/alanc/xf86-video-xgi/_builddir/src/../../src/xgi_accel.h:122: first defined here
/usr/sbin/ld: .libs/xgi_driver.o:/builds/alanc/xf86-video-xgi/_builddir/src/../../src/xgi_accel.h:122: multiple definition of `r_port'; .libs/xgi_accel.o:/builds/alanc/xf86-video-xgi/_builddir/src/../../src/xgi_accel.h:122: first defined here

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2022-01-30 09:41:19 -08:00
Alan Coopersmith
542aaf8ac4 gitlab CI: add a basic build test
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2022-01-30 09:25:24 -08:00
Alan Coopersmith
279b965c8b Fix spelling/wording issues
Found by using:
    codespell --builtin clear,rare,usage,informal,code,names

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2022-01-30 09:23:37 -08:00
Alan Coopersmith
fb010f4243 Build xz tarballs instead of bzip2
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2022-01-30 09:12:05 -08:00
Alan Coopersmith
979e4ce9a9 Update configure.ac bug URL for gitlab migration
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2018-12-07 19:23:38 -08:00
Alan Coopersmith
e8bca4874b Update README for gitlab migration
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2018-11-18 16:46:35 -08:00
Emil Velikov
986b2fd081 xf86-video-xgi: remove the GlxSetVisualConfigs stub and friends
The function was an empty since 2008 at least. Remove it alongside the
unused GLX visuals code.

With this all the GL/GLX dependencies in the driver are gone.

Cc: Connor Behan <connor.behan@gmail.com>
Cc: Adam Jackson <ajax@redhat.com>
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
2017-07-17 13:57:12 +01:00
Adam Jackson
78d1138dd6 Adapt Block/WakeupHandler signature for ABI 23
Signed-off-by: Adam Jackson <ajax@redhat.com>
2016-07-19 10:08:10 -04:00
Tristan Plumb
923e6d6c6d Add check for libpciaccess on ARM
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=30619
Reviewed-by: Connor Behan <connor.behan@gmail.com>
2016-04-28 15:23:32 -04:00