Skip to contentSkip to conversation

Make XAA support optional

PATCH In review Daniel Stone 6 participants 11 messages Jan 18, 2012 – Jan 20, 2012

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Make XAA support optional

Does what it says on the box.

---
 configure.ac                  |   14 ++++++++++++++
 src/legacy/i810/Makefile.am   |    6 +++++-
 src/legacy/i810/i810.h        |    4 ++++
 src/legacy/i810/i810_dga.c    |    2 ++
 src/legacy/i810/i810_driver.c |   10 +++++++++-
 src/legacy/i810/i810_hwmc.c   |    2 ++
 src/legacy/i810/i810_video.c  |    2 ++
 7 files changed, 38 insertions(+), 2 deletions(-)
configure.ac +14 -0
index 63beb64..c3cbfd4 100644
@@ -268,6 +268,20 @@ if test "x$DEBUG" = xfull; then
         CFLAGS="$CFLAGS -O0 -ggdb3"
 fi
 
+save_CFLAGS=$CFLAGS
+CFLAGS="$XORG_CFLAGS"
+AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#include <xorg-server.h>
+#include "xaa.h"
+#include "xaalocal.h"
+]])],
+                  [have_xaa=yes],
+                  [have_xaa=no])
+CFLAGS=$save_CFLAGS
+if test "x$have_xaa" = xyes; then
+	AC_DEFINE(XAA,1,[Enable XAA acceleration for i810])
+fi
+AM_CONDITIONAL(XAA, test x$have_xaa = xyes)
+
 AC_CHECK_HEADERS([sys/timerfd.h])
 
 DRIVER_NAME=intel
src/legacy/i810/Makefile.am +5 -1
index a1bdd85..a88508c 100644
@@ -8,7 +8,6 @@ AM_CFLAGS = @CWARNFLAGS@ @XORG_CFLAGS@ @DRM_CFLAGS@ @DRI_CFLAGS@ @PCIACCESS_CFLA
 	    $(NULL)
 
 liblegacy_i810_la_SOURCES = \
-         i810_accel.c \
          i810_common.h \
          i810_cursor.c \
          i810_dga.c \
@@ -20,6 +19,11 @@ liblegacy_i810_la_SOURCES = \
          i810_video.c \
          i810_wmark.c
 
+if XAA
+liblegacy_i810_la_SOURCES += \
+         i810_accel.c
+endif
+
 if DRI
 liblegacy_i810_la_SOURCES +=\
          i810_dri.c \
src/legacy/i810/i810.h +4 -0
index 183c701..d10f304 100644
@@ -42,7 +42,9 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "compiler.h"
 #include "xf86Pci.h"
 #include "i810_reg.h"
+#ifdef XAA
 #include "xaa.h"
+#endif
 #include "xf86Cursor.h"
 #include "xf86xv.h"
 #include "vbe.h"
@@ -201,7 +203,9 @@ typedef struct _I810Rec {
    I810RegRec SavedReg;
    I810RegRec ModeReg;
 
+#ifdef XAA
    XAAInfoRecPtr AccelInfoRec;
+#endif
    xf86CursorInfoPtr CursorInfoRec;
    CloseScreenProcPtr CloseScreen;
    ScreenBlockHandlerProcPtr BlockHandler;
src/legacy/i810/i810_dga.c +2 -0
index 44181c6..4174309 100644
@@ -29,8 +29,10 @@
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86Pci.h"
+#ifdef XAA
 #include "xaa.h"
 #include "xaalocal.h"
+#endif
 #include "i810.h"
 #include "i810_reg.h"
 #include "dgaproc.h"
src/legacy/i810/i810_driver.c +9 -1
index d8f7c45..5026a26 100644
@@ -345,13 +345,15 @@ I810PreInit(ScrnInfoPtr pScrn, int flags)
    if (xf86ReturnOptValBool(pI810->Options, OPTION_NOACCEL, FALSE))
       pI810->noAccel = TRUE;
 
+#ifdef XAA
    if (!pI810->noAccel) {
       if (!xf86LoadSubModule(pScrn, "xaa")) {
 	 I810FreeRec(pScrn);
 	 return FALSE;
       }
    }
-   
+#endif
+
 #ifdef XF86DRI
    pI810->directRenderingDisabled =
      !xf86ReturnOptValBool(pI810->Options, OPTION_DRI, TRUE);
@@ -1701,6 +1703,7 @@ I810ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
       return FALSE;
    }
 
