summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-07-19Adapt Block/WakeupHandler signature for ABI 23Adam Jackson
Signed-off-by: Adam Jackson <ajax@redhat.com>
2015-09-17Use correct type in function call.Thomas Klausner
Fixes passing argument 2 of 'pci_device_cfg_read_u32' from incompatible pointer type pciaccess.h:153:5: note: expected '__uint32_t *' but argument is of type 'CARD32 *' Signed-off-by: Thomas Klausner <wiz@NetBSD.org> Reviewed-by: Connor Behan <connor.behan@gmail.com>
2015-08-24Composite fixupConnor Behan
A driver like this that tries to composite a lot will definitely need to avoid crashing for solid pictures. Signed-off-by: Connor Behan <connor.behan@gmail.com>
2015-08-24Remove DownloadFromScreenConnor Behan
This hook was broken and did the same thing as a software fallback. Signed-off-by: Connor Behan <connor.behan@gmail.com>
2015-07-01Enable write-combining on the framebuffer BARAdam Jackson
Signed-off-by: Adam Jackson <ajax@redhat.com>
2015-07-01MGA DDX: make it possible to find EXA supportMatthew Rezny
Newer versions of the xserver stricter requirements on header order which caused the configure tests for EXA support to erroneously fail. Since XAA was already removed from an earlier version of xserver, the configure failure meant no acceleration was possible. Patch configure tests similar to r128. Reviewed-by: Adam Jackson <ajax@redhat.com>
2015-02-19xf86-video-mga 1.6.4xf86-video-mga-1.6.4Matt Turner
2014-07-29undef DISABLE_VGA_IOAdam Jackson
Dead conditional ever since m12n, must not be needed. Signed-off-by: Adam Jackson <ajax@redhat.com>
2014-07-29dri: Stop (uselessly) initializing the ValidateTree hooksAdam Jackson
Signed-off-by: Adam Jackson <ajax@redhat.com>
2014-05-22man: Don't mention the HALAdam Jackson
I mentioned it once, but I think I got away with it all right. Signed-off-by: Adam Jackson <ajax@redhat.com>
2014-03-14fix a type in previous lockup in the mga driver fixMikulas Patocka
Oh, I had a typo in that patch - so please commit this to fix it. Signed-off-by: Dave Airlie <airlied@redhat.com>
2014-03-14xf86-video-mga: fix a lockup in the mga driverMikulas Patocka
I've had a Xserver lockup in the mga driver, examining it with gdb showed this obviously broken loop: count = INREG(MGAREG_VCOUNT) + 2; while(INREG(MGAREG_VCOUNT) < count); It reads the line counter and waits until the counter advances by two. The cause of the lockup is this - if the kernel reschedules the Xorg process and lets it run in such a moment when INREG(MGAREG_VCOUNT) returns the maximum (or maximum minus 1) line count, the loop never exits. Signed-off-by: Dave Airlie <airlied@redhat.com>
2014-03-14xf86-video-mga: set the pan_ctl registerMikulas Patocka
On my Matrox G550 most videomodes in Xorg didn't work. I found out that it works if Xorg pixel clock is similar to the pixel clock set on framebuffer console. Further analysis showed that the Linux framebuffer driver sets the pan_ctl register (the register 0xa2) according to the pixel clock, the Xorg driver doesn't set it. I copied the code to set the pan_ctl register from the Linux kernel to the Xorg driver, and most videomodes in Xorg work. The pan_ctl register is required for both analog and digital output. The pan_ctl register is saved and restored, this is required so that we restore text-mode screen or Linux framebuffer correctly. Signed-off-by: Dave Airlie <airlied@redhat.com>
2013-12-05mga: bump release to 1.6.3xf86-video-mga-1.6.3Dave Airlie
2013-12-05mga: fix XAA runtimeDave Airlie
XAA->USE_XAA add USE_XAA. Tested-by: Avengence on #xorg-devel Signed-off-by: Dave Airlie <airlied@redhat.com>
2013-11-19Remove mga_esc.c vestigal stubAlan Coopersmith
Previously contained MGA HAL code, was left an empty shell by the removal of USEMGAHAL in commit 94bbeb132c7eda. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2013-10-31mga: Use exaGetPixmapFirstPixel() instead of devPrivate.ptrTormod Volden
Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
2013-10-25Disable HW cursor by default on G200 server chipsEgbert Eich
Disable HW cursor by default on G200 server chips as these chips a re often used with a remote graphics link which cannot display the HW cursor. This can be overridden by a config option. Most desktops today use ARGB cursors anyhow which are not supported by this driver anyhow. Thus the performance penalty should be irrelevant. Signed-off-by: Egbert Eich <eich@freedesktop.org>
2013-10-25Restructure code to make it more readableEgbert Eich
With the previous structure it wasn't immediately clear when SecondCrtc and HWCursor were set to which value. Make the code more readable. Signed-off-by: Egbert Eich <eich@freedesktop.org>
2013-10-25Fix dual head crash without XAATormod Volden
https://launchpad.net/bugs/1180986 Signed-off-by: Tormod Volden <debian.tormod@gmail.com> Reviewed-by: Robert Jacobs <robert.n.jacobs@gmail.com> Tested-by: Robert Jacobs <robert.n.jacobs@gmail.com>
2013-10-25Unbreak dual head (xinerama)Andy MacLean
This patch has been used in Debian, Ubuntu and Gentoo for years. https://bugs.freedesktop.org/show_bug.cgi?id=18472 https://launchpad.net/bugs/292214 https://bugs.gentoo.org/show_bug.cgi?id=265100 Signed-off-by: Andy MacLean <andy-ub1@themacleans.org.uk> Reviewed-by: Cyril Brulebois <kibi@debian.org> Reviewed-by: Robert Jacobs <robert.n.jacobs@gmail.com> Tested-by: Robert Jacobs <robert.n.jacobs@gmail.com>
2013-07-31Disable Linear Expansion on BEEgbert Eich
Linear Expansion doesn't work on BE as the bit order in a word is reversed. ScreenToScreenColorExpansion allows to adjust the bit order in a byte, still the bytes have the wrong order. Reviewed-by: <wharms@bfs.de> Signed-off-by: Egbert Eich <eich@freedesktop.org>
2013-01-12Restrict kernel driver matching to g200 server chipsJulien Cristau
Otherwise we might catch devices handled by matroxfb, not the mgag200 kms driver. Debian bug#697532 Reported-by: olafBuddenhagen@gmx.net Reviewed-by: Dave Airlie <airlied@redhat.com> Signed-off-by: Julien Cristau <jcristau@debian.org>
2012-09-28mga: bump release to 1.6.2xf86-video-mga-1.6.2Dave Airlie
2012-09-28mga: bring dri1 back to life.Dave Airlie
we need to at least setup the memory manager bits so dri1 clients get a backbuffer. this at least gets gears working again without XAA. Signed-off-by: Dave Airlie <airlied@redhat.com>
2012-09-26mga: add stub storm functions if not using XAADave Airlie
If we aren't using XAA just add stub storm init/sync functions. This lets the driver load yay. Signed-off-by: Dave Airlie <airlied@redhat.com>
2012-09-25Remove mibstore.hAdam Jackson
Signed-off-by: Adam Jackson <ajax@redhat.com>
2012-07-17xf86-video-mga: bump to version 1.6.1xf86-video-mga-1.6.1Dave Airlie
Signed-off-by: Dave Airlie <airlied@redhat.com>
2012-07-15mga: fix after XAA removalDave Airlie
Fix mga build after XAA removal. Signed-off-by: Dave Airlie <airlied@redhat.com>
2012-07-02mga: bump to 1.6.0xf86-video-mga-1.6.0Dave Airlie
Signed-off-by: Dave Airlie <airlied@redhat.com>
2012-06-06mga: port to new compat API.Dave Airlie
Signed-off-by: Dave Airlie <airlied@redhat.com>
2012-05-25Add const qualifier to char *from in MGAdoDDCAlan Coopersmith
Only used to store arguments to pass as printf %s strings to xf86DrvMsg Fixes gcc warnings: mga_driver.c: In function 'MGAdoDDC': mga_driver.c:1338:7: warning: assignment discards qualifiers from pointer target type mga_driver.c:1343:11: warning: assignment discards qualifiers from pointer target type mga_driver.c:1351:8: warning: assignment discards qualifiers from pointer target type mga_driver.c:1359:8: warning: assignment discards qualifiers from pointer target type Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Dave Airlie <airlied@redhat.com>
2012-05-25Move PCI vendor/device id defines into mga.h instead of using xf86PciInfo.hAlan Coopersmith
Silences deprecation warnings from xf86PciInfo.h in current Xorg servers Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Dave Airlie <airlied@redhat.com>
2012-05-17mga: don't bind to device if there is a kernel driverDave Airlie
this should only pick up KMS drivers and not old drm drivers. Signed-off-by: Dave Airlie <airlied@redhat.com>
2012-03-23xf86-video-mga 1.5.0xf86-video-mga-1.5.0Alan Coopersmith
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2012-01-04Untangle XF86DRI from the driver-specific DRI definePeter Hutterer
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>
2012-01-03When we can't load the xaa or exa modules, use shadowfb insteadJulien Cristau
Signed-off-by: Julien Cristau <jcristau@debian.org>
2011-12-29Check MGAAllocAdaptor() for memory allocation failureAlan Coopersmith
If it couldn't allocate memory, don't attempt to write a bunch of values to the NULL pointer before returning it, but just pass the NULL along right away. Resolves parfait warnings of the form: Error: Null pointer dereference (CWE 476) Write to null pointer 'adapt' at line 322 of src/mga_video.c in function 'MGASetupImageVideoTexture'. Function 'MGAAllocAdaptor' may return constant 'NULL' at line 237, called at line 320. Null pointer introduced at line 237 in function 'MGAAllocAdaptor'. repeated for every line writing to the adapt pointer in each function. [ This bug was found by the Parfait 0.4.2 bug checking tool. For more information see http://labs.oracle.com/projects/parfait/ ] Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
2011-12-07Add support for Video Memory greater then 8MChristian Toutant
Expand memory mapping of framebuffer from 8 to 16MB Fix segfault on redhat distibution Signed-off-by: Christian Toutant <ctoutant@matrox.com>
2011-10-29Include "xf86Modes.h" for xf86ModeBandwidthJeremy Huddleston
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-10-29Include <unistd.h> for usleepJeremy Huddleston
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-09-27Remove calls to xf86IsPc98()Matt Turner
Reviewed-by: Jamey Sharp <jamey@minilop.net> Signed-off-by: Matt Turner <mattst88@gmail.com>
2011-09-27Fix printf format specifier warningMatt Turner
Signed-off-by: Matt Turner <mattst88@gmail.com>
2011-09-27Remove if(E != NULL) checks around free(E)Matt Turner
Reviewed-by: Jamey Sharp <jamey@minilop.net> Signed-off-by: Matt Turner <mattst88@gmail.com>
2011-09-27Remove xalloc/xcalloc/xrealloc/xfreeMatt Turner
Reviewed-by: Jamey Sharp <jamey@minilop.net> Signed-off-by: Matt Turner <mattst88@gmail.com>
2011-09-20Delete support for MGA's proprietary HAL: unifdef USEMGAHAL.Jamey Sharp
This patch produced with: for f in `git grep -Fwl USEMGAHAL`; do unifdef -B -UUSEMGAHAL $f | sponge $f done Adam Jackson wrote: Hey, so, remember back in the dark ages when dualhead was this insanely wild differentiating feature? Matrox thought it was so special, in fact, that they hid most of the implementation of it (and a bunch of other stuff) in a binary-only blob called the HALlib. As you'd expect it was pretty much a cut-and-paste of the relevant Windows code, and then some open glue to keep it working; clientlx.c is that glue. I guess the theory was that if you don't tell people which registers to duplicate to implement a second pipe in their own hardware, they won't figure it out? A pretty eyeroll-worthy idea even at the time, and definitely not something we should be condoning anymore. Kill it with fire, but while you're at it, untangle the hideous mess of MGA_HAL() macros too. Signed-off-by: Jamey Sharp <jamey@minilop.net> Cc: Adam Jackson <ajax@redhat.com>
2011-09-20Nothing uses clientlx.c, so delete it.Jamey Sharp
Adam Jackson wrote: Hey, so, remember back in the dark ages when dualhead was this insanely wild differentiating feature? Matrox thought it was so special, in fact, that they hid most of the implementation of it (and a bunch of other stuff) in a binary-only blob called the HALlib. As you'd expect it was pretty much a cut-and-paste of the relevant Windows code, and then some open glue to keep it working; clientlx.c is that glue. I guess the theory was that if you don't tell people which registers to duplicate to implement a second pipe in their own hardware, they won't figure it out? A pretty eyeroll-worthy idea even at the time, and definitely not something we should be condoning anymore. Kill it with fire ... Signed-off-by: Jamey Sharp <jamey@minilop.net> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> Reviewed-by: Adam Jackson <ajax@redhat.com>
2011-09-20Reset tagfifo for renesas.Christian Toutant
For renesas, we need to reset tagfifo after a mode switch. Signed-off-by: Christian Toutant <ctoutant@matrox.com>
2011-08-03Added support for G200SE Pilot3Christian Toutant
Optimize use of bandwidth and increase maximum resolution to 1920x1200 Signed-off-by: Christian Toutant <ctoutant@matrox.com>
2011-06-22Don't include xf86Priv.hAdam Jackson
Signed-off-by: Adam Jackson <ajax@redhat.com>