Re: [Intel-gfx] [PATCH 08/37] mi: Drop plane argument from miHandleExposures

2014-10-12 Thread Adam Jackson 
On Sat, 2014-10-11 at 14:35 +0100, Mike Lothian wrote:
 Hi
 
 This stops xf86-video-intel working or compiling for me
 
 The below patch is a work around but I'm not quite sure what to check
 for to make it work with both old and new xservers

Intel will need to be fixed, yeah.  Preferably by not forking fb, which
is, you know, insane.

- ajax

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

Re: [Intel-gfx] [PATCH 08/37] mi: Drop plane argument from miHandleExposures

2014-10-12 Thread Rémi Cardona 
Le 11/10/2014 16:23, Mike Lothian a écrit :
 I think I've found the correct way to do it
 
 I've tested against xorg-server 1.16.1 and xorg-server from the latest
 git - I'm not sure if the formatting if correct or not but it compiles
 and runs on both

What about 'src/compat-api.h'? This looks like the correct place for it
and it could be shared with all other drivers that had this file put in
their repo a while back.

Cheers,

Rémi
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [PATCH 08/37] mi: Drop plane argument from miHandleExposures

2014-10-11 Thread Mike Lothian 
Hi

This stops xf86-video-intel working or compiling for me

The below patch is a work around but I'm not quite sure what to check
for to make it work with both old and new xservers

Cheers

Mike

On 8 October 2014 16:04, Adam Jackson a...@redhat.com wrote:
 This existed to be passed to the bs recovery routine; since we back all
 planes, we don't care.

 Signed-off-by: Adam Jackson a...@redhat.com
 ---
  fb/fbcopy.c  | 2 +-
  glamor/glamor_copy.c | 3 +--
  hw/dmx/dmxgcops.c| 8 
  mi/mi.h  | 3 +--
  mi/mibitblt.c| 5 ++---
  mi/micopy.c  | 3 +--
  mi/miexpose.c| 8 +---
  7 files changed, 11 insertions(+), 21 deletions(-)

 diff --git a/fb/fbcopy.c b/fb/fbcopy.c
 index 541ef71..5bbabc3 100644
 --- a/fb/fbcopy.c
 +++ b/fb/fbcopy.c
 @@ -271,5 +271,5 @@ fbCopyPlane(DrawablePtr pSrcDrawable,
  else
  return miHandleExposures(pSrcDrawable, pDstDrawable, pGC,
   xIn, yIn,
 - widthSrc, heightSrc, xOut, yOut, bitplane);
 + widthSrc, heightSrc, xOut, yOut);
  }
 diff --git a/glamor/glamor_copy.c b/glamor/glamor_copy.c
 index 6f422d4..3320935 100644
 --- a/glamor/glamor_copy.c
 +++ b/glamor/glamor_copy.c
 @@ -677,8 +677,7 @@ glamor_copy_plane(DrawablePtr src, DrawablePtr dst, GCPtr 
 gc,
  {
  if ((bitplane  FbFullMask(src-depth)) == 0)
  return miHandleExposures(src, dst, gc,
 - srcx, srcy, width, height, dstx, dsty,
 - bitplane);
 + srcx, srcy, width, height, dstx, dsty);
  return miDoCopy(src, dst, gc,
  srcx, srcy, width, height,
  dstx, dsty, glamor_copy, bitplane, NULL);
 diff --git a/hw/dmx/dmxgcops.c b/hw/dmx/dmxgcops.c
 index aa7c8eb..0ebd69a 100644
 --- a/hw/dmx/dmxgcops.c
 +++ b/hw/dmx/dmxgcops.c
 @@ -179,7 +179,7 @@ dmxCopyArea(DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC,

  if (DMX_GCOPS_OFFSCREEN(pSrc) || DMX_GCOPS_OFFSCREEN(pDst))
  return miHandleExposures(pSrc, pDst, pGC, srcx, srcy, w, h,
 - dstx, dsty, 0L);
 + dstx, dsty);

  DMX_GCOPS_SET_DRAWABLE(pSrc, srcDraw);
  DMX_GCOPS_SET_DRAWABLE(pDst, dstDraw);
 @@ -188,7 +188,7 @@ dmxCopyArea(DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC,
srcx, srcy, w, h, dstx, dsty);
  dmxSync(dmxScreen, FALSE);

 -return miHandleExposures(pSrc, pDst, pGC, srcx, srcy, w, h, dstx, dsty, 
 0L);
 +return miHandleExposures(pSrc, pDst, pGC, srcx, srcy, w, h, dstx, dsty);
  }

  /** Copy plane number \a bitPlane from \a pSrc drawable to \a pDst
 @@ -206,7 +206,7 @@ dmxCopyPlane(DrawablePtr pSrc, DrawablePtr pDst, GCPtr 
 pGC,

  if (DMX_GCOPS_OFFSCREEN(pSrc) || DMX_GCOPS_OFFSCREEN(pDst))
  return miHandleExposures(pSrc, pDst, pGC, srcx, srcy, width, height,
 - dstx, dsty, bitPlane);
 + dstx, dsty);

  DMX_GCOPS_SET_DRAWABLE(pSrc, srcDraw);
  DMX_GCOPS_SET_DRAWABLE(pDst, dstDraw);
 @@ -216,7 +216,7 @@ dmxCopyPlane(DrawablePtr pSrc, DrawablePtr pDst, GCPtr 
 pGC,
  dmxSync(dmxScreen, FALSE);

  return miHandleExposures(pSrc, pDst, pGC, srcx, srcy, width, height,
 - dstx, dsty, bitPlane);
 + dstx, dsty);
  }

  /** Render list of points, \a pptInit in \a pDrawable on the back-end
 diff --git a/mi/mi.h b/mi/mi.h
 index a4a01b8..700bb11 100644
 --- a/mi/mi.h
 +++ b/mi/mi.h
 @@ -229,8 +229,7 @@ extern _X_EXPORT RegionPtr miHandleExposures(DrawablePtr 
 /*pSrcDrawable */ ,
   int /*width */ ,
   int /*height */ ,
   int /*dstx */ ,
 - int /*dsty */ ,
 - unsigned long  /*plane */
 + int /*dsty */
  );

  extern _X_EXPORT void miSendGraphicsExpose(ClientPtr /*client */ ,
 diff --git a/mi/mibitblt.c b/mi/mibitblt.c
 index 3ed4ed1..08bd1c5 100644
 --- a/mi/mibitblt.c
 +++ b/mi/mibitblt.c
 @@ -242,8 +242,7 @@ miCopyArea(DrawablePtr pSrcDrawable,
  }
  }
  prgnExposed = miHandleExposures(pSrcDrawable, pDstDrawable, pGC, xIn, 
 yIn,
 -widthSrc, heightSrc, xOut, yOut,
 -(unsigned long) 0);
 +widthSrc, heightSrc, xOut, yOut);
  if (realSrcClip)
  RegionDestroy(prgnSrcClip);

 @@ -579,7 +578,7 @@ miCopyPlane(DrawablePtr pSrcDrawable,
  }
  }
  prgnExposed = miHandleExposures(pSrcDrawable, pDstDrawable, pGC, srcx, 
 srcy,
 -width, height, dstx, dsty, bitPlane);
 +

