[PATCH] Make XAA support optional

[PATCH] Make XAA support optional

[Daniel Stone]

Does what it says on the box.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
---
 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(-)

diff --git a/configure.ac b/configure.ac
index 63beb64..c3cbfd4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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
diff --git a/src/legacy/i810/Makefile.am b/src/legacy/i810/Makefile.am
index a1bdd85..a88508c 100644
--- a/src/legacy/i810/Makefile.am
+++ b/src/legacy/i810/Makefile.am
@@ -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 \
diff --git a/src/legacy/i810/i810.h b/src/legacy/i810/i810.h
index 183c701..d10f304 100644
--- a/src/legacy/i810/i810.h
+++ b/src/legacy/i810/i810.h
@@ -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;
diff --git a/src/legacy/i810/i810_dga.c b/src/legacy/i810/i810_dga.c
index 44181c6..4174309 100644
--- a/src/legacy/i810/i810_dga.c
+++ b/src/legacy/i810/i810_dga.c
@@ -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"
diff --git a/src/legacy/i810/i810_driver.c b/src/legacy/i810/i810_driver.c
index d8f7c45..5026a26 100644
--- a/src/legacy/i810/i810_driver.c
+++ b/src/legacy/i810/i810_driver.c
@@ -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);
diff --git a/src/legacy/i810/i810_hwmc.c b/src/legacy/i810/i810_hwmc.c
index ba50e1e..43feb55 100644
--- a/src/legacy/i810/i810_hwmc.c
+++ b/src/legacy/i810/i810_hwmc.c
@@ -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"
 
diff --git a/src/legacy/i810/i810_video.c b/src/legacy/i810/i810_video.c
index a0e6acd..82b6956 100644
--- a/src/legacy/i810/i810_video.c
+++ b/src/legacy/i810/i810_video.c
@@ -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"
 
-- 
1.7.8.3

Re: [PATCH] Make XAA support optional

[Chris Wilson]

On Wed, 18 Jan 2012 14:45:51 +1100, Daniel Stone <daniel@fooishbar.org> wrote:
> 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

-- 
Chris Wilson, Intel Open Source Technology Centre

Re: [PATCH] Make XAA support optional

[Daniel Vetter]

On Wed, Jan 18, 2012 at 10:37:24AM +0000, Chris Wilson wrote:
> On Wed, 18 Jan 2012 14:45:51 +1100, Daniel Stone <daniel@fooishbar.org> wrote:
> > 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
-- 
Daniel Vetter
Mail: daniel@ffwll.ch
Mobile: +41 (0)79 365 57 48

Re: [PATCH] Make XAA support optional

[Chris Wilson]

On Wed, 18 Jan 2012 13:04:43 +0100, Daniel Vetter <daniel@ffwll.ch> wrote:
> On Wed, Jan 18, 2012 at 10:37:24AM +0000, Chris Wilson wrote:
> > On Wed, 18 Jan 2012 14:45:51 +1100, Daniel Stone <daniel@fooishbar.org> wrote:
> > > 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

-- 
Chris Wilson, Intel Open Source Technology Centre

Re: [PATCH] Make XAA support optional

[Daniel Vetter]

On Wed, Jan 18, 2012 at 12:27:49PM +0000, Chris Wilson wrote:
> On Wed, 18 Jan 2012 13:04:43 +0100, Daniel Vetter <daniel@ffwll.ch> wrote:
> > On Wed, Jan 18, 2012 at 10:37:24AM +0000, Chris Wilson wrote:
> > > On Wed, 18 Jan 2012 14:45:51 +1100, Daniel Stone <daniel@fooishbar.org> wrote:
> > > > 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?

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
-- 
Daniel Vetter
Mail: daniel@ffwll.ch
Mobile: +41 (0)79 365 57 48

Re: [PATCH] Make XAA support optional

[Eugeni Dodonov]

