[PULL] glamor VC4 crash fixes

2015-06-19 Thread Eric Anholt
The following changes since commit fa12f2c150b2f50de9dac4a2b09265f13af353af: glamor: don't do render ops with matching source/dest (v3) (2015-06-02 14:16:26 +1000) are available in the git repository at: git://people.freedesktop.org/~anholt/xserver glamor-next for you to fetch changes up t

[PATCH] modesetting: Fix a compiler warning about CARD32 vs uint32_t.

2015-06-19 Thread Eric Anholt
Signed-off-by: Eric Anholt --- hw/xfree86/drivers/modesetting/dri2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/xfree86/drivers/modesetting/dri2.c b/hw/xfree86/drivers/modesetting/dri2.c index 63cb065..8dc12b7 100644 --- a/hw/xfree86/drivers/modesetting/dri2.c +++ b/h

[PATCH 4/7] glamor: Use GL_EXT_map_buffer_range if present.

2015-06-19 Thread Eric Anholt
We were only looking for the desktop GL version of the extension, so GLES2 missed out. Signed-off-by: Eric Anholt --- glamor/glamor.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/glamor/glamor.c b/glamor/glamor.c index 0378388..935fb74 100644 --- a/glamor/glamor.c +++ b/

[PATCH 2/7] glamor: Drop CloseScreen-time GL resource cleanup code.

2015-06-19 Thread Eric Anholt
These will all be freed when the context is freed. Signed-off-by: Eric Anholt --- glamor/glamor.c | 5 - glamor/glamor_core.c | 11 --- glamor/glamor_gradient.c | 21 - glamor/glamor_priv.h | 3 --- glamor/glamor_render.c | 21

[PATCH 1/7] glamor: Fix text rendering on GLES2.

2015-06-19 Thread Eric Anholt
The GL_QUADS helper takes a number of quads, not a number of vertices. --- glamor/glamor_composite_glyphs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glamor/glamor_composite_glyphs.c b/glamor/glamor_composite_glyphs.c index 1f0d75e..e92f1d9 100644 --- a/glamor/glamor_comp

[PATCH 6/7] glamor: Use proper Bools for some boolean values.

2015-06-19 Thread Eric Anholt
Signed-off-by: Eric Anholt --- glamor/glamor_priv.h | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/glamor/glamor_priv.h b/glamor/glamor_priv.h index 17f8253..681895f 100644 --- a/glamor/glamor_priv.h +++ b/glamor/glamor_priv.h @@ -194,16 +194,16 @@ typedef

[PATCH 5/7] glamor: Provide a fallback path for using an index buffer to do quads.

2015-06-19 Thread Eric Anholt
Improves x11perf -aa10text performance by 1377.59% +/- 23.8198% (n=93) on Intel with GLES2. Signed-off-by: Eric Anholt --- glamor/glamor.c | 62 +++ glamor/glamor_priv.h | 11 + glamor/glamor_utils.h | 4 +--- 3 files changed, 74 in

[PATCH 7/7] glamor: Avoid using GL_QUADS on VC4.

2015-06-19 Thread Eric Anholt
Improves text rendering from about 284k glyphs per second to 320k glyphs per second. There's no GL extension for probing this, because of the philosophy of "Don't expose whether things are really in hardware or not." Signed-off-by: Eric Anholt --- glamor/glamor.c | 9 + glamor/gla

[PATCH 3/7] Use the normal GL_QUADS drawing helper in the render code.

2015-06-19 Thread Eric Anholt
We use this for all of our other performance-sensitive rendering, too. Signed-off-by: Eric Anholt --- glamor/glamor.c| 1 - glamor/glamor_priv.h | 7 +++ glamor/glamor_render.c | 50 -- 3 files changed, 7 insertions(+), 51 deletions

Re: composite_glyphs on vc4

2015-06-19 Thread Keith Packard
Eric Anholt writes: > After this series, I'm at 143000 glyphs/sec, up from 2640 glyphs/sec > with the old always-fallbacks path. For the series: Reviewed-by: Keith Packard -- -keith signature.asc Description: PGP signature ___ xorg-devel@

Re: [PATCH 1/2] glamor: add support for allocating linear buffers

2015-06-19 Thread Dave Airlie
> >> at which point you'd want to continue >> the versioning from the mesa point to avoid epochs. So I don't >> take your argument, the API version is what we ship in the gbm.pc >> file, compatible implementations should make the same API changes >> in their same versions. >> > Other companies may

Re: [PATCH 5/6] cursor: add hw cursor support for prime

2015-06-19 Thread Eric Anholt
Dave Airlie writes: > Currently with PRIME if we detect a secondary GPU, > we switch to using SW cursors, this isn't optimal, > esp for the intel/nvidia combinations, we have > no choice for the USB offload devices. > > This patch checks on each slave screen if hw > cursors are enabled, and also

Re: [PATCH 4/6] modesetting: reverse prime support

2015-06-19 Thread Eric Anholt
Dave Airlie writes: > This adds support for reverse prime to the modesetting driver. > > Reverse prime is where we have two GPUs in the display chain, > but the second GPU can't scanout from the shared pixmap, so needs > an extra copy to the on screen pixmap. > > This allows modesetting to suppor

Re: [PATCH 3/6] glamor: egl: add function to back a pixmap with a dma-buf.

2015-06-19 Thread Eric Anholt
Dave Airlie writes: > Rather than create the pixmap, this uses the file descriptor > to change an existing pixmaps backing store. > > This is required for reverse prime slaves, where we create > the slave pixmap, then set the backing store. > > Signed-off-by: Dave Airlie > --- > glamor/glamor.h

Re: [PATCH 2/6] modesetting: add output master support

2015-06-19 Thread Eric Anholt
Dave Airlie writes: > This allows a glamor enabled master device to have > slave USB devices attached. > > Tested with modesetting on SNB + USB. > > It relies on the previous patch to export linear > buffers from glamor. > > Signed-off-by: Dave Airlie I don't know the slave stuff really, but it

Re: [PATCH 1/6] glamor: add support for allocating linear buffers (v1.1)

2015-06-19 Thread Eric Anholt
Dave Airlie writes: > We need this for doing USB offload scenarios using glamor > and modesetting driver. > > unfortunately only gbm in mesa 10.6 has support for the > linear API. It seems like in the linear case, we should make the FBO as external so it doesn't get released back into the FBO ca

Re: [PATCH 1/2] glamor: add support for allocating linear buffers

2015-06-19 Thread Emil Velikov
On 19 June 2015 at 02:12, Dave Airlie wrote: > On 19 June 2015 at 02:02, Emil Velikov wrote: >> On 15 June 2015 at 05:08, Michel Dänzer wrote: >>> On 12.06.2015 08:48, Dave Airlie wrote: We need this for doing USB offload scenarios using glamor and modesetting driver. unfortu