Re: [Intel-gfx] [PATCH 08/37] mi: Drop plane argument from miHandleExposures

2014-10-11 Thread Mike Lothian 
I think I've found the correct way to do it

I've tested against xorg-server 1.16.1 and xorg-server from the latest
git - I'm not sure if the formatting if correct or not but it compiles
and runs on both

Cheers

Mike

On 11 October 2014 14:35, Mike Lothian m...@fireburn.co.uk wrote:
 Hi

 This stops xf86-video-intel working or compiling for me

 The below patch is a work around but I'm not quite sure what to check
 for to make it work with both old and new xservers

 Cheers

 Mike

 On 8 October 2014 16:04, Adam Jackson a...@redhat.com wrote:
 This existed to be passed to the bs recovery routine; since we back all
 planes, we don't care.

 Signed-off-by: Adam Jackson a...@redhat.com
 ---
  fb/fbcopy.c  | 2 +-
  glamor/glamor_copy.c | 3 +--
  hw/dmx/dmxgcops.c| 8 
  mi/mi.h  | 3 +--
  mi/mibitblt.c| 5 ++---
  mi/micopy.c  | 3 +--
  mi/miexpose.c| 8 +---
  7 files changed, 11 insertions(+), 21 deletions(-)

 diff --git a/fb/fbcopy.c b/fb/fbcopy.c
 index 541ef71..5bbabc3 100644
 --- a/fb/fbcopy.c
 +++ b/fb/fbcopy.c
 @@ -271,5 +271,5 @@ fbCopyPlane(DrawablePtr pSrcDrawable,
  else
  return miHandleExposures(pSrcDrawable, pDstDrawable, pGC,
   xIn, yIn,
 - widthSrc, heightSrc, xOut, yOut, bitplane);
 + widthSrc, heightSrc, xOut, yOut);
  }
 diff --git a/glamor/glamor_copy.c b/glamor/glamor_copy.c
 index 6f422d4..3320935 100644
 --- a/glamor/glamor_copy.c
 +++ b/glamor/glamor_copy.c
 @@ -677,8 +677,7 @@ glamor_copy_plane(DrawablePtr src, DrawablePtr dst, 
 GCPtr gc,
  {
  if ((bitplane  FbFullMask(src-depth)) == 0)
  return miHandleExposures(src, dst, gc,
 - srcx, srcy, width, height, dstx, dsty,
 - bitplane);
 + srcx, srcy, width, height, dstx, dsty);
  return miDoCopy(src, dst, gc,
  srcx, srcy, width, height,
  dstx, dsty, glamor_copy, bitplane, NULL);
 diff --git a/hw/dmx/dmxgcops.c b/hw/dmx/dmxgcops.c
 index aa7c8eb..0ebd69a 100644
 --- a/hw/dmx/dmxgcops.c
 +++ b/hw/dmx/dmxgcops.c
 @@ -179,7 +179,7 @@ dmxCopyArea(DrawablePtr pSrc, DrawablePtr pDst, GCPtr 
 pGC,

  if (DMX_GCOPS_OFFSCREEN(pSrc) || DMX_GCOPS_OFFSCREEN(pDst))
  return miHandleExposures(pSrc, pDst, pGC, srcx, srcy, w, h,
 - dstx, dsty, 0L);
 + dstx, dsty);

  DMX_GCOPS_SET_DRAWABLE(pSrc, srcDraw);
  DMX_GCOPS_SET_DRAWABLE(pDst, dstDraw);
 @@ -188,7 +188,7 @@ dmxCopyArea(DrawablePtr pSrc, DrawablePtr pDst, GCPtr 
 pGC,
srcx, srcy, w, h, dstx, dsty);
  dmxSync(dmxScreen, FALSE);

 -return miHandleExposures(pSrc, pDst, pGC, srcx, srcy, w, h, dstx, dsty, 
 0L);
 +return miHandleExposures(pSrc, pDst, pGC, srcx, srcy, w, h, dstx, dsty);
  }

  /** Copy plane number \a bitPlane from \a pSrc drawable to \a pDst
 @@ -206,7 +206,7 @@ dmxCopyPlane(DrawablePtr pSrc, DrawablePtr pDst, GCPtr 
 pGC,

  if (DMX_GCOPS_OFFSCREEN(pSrc) || DMX_GCOPS_OFFSCREEN(pDst))
  return miHandleExposures(pSrc, pDst, pGC, srcx, srcy, width, height,
 - dstx, dsty, bitPlane);
 + dstx, dsty);

  DMX_GCOPS_SET_DRAWABLE(pSrc, srcDraw);
  DMX_GCOPS_SET_DRAWABLE(pDst, dstDraw);
 @@ -216,7 +216,7 @@ dmxCopyPlane(DrawablePtr pSrc, DrawablePtr pDst, GCPtr 
 pGC,
  dmxSync(dmxScreen, FALSE);

  return miHandleExposures(pSrc, pDst, pGC, srcx, srcy, width, height,
 - dstx, dsty, bitPlane);
 + dstx, dsty);
  }

  /** Render list of points, \a pptInit in \a pDrawable on the back-end
 diff --git a/mi/mi.h b/mi/mi.h
 index a4a01b8..700bb11 100644
 --- a/mi/mi.h
 +++ b/mi/mi.h
 @@ -229,8 +229,7 @@ extern _X_EXPORT RegionPtr miHandleExposures(DrawablePtr 
 /*pSrcDrawable */ ,
   int /*width */ ,
   int /*height */ ,
   int /*dstx */ ,
 - int /*dsty */ ,
 - unsigned long  /*plane */
 + int /*dsty */
  );

  extern _X_EXPORT void miSendGraphicsExpose(ClientPtr /*client */ ,
 diff --git a/mi/mibitblt.c b/mi/mibitblt.c
 index 3ed4ed1..08bd1c5 100644
 --- a/mi/mibitblt.c
 +++ b/mi/mibitblt.c
 @@ -242,8 +242,7 @@ miCopyArea(DrawablePtr pSrcDrawable,
  }
  }
  prgnExposed = miHandleExposures(pSrcDrawable, pDstDrawable, pGC, xIn, 
 yIn,
 -widthSrc, heightSrc, xOut, yOut,
 -(unsigned long) 0);
 +widthSrc, heightSrc, xOut, yOut);
  if