+#ifdef XAA
    if (!xf86ReturnOptValBool(pI810->Options, OPTION_NOACCEL, FALSE)) {
       if (pI810->LpRing->mem.Size != 0) {
 	 I810SetRingRegs(pScrn);
@@ -1712,6 +1715,7 @@ I810ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
 	     I810EmitFlush(pScrn);
       }
    }
+#endif
 
    miInitializeBackingStore(pScreen);
    xf86SetBackingStore(pScreen);
@@ -1962,7 +1966,9 @@ I810CloseScreen(int scrnIndex, ScreenPtr pScreen)
    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
    vgaHWPtr hwp = VGAHWPTR(pScrn);
    I810Ptr pI810 = I810PTR(pScrn);
+#ifdef XAA
    XAAInfoRecPtr infoPtr = pI810->AccelInfoRec;
+#endif
 
    if (pScrn->vtSema == TRUE) {
       if (pI810->AccelInfoRec != NULL) {
@@ -1994,12 +2000,14 @@ I810CloseScreen(int scrnIndex, ScreenPtr pScreen)
       pI810->ScanlineColorExpandBuffers = NULL;
    }
 
+#ifdef XAA
    if (infoPtr) {
       if (infoPtr->ScanlineColorExpandBuffers)
 	 free(infoPtr->ScanlineColorExpandBuffers);
       XAADestroyInfoRec(infoPtr);
       pI810->AccelInfoRec = NULL;
    }
+#endif
 
    if (pI810->CursorInfoRec) {
       xf86DestroyCursorInfoRec(pI810->CursorInfoRec);
src/legacy/i810/i810_hwmc.c +2 -0
index ba50e1e..43feb55 100644
@@ -53,8 +53,10 @@ THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "xf86xvmc.h"
 #include <X11/extensions/Xv.h>
 #include <X11/extensions/XvMC.h>
+#ifdef XAA
 #include "xaa.h"
 #include "xaalocal.h"
+#endif
 #include "dixstruct.h"
 #include "fourcc.h"
 
src/legacy/i810/i810_video.c +2 -0
index a0e6acd..82b6956 100644
@@ -49,8 +49,10 @@ THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "i810.h"
 #include "xf86xv.h"
 #include <X11/extensions/Xv.h>
+#ifdef XAA
 #include "xaa.h"
 #include "xaalocal.h"
+#endif
 #include "dixstruct.h"
 #include "fourcc.h"
 
Signature · 1 line
1.7.8.3
#1 lore raw
Quoted 1 line · Daniel Stone

Does what it says on the box.

Danvet can you please test this on your elderly i810 box and make sure we don't accidentally open the can of worms. Any sign of regressions? -Chris

Signature · 1 line
Chris Wilson, Intel Open Source Technology Centre
#2 lore raw
Quoted 5 lines · Chris Wilson
Quoted 1 line · Daniel Stone

Does what it says on the box.

Danvet can you please test this on your elderly i810 box and make sure we don't accidentally open the can of worms. Any sign of regressions?

Why don't we just rip it out entirely? If a bored soul ever ports this driver to kms we likely just need to reimplement proper accel with sna, so I don't think there's much value.

And as the likely only i81x user left, I don't care about XAA performance ;-)

Cheers, Daniel

Signature · 3 lines
Daniel Vetter
Mail: [email protected]
Mobile: +41 (0)79 365 57 48
#3 lore raw
Quoted 10 lines · Daniel Vetter
Quoted 5 lines · Chris Wilson
Quoted 1 line · Daniel Stone

Does what it says on the box.

Danvet can you please test this on your elderly i810 box and make sure we don't accidentally open the can of worms. Any sign of regressions?

Why don't we just rip it out entirely? If a bored soul ever ports this driver to kms we likely just need to reimplement proper accel with sna, so I don't think there's much value.

If we did rip it out, what happens? The X server uses the vesa driver, which is equivalent to i810 for modesetting, no 3d support, no overlays, and no accelerated blits (which is dying anyway). Am I right in thinking that after removal of XAA, the legacy i810 offers no more functionality or performance than is available through VESA?
-Chris

Signature · 1 line
Chris Wilson, Intel Open Source Technology Centre
#4 lore raw
Quoted 12 lines · Chris Wilson
Quoted 10 lines · Daniel Vetter
Quoted 5 lines · Chris Wilson
Quoted 1 line · Daniel Stone

Does what it says on the box.

Danvet can you please test this on your elderly i810 box and make sure we don't accidentally open the can of worms. Any sign of regressions?

Why don't we just rip it out entirely? If a bored soul ever ports this driver to kms we likely just need to reimplement proper accel with sna, so I don't think there's much value.

Quoted 5 lines

If we did rip it out, what happens? The X server uses the vesa driver, which is equivalent to i810 for modesetting, no 3d support, no overlays, and no accelerated blits (which is dying anyway). Am I right in thinking that after removal of XAA, the legacy i810 offers no more functionality or performance than is available through VESA?

Afaict we're still have left
- dri1 for glxgears
- Xv for video, even XvMC might still work
- modesettting, the driver only uses vesa to grab the edid, but does all the modesetting with direct vga register banging. Yep, I'm running my i815 on a 1920x1080 screen, pretty sure that mode isn't in the vesa bios.

So I think it's too early to shelve it ;-)
-Daniel

Signature · 3 lines
Daniel Vetter
Mail: [email protected]
Mobile: +41 (0)79 365 57 48
#5 lore raw
Quoted 17 lines · Daniel Vetter
Quoted 1 line · Chris Wilson

On Wed, 18 Jan 2012 13:04:43 +0100, Daniel Vetter <[email protected]>

Quoted 2 lines · wrote:
Quoted 2 lines · Chris Wilson
Quoted 1 line

On Wed, 18 Jan 2012 14:45:51 +1100, Daniel Stone <

Quoted 3 lines · [email protected]> wrote:
Quoted 3 lines
Quoted 3 lines
Quoted 1 line

Does what it says on the box.

Danvet can you please test this on your elderly i810 box and make

sure

Quoted 4 lines
Quoted 4 lines
Quoted 1 line

we don't accidentally open the can of worms. Any sign of regressions?

Why don't we just rip it out entirely? If a bored soul ever ports this driver to kms we likely just need to reimplement proper accel with

sna, so

Quoted 2 lines
Quoted 1 line

I don't think there's much value.

Quoted 9 lines
Quoted 5 lines

If we did rip it out, what happens? The X server uses the vesa driver, which is equivalent to i810 for modesetting, no 3d support, no overlays, and no accelerated blits (which is dying anyway). Am I right in thinking that after removal of XAA, the legacy i810 offers no more functionality or performance than is available through VESA?

Afaict we're still have left
- dri1 for glxgears

Wasn't DRI1 ripped from mesa as well?

Signature · 2 lines
Eugeni Dodonov
<http://eugeni.dodonov.net/>

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

#6 lore raw
Quoted 1 line · Eugeni Dodonov

Wasn't DRI1 ripped from mesa as well?

Yes it was, though theoretically you can still build DRI1 drivers from 7.11 and load them with 8.0.

#7 lore raw
In reply to Daniel Vetter
Quoted 19 lines · Daniel Vetter
Quoted 12 lines · Chris Wilson
Quoted 10 lines · Daniel Vetter
Quoted 5 lines · Chris Wilson
Quoted 1 line · Daniel Stone

Does what it says on the box.

Danvet can you please test this on your elderly i810 box and make sure we don't accidentally open the can of worms. Any sign of regressions?

Why don't we just rip it out entirely? If a bored soul ever ports this driver to kms we likely just need to reimplement proper accel with sna, so I don't think there's much value.

Quoted 5 lines

If we did rip it out, what happens? The X server uses the vesa driver, which is equivalent to i810 for modesetting, no 3d support, no overlays, and no accelerated blits (which is dying anyway). Am I right in thinking that after removal of XAA, the legacy i810 offers no more functionality or performance than is available through VESA?

Quoted 7 lines

Afaict we're still have left
- dri1 for glxgears
- Xv for video, even XvMC might still work
- modesettting, the driver only uses vesa to grab the edid, but does all the modesetting with direct vga register banging. Yep, I'm running my i815 on a 1920x1080 screen, pretty sure that mode isn't in the vesa bios.

Being responsible for thousands of boxes with i855 chips, deployed across the world, I'm nervous about these discussions. We typically run at resolutions of 1360x768 and use XVideo for IPTV playback. Admittedly these devices will be EOL at some point, but the longer I can keep them updated software wise the happier I'll be.

On my todo list is to test the latest and greatest releases with sna enabled on those devices.

Signature · 2 lines
Glen Gray
<[email protected]>
#8 lore raw
Quoted 30 lines · Glen Gray
Quoted 19 lines · Daniel Vetter
Quoted 12 lines · Chris Wilson
Quoted 10 lines · Daniel Vetter
Quoted 5 lines · Chris Wilson
Quoted 1 line · Daniel Stone

Does what it says on the box.

Danvet can you please test this on your elderly i810 box and make sure we don't accidentally open the can of worms. Any sign of regressions?

Why don't we just rip it out entirely? If a bored soul ever ports this driver to kms we likely just need to reimplement proper accel with sna, so I don't think there's much value.

Quoted 5 lines

If we did rip it out, what happens? The X server uses the vesa driver, which is equivalent to i810 for modesetting, no 3d support, no overlays, and no accelerated blits (which is dying anyway). Am I right in thinking that after removal of XAA, the legacy i810 offers no more functionality or performance than is available through VESA?

Quoted 7 lines

Afaict we're still have left
- dri1 for glxgears
- Xv for video, even XvMC might still work
- modesettting, the driver only uses vesa to grab the edid, but does all the modesetting with direct vga register banging. Yep, I'm running my i815 on a 1920x1080 screen, pretty sure that mode isn't in the vesa bios.

Quoted 8 lines

Being responsible for thousands of boxes with i855 chips, deployed across the world, I'm nervous about these discussions. We typically run at resolutions of 1360x768 and use XVideo for IPTV playback. Admittedly these devices will be EOL at some point, but the longer I can keep them updated software wise the happier I'll be.

On my todo list is to test the latest and greatest releases with sna enabled on those devices. --

These discussions are about the i81x, _not_ any later gen2 device. Afaics I'm about the only serious user of that stuff left, at least concering the use of the latest and greatest upstream code ...

Cheers, Daniel

Signature · 3 lines
Daniel Vetter
Mail: [email protected]
Mobile: +41 (0)79 365 57 48
#9 lore raw
Quoted 3 lines · Daniel Vetter

These discussions are about the i81x, _not_ any later gen2 device. Afaics I'm about the only serious user of that stuff left

If we consider Phoronix feedback and comments [1], the i81x ones are still by far more popular than all the other cards combined :) :).

