summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2012-05-20fixup: small cleanup in SavageSetVESAMode()output-hansjTormod Volden1-14/+10
Since I have reworked the PAL/NTSC configuration handling the comments about this is not necessary. (these patches will likely be rebased on top of that rework) Otherwise just clean out double comments and fix whitespace.
2012-05-20fixup: simplify code in SavageSetTextMode()Tormod Volden1-13/+7
Unless the code is incomplete (need ACTIVE_DEVICES mask here also?) the following if (A != B) A=B; can be replaced by A=B. + if (iDevInfo != psav->iDevInfo) { + psav->iDevInfo = iDevInfo; + } Otherwise just fix up comments and line widths.
2012-05-20fixup: duoview 5: rename bEnableActivate to allowEnablingTormod Volden1-4/+4
comment: Now that this function is so simple, and is only used once, should we rather inline what is needed in the caller? Or is there a possible future use for it?
2012-05-20fixup: duoview 4: simplify action logic, easier to readTormod Volden1-7/+2
2012-05-20fixup: duoview 3: rename bDoEnable to setDuoView, in line with the explanationTormod Volden1-4/+4
2012-05-20fixup: duoview 2: remove extra variable, no risk of side effects anywayTormod Volden1-5/+3
2012-05-20fixup: duoview 1: write decision logic simpler, easier to readTormod Volden1-6/+3
2012-05-20fixup: move SavageUpdateDevices to savage_vbe.ctormod-syncTormod Volden3-16/+15
2012-05-20fixup: simplify SavageUpdateDevicesTormod Volden1-13/+4
For setting psav->CrtOnly: Should we really ignore the CRT_ACTIVE bit here, or can we simply check iDeviceList == CRT_ACTIVE instead? And mask it with ACTIVE_DEVICES if DUO_ON should be ignored?
2012-05-20fixup: savage_vbe.c: Keep line width to 80 as rest of codeTormod Volden1-8/+13
2012-05-20Make SavageGetDevice() return mask less magicTormod Volden1-2/+1
2012-05-20fixup: Fix copy-pasted comment on mask changeTormod Volden1-1/+1
2012-05-20fixup: move (commented out) instruction from declarationsTormod Volden1-1/+1
2012-05-20Improve output and TV format handling and make it compatible to s3switchHans-Juergen Mauser4-31/+200
This patch contains several modifications to the handling of the list of output devices and the control flags for the TV output format, which are detailed in the following sections. - new flags are defined to make reading and setting devices easier, avoiding masking too much or too little - at the moment of switching between text mode and graphics mode, the output device settings are saved and updated accordingly which, for example, means that a display corrupted in graphics mode can be restored by switching back to text mode as we can assume that boot-up in text mode works correctly. - BUGFIX: previously a variable was counted up endlessly by one at each mode switch. A boolean makes life easier and is what we want here by the necessary logic. - BUGFIX: previously the BIOS (hardware) settings for the TV output mode were not recognised or used correctly which meant by setting "TvOn" you had automatically set NTSC by force. To avoid this and allow the BIOS setting to take effect, the configuration option "PAL" is ignored as it even was not documented properly. Maybe this also reduces the need for s3switch in many cases as most laptops allow the format to be set up in the BIOS configuration correctly, but the savage driver not only ignored, but overrode it and even fought against s3switch here. If we need to override the TV format from the config, we would have to define a new flag like "TvFormatOverride" or whatever you like. - in general a more intelligent handling of VGA register writes related to the output device set - these were quite unconditional before. - the output device configuration is read in before video rendering is started to allow applying the correct image scaling for the selected device and resolution - previously there could be wrong assumptions depending on the previous sequence of device settings before starting the video rendering. Signed-off-by: Hans-Juergen Mauser <hjmauser@gmx.net>
2012-03-24Refactor BIOS modes retrieval to call VBEGetVBEInfo only onceTormod Volden2-11/+15
Otherwise, calling it twice would trigger a VBE bug when using xserver 1.12. Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
2012-03-23xf86-video-savage 2.3.4xf86-video-savage-2.3.4Alan Coopersmith1-1/+1
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2012-03-23Add savage_pciids.h to src/Makefile.am to fix distcheckAlan Coopersmith1-0/+1
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2012-01-17Untangle XF86DRI from the driver-specific DRI definePeter Hutterer7-36/+40
XF86DRI is defined by xorg-server.h, so --disable-dri in the driver itself does exactly nothing other than not fill in the CFLAGS and thus stop the driver from compiling. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
2012-01-03Merge almost identical code in SAVAGEInitVisualConfigsAndrew Turner1-115/+51
https://bugs.freedesktop.org/show_bug.cgi?id=9961 Signed-off-by: Andrew Turner <andrew@fubar.geek.nz> [Tormod: Rename table to SAVAGEVisuals] Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
2012-01-03Avoid leading underscores in #include guardsTormod Volden9-35/+33
In a user header file, the macro name should not begin with `_' http://gcc.gnu.org/onlinedocs/cpp/Once_002dOnly-Headers.html Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
2012-01-03Do not use the deprecated xf86PciInfo.h from xserverTormod Volden6-8/+56
Instead maintain our own list of supported PCI IDs. Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
2011-12-19Fix for new vgahw ABIAdam Jackson1-0/+1
Signed-off-by: Adam Jackson <ajax@redhat.com>
2011-12-19Fall back to shadowfb if XAA is unavailableAdam Jackson1-4/+4
Signed-off-by: Adam Jackson <ajax@redhat.com>
2011-12-19Don't include xf86Priv.hAdam Jackson1-1/+0
Signed-off-by: Adam Jackson <ajax@redhat.com>
2011-10-08Bump version to 2.3.3xf86-video-savage-2.3.3Tormod Volden1-1/+1
2011-09-23savage: Warn if broken drm maps are detectedTormod Volden1-0/+5
Linux kernel 2.6.30 - 2.6.39 had broken drm maps which would result in assorted problems. Leave a message in the log if it looks like the framebuffer map and the aperture map are mixed up. https://bugs.freedesktop.org/show_bug.cgi?id=32511 Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
2011-09-23savage: Avoid unnecessary float calculation in video displayTormod Volden1-12/+11
There is no reason to do the division using floats as long as the result is an integer and there is no risk of intermediate overflow. This is in the code for "Old" chipsets. Integer division was already used in the parallel code for "New" chipsets. Also fixed up the whitespace in both blocks. Signed-off-by: Tormod Volden <debian.tormod@gmail.com> Reviewed-by: Matt Turner <mattst88@gmail.com>
2011-09-23savage: Fix Xv scaling on non-native resolutionsHans-Juergen Mauser1-0/+8
If I set the resolution to 800x600 for example (to be able to use the TV output in full screen mode), I only can see 800/1024 = 0,78 of the real video width, no matter if the video is displayed in a small player window or enlarged to full screen. On the right of the video display, the remaining width is filled with a black (or sometimes blue) bar. The problem was mainly that only the drawing starting point was modified by the scaling factor, but not the size-defining end of the drawing rectangle. https://bugs.launchpad.net/bugs/670790 Signed-off-by: Hans-Juergen Mauser <hjmauser@gmx.net> Reviewed-by: Tormod Volden <debian.tormod@gmail.com> Acked-by: Matt Turner <mattst88@gmail.com>
2011-04-21savage: Fix &/&& typo in "magical" register setupTormod Volden1-2/+2
Found with CFLAGS=-Wlogical-op Signed-off-by: Tormod Volden <debian.tormod@gmail.com> Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
2011-04-21savage: Make SAVAGESelectBuffer() private (static)Tormod Volden2-15/+1
Also clean out some unused prototypes from savage_driver.h Signed-off-by: Tormod Volden <debian.tormod@gmail.com> Reviewed-by: Matt Turner <mattst88@gmail.com> Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
2011-04-21savage: Factor out a SAVAGESetAgpMode and call it on resumeTormod Volden1-24/+33
This should fix resume with AGP. After all these years... https://bugzilla.kernel.org/show_bug.cgi?id=4607 Signed-off-by: Tormod Volden <debian.tormod@gmail.com> Reviewed-by: Matt Turner <mattst88@gmail.com> Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
2011-04-21savage: New SAVAGEDRIResume functionTormod Volden3-9/+16
Move DRI stuff from savage_driver.c to savage_dri.c Signed-off-by: Tormod Volden <debian.tormod@gmail.com> Reviewed-by: Matt Turner <mattst88@gmail.com> Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
2011-04-21savage: Fix logic in waitHSyncTormod Volden1-2/+2
Bit-masking the result of a boolean negation seems pointless, so I guess this is what was intended: Only look at bit 0 of the inStatus result. Signed-off-by: Tormod Volden <debian.tormod@gmail.com> Reviewed-by: Matt Turner <mattst88@gmail.com> Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
2011-03-31Fix wrong frequency unit in trace outputTormod Volden1-1/+1
The mode pixel clock frequency is in kHz, not Hz. Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
2011-02-21Use proper casts on framebuffer addressesTormod Volden2-2/+2
Correction to df8059025cafadaeea7672842d31134ed8c9c5df. Casting addresses to int is a 32bitism. If we want to use this intermediate cast to silence compiler warnings, we should use uintptr_t instead to not introduce potential bit truncation. Thanks to Mark Kettenis for spotting this. Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
2011-01-25savage: Fix initialization typo in SAVAGEDRIMoveBuffersTormod Volden1-1/+1
This was warned about when building with -O2, and seems to be a copy-and-paste glitch. savage_dri.c: In function ‘SAVAGEDRIMoveBuffers’: savage_dri.c:1445: warning: ‘pptNew2’ may be used uninitialized in this function
2011-01-25savage: Fix building with TRACEON definedTormod Volden1-3/+3
Two warnings and an error.
2011-01-25savage: Setup tiled surface registers in SavageEnterVTTormod Volden2-0/+2
These registers are cleared after suspend/resume, so set them up again in EnterVT.
2011-01-25savage: Factor out a SAVAGEDRISetupTiledSurfaceRegs functionTormod Volden1-42/+44
The tiled surface registers were only setup in SAVAGEDRIScreenInit, however, after suspend/resume these registers must be set up again. So factor it out in a new function so it can be reused.
2011-01-25savage: Cast all handles before printing themTormod Volden1-16/+17
Removes the last bunch of -Wall build warnings. savage_dri.c:490: warning: format ‘%08lx’ expects type ‘long unsigned int’, but argument 5 has type ‘drm_handle_t’ ...
2011-01-25savage: Fix ambiguity in SavageLoadPaletteSavage4Tormod Volden1-1/+1
It looks like "!" was meant for logic negation and the parentheses were wrong. I don't have a Savage 4 so I can't check if this fixes or breaks anything.
2011-01-25savage: Drop unused variables and functionsTormod Volden4-6/+5
Silence -Wall warnings. The functions are just #if'ed out, to be left for inspiration.
2011-01-25savage: More (intermediate) casts to silence warningsTormod Volden2-2/+2
savage_dga.c: In function ‘Savage_OpenFramebuffer’: savage_dga.c:393: warning: cast to pointer from integer of different size savage_dri.c: In function ‘SAVAGEDRIScreenInit’: savage_dri.c:924: warning: cast to pointer from integer of different size
2011-01-25savage: Replace deprecated x(c)alloc/xfree with m/calloc/freeTormod Volden6-72/+72
sed -i 's/xalloc/malloc/g; s/xcalloc/calloc/g; s/xfree/free/g' Also replace xrealloc with realloc.
2011-01-25savage: Add casts to silence build warningsTormod Volden2-3/+3
savage_exa.c: In function ‘SavageUploadToScreen’: savage_exa.c:545: warning: passing argument 1 of ‘memcpy’ discards qualifiers from pointer target type /usr/include/bits/string3.h:49: note: expected ‘void * restrict’ but argument is of type ‘volatile CARD32 *’ savage_video.c: In function ‘SavagePutImage’: savage_video.c:2007: warning: format ‘%ld’ expects type ‘long int’, but argument 4 has type ‘drmSize’ savage_video.c:2007: warning: format ‘%ld’ expects type ‘long int’, but argument 5 has type ‘int’
2010-12-05savage 2.3.2xf86-video-savage-2.3.2Dave Airlie1-1/+1
2010-11-25savage: fix use of privates without initialisationKeith Packard1-0/+1
Fixes bug 31614. Signed-off-by: Dave Airlie <airlied@redhat.com>
2010-10-06Purge cvs tags.Jesse Adkins1-1/+0
Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com> Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2010-07-22config: add comments for main statementsGaetan Nadon1-6/+7
2010-07-21config: replace deprecated use of AC_OUTPUT with AC_CONFIG_FILESGaetan Nadon1-4/+5
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>