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>
Standard C calloc() really is enough here, no need to extra Xserver
wrappers that are in process of being phased out anyways.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
The <region.h> header is deprecated, anything we might need from it
is already reachable via <regionstr.h>
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Seems like this check is also unnecessary in FreeBSD as in NetBSD.
Because the vgapci driver is always attached.
Signed-off-by: b-aaz <b-aazbsd.proton.me>
Handles warning from Oracle Parfait static analyser:
Error: Misleading macro
Misleading macro [misleading-macro]:
misleading evaluation of unary '-' operator in expansion of macro ABS due to missing parentheses
at line 104 of src/riva_hw.c.
binary '+' operator has lower precedence than unary '-' operator inside macro body at line 298
if (ABS(ainfo->vburst_size) + (ABS(ainfo->wcvlwm + 32) & ~0xf) - tmp> VFIFO_SIZE)
low precedence binary '+' operator is hidden by expansion of macro argument a at line 104
#define ABS(a) (a>0?a:-a)
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
The API was removed by Xserver commit dd00e5466a0e4ea313d1860824da4123692827ed
in xorg-server-1.20.0 and later.
Found by gcc -Werror=implicit:
riva_driver.c: In function ‘RivaScreenInit’:
riva_driver.c:1213:12: error: implicit declaration of function
‘xf86DisableRandR’; did you mean ‘xf86DisableIO’?
[-Werror=implicit-function-declaration]
1213 | xf86DisableRandR();
| ^~~~~~~~~~~~~~~~
| xf86DisableIO
nv_driver.c: In function ‘NVScreenInit’:
nv_driver.c:2635:16: error: implicit declaration of function
‘xf86DisableRandR’; did you mean ‘xf86DisableIO’?
[-Werror=implicit-function-declaration]
2635 | xf86DisableRandR();
| ^~~~~~~~~~~~~~~~
| xf86DisableIO
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Written by either Julio Merino <julio at meroh.net> or Nathan Whitehorn
<nwhitehorn at freebsd.org> (emails obfuscated similar to freebsd
convention, authorship is in doubt)
Fixes gcc warnings:
riva_xaa.c: In function ‘RivaSetRopPattern’:
riva_xaa.c:94:33: warning: implicit declaration of function
‘XAAGetPatternROP’; did you mean ‘RivaSetPattern’?
[-Wimplicit-function-declaration]
pRiva->riva.Rop->Rop3 = XAAGetPatternROP(rop);
^~~~~~~~~~~~~~~~
RivaSetPattern
At top level:
riva_xaa.c:89:1: warning: ‘RivaSetRopPattern’ defined but not used
[-Wunused-function]
RivaSetRopPattern(RivaPtr pRiva, int rop)
^~~~~~~~~~~~~~~~~
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Makes it possible to run the nv driver without XAA on cards where
EXA is not supported.
Signed-off-by: Matthieu Herrb <matthieu@herrb.eu>
Reviewed-by: Adam Jackson <ajax@redhat.com>
The NV driver did never set the VGA IOBase for those registers which
have different addresses dependent whether the VGA engine is running in
mono or color mode.
This has not been detected as the VGA mode and font save/restore
functions initialize this value themselves.
Signed-off-by: Egbert Eich <eich@freedesktop.org>
Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
Get rid of this with CFLAGS="-Wall -Werror":
| CC g80_display.lo
| cc1: warnings being treated as errors
| g80_display.c: In function ‘G80CrtcSetPClk’:
| g80_display.c:216: error: unused variable ‘i’
Signed-off-by: Cyril Brulebois <kibi@debian.org>
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
Tested-by: Aaron Plattner <aplattner@nvidia.com>
RANDR_12_INTERFACE is defined in xserver/randr/randstr.h since version 1.2.
This driver only configures against xserver 1.3 or higher.
Reported-by: Aaron Plattner <aplattner@nvidia.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
This was used at one point in time to backport the modes code from server
1.3 to server 1.2. When the tarball was created, whatever modes code
was on the developer disk was included.
The server 1.2 as shipped in the tarball on the web does not contain the
modes code. It was added just after and found in git branch server-1.2-branch.
The modes code was initially included in version 2.0.95 and still compiles
with server 1.2. As of version 2.1.9 it no longer compiles.
Subsequent versions are not backward compatible and probably not meant to be.
The XRandR wiki points to articles saying that XRandR 1.2 first appeared in
server 1.3 and nv 2.0.95. Given that modes code in current server version
does not compile with server 1.2, and that the modes code is included in
version 1.3 and up, might as well stop including this modes code in the driver.
This patch makes the driver requiring server 1.3 or later.
This will solve the issue where "make dist" fails "out of the box"
and requires manual fix-up on the build machine which is documented
in the compat/README file.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