But on this topic, my guess is that even if we rip off XAA we'll still have XVideo and mode setting working. But still, I think it would make sense to have XAA optional for some time before dropping it completely.

[1] http://www.phoronix.com/scan.php?page=news_item&px=MTA0MjI

Signature · 2 lines
Eugeni Dodonov
 <http://eugeni.dodonov.net/>

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

#10 lore raw
In reply to Daniel Vetter
Quoted 37 lines · Daniel Vetter
Quoted 36 lines · Glen Gray
Quoted 19 lines · Daniel Vetter
Quoted 12 lines · Chris Wilson
Quoted 10 lines · Daniel Vetter
Quoted 5 lines · Chris Wilson
Quoted 1 line · Daniel Stone

Does what it says on the box.

Danvet can you please test this on your elderly i810 box and make sure we don't accidentally open the can of worms. Any sign of regressions?

Why don't we just rip it out entirely? If a bored soul ever ports this driver to kms we likely just need to reimplement proper accel with sna, so I don't think there's much value.

Quoted 5 lines

If we did rip it out, what happens? The X server uses the vesa driver, which is equivalent to i810 for modesetting, no 3d support, no overlays, and no accelerated blits (which is dying anyway). Am I right in thinking that after removal of XAA, the legacy i810 offers no more functionality or performance than is available through VESA?

Quoted 7 lines

Afaict we're still have left
- dri1 for glxgears
- Xv for video, even XvMC might still work
- modesettting, the driver only uses vesa to grab the edid, but does all the modesetting with direct vga register banging. Yep, I'm running my i815 on a 1920x1080 screen, pretty sure that mode isn't in the vesa bios.

Being responsible for thousands of boxes with i855 chips, deployed across the world, I'm nervous about these discussions. We typically run at resolutions of 1360x768 and use XVideo for IPTV playback. Admittedly these devices will be EOL at some point, but the longer I can keep them updated software wise the happier I'll be.

Quoted 6 lines
Quoted 2 lines

On my todo list is to test the latest and greatest releases with sna enabled on those devices. --

These discussions are about the i81x, _not_ any later gen2 device. Afaics I'm about the only serious user of that stuff left, at least concering the use of the latest and greatest upstream code ...

Understood, I just parsed it to read i8xx.

Signature · 2 lines
Glen Gray
<[email protected]>