[-- Attachment #1.1: Type: text/plain, Size: 1292 bytes --]

On Wed, Jan 18, 2012 at 10:41, Daniel Vetter <daniel@ffwll.ch> wrote:

> On Wed, Jan 18, 2012 at 12:27:49PM +0000, Chris Wilson wrote:
> > On Wed, 18 Jan 2012 13:04:43 +0100, Daniel Vetter <daniel@ffwll.ch>
> wrote:
> > > On Wed, Jan 18, 2012 at 10:37:24AM +0000, Chris Wilson wrote:
> > > > On Wed, 18 Jan 2012 14:45:51 +1100, Daniel Stone <
> daniel@fooishbar.org> wrote:
> > > > > 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?
>
> Afaict we're still have left
> - dri1 for glxgears
>

Wasn't DRI1 ripped from mesa as well?

-- 
Eugeni Dodonov
<http://eugeni.dodonov.net/>

[-- Attachment #1.2: Type: text/html, Size: 1857 bytes --]

[-- Attachment #2: Type: text/plain, Size: 159 bytes --]

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] Make XAA support optional

[Kenneth Graunke]

On 01/18/2012 06:36 AM, Eugeni Dodonov wrote:
> 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.

Re: [PATCH] Make XAA support optional

[Glen Gray]

On 18 Jan 2012, at 12:41, Daniel Vetter wrote:

> On Wed, Jan 18, 2012 at 12:27:49PM +0000, Chris Wilson wrote:
>> On Wed, 18 Jan 2012 13:04:43 +0100, Daniel Vetter <daniel@ffwll.ch> wrote:
>>> On Wed, Jan 18, 2012 at 10:37:24AM +0000, Chris Wilson wrote:
>>>> On Wed, 18 Jan 2012 14:45:51 +1100, Daniel Stone <daniel@fooishbar.org> wrote:
>>>>> 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?
> 
> 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. 
-- 
Glen Gray
<slaine@slaine.org>

Re: [PATCH] Make XAA support optional

[Daniel Vetter]

On Thu, Jan 19, 2012 at 05:22:56PM +0000, Glen Gray wrote:
> 
> On 18 Jan 2012, at 12:41, Daniel Vetter wrote:
> 
> > On Wed, Jan 18, 2012 at 12:27:49PM +0000, Chris Wilson wrote:
> >> On Wed, 18 Jan 2012 13:04:43 +0100, Daniel Vetter <daniel@ffwll.ch> wrote:
> >>> On Wed, Jan 18, 2012 at 10:37:24AM +0000, Chris Wilson wrote:
> >>>> On Wed, 18 Jan 2012 14:45:51 +1100, Daniel Stone <daniel@fooishbar.org> wrote:
> >>>>> 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?
> > 
> > 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.  -- 

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
-- 
Daniel Vetter
Mail: daniel@ffwll.ch
Mobile: +41 (0)79 365 57 48

Re: [PATCH] Make XAA support optional

[Eugeni Dodonov]

[-- Attachment #1.1: Type: text/plain, Size: 668 bytes --]

On Thu, Jan 19, 2012 at 15:25, Daniel Vetter <daniel@ffwll.ch> wrote:

> 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

-- 
Eugeni Dodonov
 <http://eugeni.dodonov.net/>

[-- Attachment #1.2: Type: text/html, Size: 1072 bytes --]

[-- Attachment #2: Type: text/plain, Size: 159 bytes --]

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] Make XAA support optional

[Glen Gray]

On 19 Jan 2012, at 17:25, Daniel Vetter wrote:

> On Thu, Jan 19, 2012 at 05:22:56PM +0000, Glen Gray wrote:
>> 
>> On 18 Jan 2012, at 12:41, Daniel Vetter wrote:
>> 
>>> On Wed, Jan 18, 2012 at 12:27:49PM +0000, Chris Wilson wrote:
>>>> On Wed, 18 Jan 2012 13:04:43 +0100, Daniel Vetter <daniel@ffwll.ch> wrote:
>>>>> On Wed, Jan 18, 2012 at 10:37:24AM +0000, Chris Wilson wrote:
>>>>>> On Wed, 18 Jan 2012 14:45:51 +1100, Daniel Stone <daniel@fooishbar.org> wrote:
>>>>>>> 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?
>>> 
>>> 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.  -- 
> 
> 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. 
-- 
Glen Gray
<slaine@slaine.org>