xserver-xorg-video-intel: Changes to 'upstream-experimental'
Makefile.am | 1
NEWS | 26 ++
autogen.sh | 14 -
configure.ac | 22 --
m4/.gitignore | 5
src/Makefile.am | 1
src/common.h | 17 -
src/intel.h | 94 --------
src/intel_display.c | 7
src/intel_dri.c | 137 +++++++++---
src/intel_driver.c | 44 ----
src/intel_glamor.c | 91 ++++----
src/intel_glamor.h | 3
src/intel_list.h | 392 ++++++++++++++++++++++++++++++++++++
src/intel_module.c | 6
src/intel_uxa.c | 13 -
src/sna/Makefile.am | 17 -
src/sna/gen2_render.c | 65 ++++-
src/sna/gen3_render.c | 166 ++++++++-------
src/sna/gen4_render.c | 279 +++++++++++++++----------
src/sna/gen5_render.c | 339 ++++++++++++++++---------------
src/sna/gen6_render.c | 478 ++++++++++++++++++++++++++------------------
src/sna/gen7_render.c | 327 +++++++++++++++++-------------
src/sna/kgem.c | 247 +++++++++++++---------
src/sna/kgem.h | 29 +-
src/sna/kgem_debug_gen6.c | 14 -
src/sna/sna.h | 9
src/sna/sna_accel.c | 294 ++++++++++++++-------------
src/sna/sna_blt.c | 36 +--
src/sna/sna_composite.c | 25 +-
src/sna/sna_display.c | 18 -
src/sna/sna_dri.c | 102 ++++++---
src/sna/sna_glyphs.c | 6
src/sna/sna_io.c | 2
src/sna/sna_render.c | 235 ++++++++++++++++-----
src/sna/sna_render.h | 32 ++
src/sna/sna_render_inline.h | 7
src/sna/sna_tiling.c | 162 +++++++++++++-
src/sna/sna_trapezoids.c | 121 +++++++----
src/sna/sna_video.c | 2
src/sna/sna_video_hwmc.c | 4
uxa/uxa.h | 10
42 files changed, 2514 insertions(+), 1385 deletions(-)
New commits:
commit b870a3e5cd922ce37050ece73e2469802dd21da2
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Fri Feb 24 11:21:49 2012 +0000
configure, NEWS: Bump version to 2.18.0 for release
Another quarter, a bit late as I was debugging a few regressions,
another release.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
diff --git a/NEWS b/NEWS
index 2bd476b..9d2b15e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,29 @@
+Release 2.18.0 (2012-02-24)
+===========================
+Time passes, a few more bugs have crept out of the woodwork that are a
+compelling reason to update.
+
+Bugs fixed in this release (compared to 2.17.0)
+-----------------------------------------------
+
+* Limit maximum object size so that all of the source, mask and
+ destination can be mapped into the aperture simultaneously by basing the
+ limit on the mappable aperture size rather than the size of the total
+ GATT.
+
+* Incorrect clipping of polygons
+ https://bugs.freedesktop.org/show_bug.cgi?id=43649
+ Regression from 2.15.901
+
+* Limit number of VMA cached to avoid hitting the per-process VMA limit
+ There still is a residual bug in that we seem to have so many objects
+ floating around in the first place and that still leads to exhaustion
+ of system limits.
+ https://bugs.freedesktop.org/show_bug.cgi?id=43075
+ https://bugs.freedesktop.org/show_bug.cgi?id=40066
+
+* Latency in processing user-input during continuous rendering
+
Release 2.17.0 (2011-11-16)
==============================
A few months have passed, and we have accumulated a surprising number of
diff --git a/configure.ac b/configure.ac
index 2c8bee9..6eb3289 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-intel],
- [2.17.0],
+ [2.18.0],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-video-intel])
AC_CONFIG_SRCDIR([Makefile.am])
commit 5b5cd6780ef7cae8f49d71d7c8532597291402d8
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Fri Feb 24 11:14:26 2012 +0000
uxa: Add a option to disable the bo cache
If you are suffering from regular X crashes and rendering corruption
with a flood of ENOSPC or even EFILE reported in the Xorg.log, try
adding this snippet to your xorg.conf:
Section "Driver"
Option "BufferCache" "False"
EndSection
References: https://bugs.freedesktop.org/show_bug.cgi?id=39552
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
diff --git a/src/intel_driver.c b/src/intel_driver.c
index 1837509..e2e43fa 100644
--- a/src/intel_driver.c
+++ b/src/intel_driver.c
@@ -105,6 +105,7 @@ typedef enum {
OPTION_DEBUG_WAIT,
OPTION_HOTPLUG,
OPTION_RELAXED_FENCING,
+ OPTION_BUFFER_CACHE,
} I830Opts;
static OptionInfoRec I830Options[] = {
@@ -126,6 +127,7 @@ static OptionInfoRec I830Options[] = {
{OPTION_DEBUG_WAIT, "DebugWait", OPTV_BOOLEAN, {0}, FALSE},
{OPTION_HOTPLUG, "HotPlug", OPTV_BOOLEAN, {0}, TRUE},
{OPTION_RELAXED_FENCING, "RelaxedFencing", OPTV_BOOLEAN, {0}, TRUE},
+ {OPTION_BUFFER_CACHE, "BufferCache", OPTV_BOOLEAN, {0}, TRUE},
{-1, NULL, OPTV_NONE, {0}, FALSE}
};
/* *INDENT-ON* */
@@ -394,7 +396,8 @@ static int intel_init_bufmgr(intel_screen_private *intel)
if (!intel->bufmgr)
return FALSE;
- drm_intel_bufmgr_gem_enable_reuse(intel->bufmgr);
+ if (xf86ReturnOptValBool(intel->Options, OPTION_BUFFER_CACHE, TRUE))
+ drm_intel_bufmgr_gem_enable_reuse(intel->bufmgr);
drm_intel_bufmgr_gem_set_vma_cache_size(intel->bufmgr, 512);
drm_intel_bufmgr_gem_enable_fenced_relocs(intel->bufmgr);
commit f8ca50818cd4f82e0ad8eeb245e8ee838b083056
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sat Feb 18 13:49:02 2012 -0500
Revert "Update autotools configuration"
This reverts commit 9184af921bc2f332fcb6c9b47001414378eab8e2.
All X.Org modules must be able to be configured with autoconf 2.60.
In addition, version 2.63 has GPL licensing issues which prevents
some vendor to release software based on it.
The AM_SILENT_RULES are already handled by XORG_DEFAULT_OPTIONS.
All X.Org modules must be able to be configured with libtool 1.5.
AM_MAINTAINER_MODE default value is "enabled" already.
We use the same autogen script for all x.org modules.
There are proposals for changes which should be reviewed and eventually
applied to all modules together.
The lt*.m4 patterns are already included in the root .gitignore file.
This can be proposed as a change to all modules, but it invloves
changing the topvel .gitignore, the m4/.gitignore, the ACLOCAL_AMFLAGS
and the AC_CONFIG_MACRO_DIR together.
For more information on project wide configuration guidelines,
consult http://www.x.org/wiki/ModularDevelopersGuide
and http://www.x.org/wiki/NewModuleGuidelines.
Acked-by: Matthieu Herrb <matthieu.herrb@laas.fr>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/Makefile.am b/Makefile.am
index 48c3477..b3d37b2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,7 +18,6 @@
# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
SUBDIRS = man
diff --git a/autogen.sh b/autogen.sh
index 30d679f..904cd67 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,6 +1,12 @@
#! /bin/sh
-test -n "$srcdir" || srcdir=`dirname "$0"`
-test -n "$srcdir" || srcdir=.
-autoreconf --force --install --verbose "$srcdir"
-test -n "$NOCONFIGURE" || "$srcdir/configure" "$@"
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+ORIGDIR=`pwd`
+cd $srcdir
+
+autoreconf -v --install || exit 1
+cd $ORIGDIR || exit $?
+
+$srcdir/configure --enable-maintainer-mode "$@"
diff --git a/configure.ac b/configure.ac
index 1e77faf..2c8bee9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,24 +21,18 @@
# Process this file with autoconf to produce a configure script
# Initialize Autoconf
-AC_PREREQ([2.63])
+AC_PREREQ([2.60])
AC_INIT([xf86-video-intel],
[2.17.0],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-video-intel])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h])
-AC_CONFIG_AUX_DIR([build-aux])
-AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_AUX_DIR(.)
# Initialize Automake
-AM_INIT_AUTOMAKE([1.10 foreign dist-bzip2])
-AM_MAINTAINER_MODE([enable])
-
-# Support silent build rules, requires at least automake-1.11. Disable
-# by either passing --disable-silent-rules to configure or passing V=1
-# to make
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
+AM_MAINTAINER_MODE
# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
m4_ifndef([XORG_MACROS_VERSION],
@@ -56,8 +50,8 @@ m4_ifndef([XORG_DRIVER_CHECK_EXT],
depending on your distribution, try package 'xserver-xorg-dev' or 'xorg-x11-server-devel'])])
# Initialize libtool
-LT_PREREQ([2.2])
-LT_INIT([disable-static])
+AC_DISABLE_STATIC
+AC_PROG_LIBTOOL
# Are we in a git checkout?
dot_git=no
diff --git a/m4/.gitignore b/m4/.gitignore
deleted file mode 100644
index 464ba5c..0000000
--- a/m4/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-libtool.m4
-lt~obsolete.m4
-ltoptions.m4
-ltsugar.m4
-ltversion.m4
commit a647aff5124674b638ef52152a5c16c27466eed7
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Thu Feb 23 12:04:09 2012 +0000
sna/gen3: Silence the compiler complaining with DBG enabled
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
diff --git a/src/sna/gen3_render.c b/src/sna/gen3_render.c
index 6828a16..b50d067 100644
--- a/src/sna/gen3_render.c
+++ b/src/sna/gen3_render.c
@@ -1732,7 +1732,7 @@ inline static int gen3_get_rectangles(struct sna *sna,
int rem;
DBG(("%s: want=%d, rem=%d\n",
- __FUNCTION__, want*op->floats_per_rect, rem));
+ __FUNCTION__, want*op->floats_per_rect, vertex_space(sna)));
assert(sna->render.vertex_index * op->floats_per_vertex == sna->render.vertex_used);
@@ -1742,12 +1742,12 @@ start:
DBG(("flushing vbo for %s: %d < %d\n",
__FUNCTION__, rem, op->floats_per_rect));
rem = gen3_get_rectangles__flush(sna, op);
- if (rem == 0)
+ if (unlikely(rem == 0))
goto flush;
}
- if (sna->render_state.gen3.vertex_offset == 0 &&
- !gen3_rectangle_begin(sna, op))
+ if (unlikely(sna->render_state.gen3.vertex_offset == 0 &&
+ !gen3_rectangle_begin(sna, op)))
goto flush;
if (want > 1 && want * op->floats_per_rect > rem)
commit cd3a618f583a546bafbe0c171a267774adc4d72b
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Thu Feb 23 10:40:57 2012 +0000
sna/gen4 Refactor get_rectangles() to re-emit state after a flush
Condense the work performed by each caller into the callee.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
diff --git a/src/sna/gen4_render.c b/src/sna/gen4_render.c
index cccdf4c..6ba59ee 100644
--- a/src/sna/gen4_render.c
+++ b/src/sna/gen4_render.c
@@ -1116,19 +1116,12 @@ static bool gen4_rectangle_begin(struct sna *sna,
int id = op->u.gen4.ve_id;
int ndwords;
- ndwords = 0;
+ /* 7xpipelined pointers + 6xprimitive + 1xflush */
+ ndwords = op->need_magic_ca_pass? 20 : 6;
if (FLUSH_EVERY_VERTEX)
ndwords += 1;
if ((sna->render_state.gen4.vb_id & (1 << id)) == 0)
ndwords += 5;
- if (sna->render_state.gen4.vertex_offset == 0)
- ndwords += 6;
- if (ndwords == 0)
- return true;
-
- if (op->need_magic_ca_pass)
- /* 7xpipelined pointers + 6xprimitive + 1xflush */
- ndwords += 14;
if (!kgem_check_batch(&sna->kgem, ndwords))
return false;
@@ -1159,19 +1152,23 @@ static int gen4_get_rectangles__flush(struct sna *sna,
inline static int gen4_get_rectangles(struct sna *sna,
const struct sna_composite_op *op,
- int want)
+ int want,
+ void (*emit_state)(struct sna *sna, const struct sna_composite_op *op))
{
- int rem = vertex_space(sna);
+ int rem;
+start:
+ rem = vertex_space(sna);
if (rem < 3*op->floats_per_vertex) {
DBG(("flushing vbo for %s: %d < %d\n",
__FUNCTION__, rem, 3*op->floats_per_vertex));
rem = gen4_get_rectangles__flush(sna, op);
- if (rem == 0)
+ if (unlikely(rem == 0))
goto flush;
}
- if (!gen4_rectangle_begin(sna, op))
+ if (unlikely(sna->render_state.gen4.vertex_offset == 0 &&
+ !gen4_rectangle_begin(sna, op)))
goto flush;
if (want > 1 && want * op->floats_per_vertex*3 > rem)
@@ -1186,7 +1183,8 @@ flush:
gen4_magic_ca_pass(sna, op);
}
_kgem_submit(&sna->kgem);
- return 0;
+ emit_state(sna, op);
+ goto start;
}
static uint32_t *gen4_composite_get_binding_table(struct sna *sna,
@@ -1541,11 +1539,7 @@ gen4_render_composite_blt(struct sna *sna,
gen4_bind_surfaces(sna, op);
}
- if (!gen4_get_rectangles(sna, op, 1)) {
- gen4_bind_surfaces(sna, op);
- gen4_get_rectangles(sna, op, 1);
- }
-
+ gen4_get_rectangles(sna, op, 1, gen4_bind_surfaces);
op->prim_emit(sna, op, r);
/* XXX are the shaders fubar? */
@@ -1629,9 +1623,9 @@ static uint32_t gen4_bind_video_source(struct sna *sna,
}
static void gen4_video_bind_surfaces(struct sna *sna,
- const struct sna_composite_op *op,
- struct sna_video_frame *frame)
+ const struct sna_composite_op *op)
{
+ struct sna_video_frame *frame = op->priv;
uint32_t src_surf_format;
uint32_t src_surf_base[6];
int src_width[6];
@@ -1732,13 +1726,14 @@ gen4_render_video(struct sna *sna,
tmp.is_affine = TRUE;
tmp.floats_per_vertex = 3;
tmp.u.gen4.ve_id = 1;
+ tmp.priv = frame;
if (!kgem_check_bo(&sna->kgem, tmp.dst.bo, frame->bo, NULL)) {
kgem_submit(&sna->kgem);
assert(kgem_check_bo(&sna->kgem, tmp.dst.bo, frame->bo, NULL));
}
- gen4_video_bind_surfaces(sna, &tmp, frame);
+ gen4_video_bind_surfaces(sna, &tmp);
gen4_align_vertex(sna, &tmp);
/* Set up the offset for translating from the given region (in screen
@@ -1769,10 +1764,7 @@ gen4_render_video(struct sna *sna,
r.y1 = box->y1 + pix_yoff;
r.y2 = box->y2 + pix_yoff;
- if (!gen4_get_rectangles(sna, &tmp, 1)) {
- gen4_video_bind_surfaces(sna, &tmp, frame);
- gen4_get_rectangles(sna, &tmp, 1);
- }
+ gen4_get_rectangles(sna, &tmp, 1, gen4_video_bind_surfaces);
OUT_VERTEX(r.x2, r.y2);
OUT_VERTEX_F((box->x2 - dxo) * src_scale_x);
@@ -2393,10 +2385,7 @@ gen4_render_copy_one(struct sna *sna,
int w, int h,
int dx, int dy)
{
- if (!gen4_get_rectangles(sna, op, 1)) {
- gen4_copy_bind_surfaces(sna, op);
- gen4_get_rectangles(sna, op, 1);
- }
+ gen4_get_rectangles(sna, op, 1, gen4_copy_bind_surfaces);
OUT_VERTEX(dx+w, dy+h);
OUT_VERTEX_F((sx+w)*op->src.scale[0]);
@@ -2725,10 +2714,7 @@ gen4_render_fill_rectangle(struct sna *sna,
const struct sna_composite_op *op,
int x, int y, int w, int h)
{
- if (!gen4_get_rectangles(sna, op, 1)) {
- gen4_fill_bind_surfaces(sna, op);
- gen4_get_rectangles(sna, op, 1);
- }
+ gen4_get_rectangles(sna, op, 1, gen4_fill_bind_surfaces);
OUT_VERTEX(x+w, y+h);
OUT_VERTEX_F(1);
commit 6a3fa4d1b6849b666a9232b017ce82329494621b
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Thu Feb 23 10:40:57 2012 +0000
sna/gen7 Refactor get_rectangles() to re-emit state after a flush
Condense the work performed by each caller into the callee.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
diff --git a/src/sna/gen7_render.c b/src/sna/gen7_render.c
index d039a48..0d913f6 100644
--- a/src/sna/gen7_render.c
+++ b/src/sna/gen7_render.c
@@ -1664,20 +1664,23 @@ static int gen7_get_rectangles__flush(struct sna *sna,
inline static int gen7_get_rectangles(struct sna *sna,
const struct sna_composite_op *op,
- int want)
+ int want,
+ void (*emit_state)(struct sna *sna, const struct sna_composite_op *op))
{
int rem = vertex_space(sna);
+start:
+ rem = vertex_space(sna);
if (rem < op->floats_per_rect) {
DBG(("flushing vbo for %s: %d < %d\n",
__FUNCTION__, rem, op->floats_per_rect));
rem = gen7_get_rectangles__flush(sna, op);
- if (rem == 0)
+ if (unlikely(rem == 0))
goto flush;
}
- if (sna->render_state.gen7.vertex_offset == 0 &&
- !gen7_rectangle_begin(sna, op))
+ if (unlikely(sna->render_state.gen7.vertex_offset == 0 &&
+ !gen7_rectangle_begin(sna, op)))
goto flush;
if (want > 1 && want * op->floats_per_rect > rem)
@@ -1692,7 +1695,8 @@ flush:
gen7_magic_ca_pass(sna, op);
}
_kgem_submit(&sna->kgem);
- return 0;
+ emit_state(sna, op);
+ goto start;
}
inline static uint32_t *gen7_composite_get_binding_table(struct sna *sna,
@@ -1801,11 +1805,7 @@ gen7_render_composite_blt(struct sna *sna,
const struct sna_composite_op *op,
const struct sna_composite_rectangles *r)
{
- if (unlikely(!gen7_get_rectangles(sna, op, 1))) {
- gen7_emit_composite_state(sna, op);
- gen7_get_rectangles(sna, op, 1);
- }
-
+ gen7_get_rectangles(sna, op, 1, gen7_emit_composite_state);
op->prim_emit(sna, op, r);
}
@@ -1816,10 +1816,7 @@ gen7_render_composite_box(struct sna *sna,
{
struct sna_composite_rectangles r;
- if (unlikely(!gen7_get_rectangles(sna, op, 1))) {
- gen7_emit_composite_state(sna, op);
- gen7_get_rectangles(sna, op, 1);
- }
+ gen7_get_rectangles(sna, op, 1, gen7_emit_composite_state);
DBG((" %s: (%d, %d), (%d, %d)\n",
__FUNCTION__,
@@ -1842,12 +1839,12 @@ gen7_render_composite_boxes(struct sna *sna,
DBG(("composite_boxes(%d)\n", nbox));
do {
- int nbox_this_time = gen7_get_rectangles(sna, op, nbox);
- if (unlikely(nbox_this_time == 0)) {
- gen7_emit_composite_state(sna, op);
- nbox_this_time = gen7_get_rectangles(sna, op, nbox);
- }
+ int nbox_this_time;
+
+ nbox_this_time = gen7_get_rectangles(sna, op, nbox,
+ gen7_emit_composite_state);
nbox -= nbox_this_time;
+
do {
struct sna_composite_rectangles r;
@@ -1934,9 +1931,9 @@ static uint32_t gen7_bind_video_source(struct sna *sna,
}
static void gen7_emit_video_state(struct sna *sna,
- struct sna_composite_op *op,
- struct sna_video_frame *frame)
+ const struct sna_composite_op *op)
{
+ struct sna_video_frame *frame = op->priv;
uint32_t src_surf_format;
uint32_t src_surf_base[6];
int src_width[6];
@@ -2055,6 +2052,7 @@ gen7_render_video(struct sna *sna,
}
tmp.u.gen7.nr_inputs = 1;
tmp.u.gen7.ve_id = 1;
+ tmp.priv = frame;
kgem_set_mode(&sna->kgem, KGEM_RENDER);
if (!kgem_check_bo(&sna->kgem, tmp.dst.bo, frame->bo, NULL)) {
@@ -2063,7 +2061,7 @@ gen7_render_video(struct sna *sna,
_kgem_set_mode(&sna->kgem, KGEM_RENDER);
}
- gen7_emit_video_state(sna, &tmp, frame);
+ gen7_emit_video_state(sna, &tmp);
gen7_align_vertex(sna, &tmp);
/* Set up the offset for translating from the given region (in screen
@@ -2094,10 +2092,7 @@ gen7_render_video(struct sna *sna,
r.y1 = box->y1 + pix_yoff;
r.y2 = box->y2 + pix_yoff;
- if (unlikely(!gen7_get_rectangles(sna, &tmp, 1))) {
- gen7_emit_video_state(sna, &tmp, frame);
- gen7_get_rectangles(sna, &tmp, 1);
- }
+ gen7_get_rectangles(sna, &tmp, 1, gen7_emit_video_state);
OUT_VERTEX(r.x2, r.y2);
OUT_VERTEX_F((box->x2 - dxo) * src_scale_x);
@@ -2941,11 +2936,7 @@ gen7_render_composite_spans_box(struct sna *sna,
box->x2 - box->x1,
box->y2 - box->y1));
- if (unlikely(gen7_get_rectangles(sna, &op->base, 1) == 0)) {
- gen7_emit_composite_state(sna, &op->base);
- gen7_get_rectangles(sna, &op->base, 1);
- }
-
+ gen7_get_rectangles(sna, &op->base, 1, gen7_emit_composite_state);
op->prim_emit(sna, op, box, opacity);
}
@@ -2964,11 +2955,8 @@ gen7_render_composite_spans_boxes(struct sna *sna,
do {
int nbox_this_time;
- nbox_this_time = gen7_get_rectangles(sna, &op->base, nbox);
- if (unlikely(nbox_this_time == 0)) {
- gen7_emit_composite_state(sna, &op->base);
- nbox_this_time = gen7_get_rectangles(sna, &op->base, nbox);
- }
+ nbox_this_time = gen7_get_rectangles(sna, &op->base, nbox,
+ gen7_emit_composite_state);
nbox -= nbox_this_time;
do {
@@ -3356,11 +3344,10 @@ fallback_blt:
do {
float *v;
- int n_this_time = gen7_get_rectangles(sna, &tmp, n);
- if (unlikely(n_this_time == 0)) {
- gen7_emit_copy_state(sna, &tmp);
- n_this_time = gen7_get_rectangles(sna, &tmp, n);
- }
+ int n_this_time;
+
+ n_this_time = gen7_get_rectangles(sna, &tmp, n,
+ gen7_emit_copy_state);
n -= n_this_time;
v = sna->render.vertices + sna->render.vertex_used;
@@ -3410,10 +3397,7 @@ gen7_render_copy_blt(struct sna *sna,
int16_t w, int16_t h,
int16_t dx, int16_t dy)
{
- if (unlikely(!gen7_get_rectangles(sna, &op->base, 1))) {
- gen7_emit_copy_state(sna, &op->base);
- gen7_get_rectangles(sna, &op->base, 1);
- }
+ gen7_get_rectangles(sna, &op->base, 1, gen7_emit_copy_state);
OUT_VERTEX(dx+w, dy+h);
OUT_VERTEX_F((sx+w)*op->base.src.scale[0]);
@@ -3680,12 +3664,12 @@ gen7_render_fill_boxes(struct sna *sna,
gen7_align_vertex(sna, &tmp);
do {
- int n_this_time = gen7_get_rectangles(sna, &tmp, n);
- if (unlikely(n_this_time == 0)) {
- gen7_emit_fill_state(sna, &tmp);
- n_this_time = gen7_get_rectangles(sna, &tmp, n);
- }
+ int n_this_time;
+
+ n_this_time = gen7_get_rectangles(sna, &tmp, n,
+ gen7_emit_fill_state);
n -= n_this_time;
+
do {
DBG((" (%d, %d), (%d, %d)\n",
box->x1, box->y1, box->x2, box->y2));
@@ -3717,10 +3701,7 @@ gen7_render_fill_op_blt(struct sna *sna,
{
DBG(("%s: (%d, %d)x(%d, %d)\n", __FUNCTION__, x, y, w, h));
- if (unlikely(!gen7_get_rectangles(sna, &op->base, 1))) {
- gen7_emit_fill_state(sna, &op->base);
- gen7_get_rectangles(sna, &op->base, 1);
- }
+ gen7_get_rectangles(sna, &op->base, 1, gen7_emit_fill_state);
OUT_VERTEX(x+w, y+h);
OUT_VERTEX_F(1);
@@ -3743,10 +3724,7 @@ gen7_render_fill_op_box(struct sna *sna,
DBG(("%s: (%d, %d),(%d, %d)\n", __FUNCTION__,
box->x1, box->y1, box->x2, box->y2));
- if (unlikely(!gen7_get_rectangles(sna, &op->base, 1))) {
- gen7_emit_fill_state(sna, &op->base);
- gen7_get_rectangles(sna, &op->base, 1);
- }
+ gen7_get_rectangles(sna, &op->base, 1, gen7_emit_fill_state);
OUT_VERTEX(box->x2, box->y2);
OUT_VERTEX_F(1);
@@ -3771,11 +3749,10 @@ gen7_render_fill_op_boxes(struct sna *sna,
box->x1, box->y1, box->x2, box->y2, nbox));
do {
- int nbox_this_time = gen7_get_rectangles(sna, &op->base, nbox);
- if (unlikely(nbox_this_time == 0)) {
- gen7_emit_fill_state(sna, &op->base);
- nbox_this_time = gen7_get_rectangles(sna, &op->base, nbox);
- }
+ int nbox_this_time;
+
+ nbox_this_time = gen7_get_rectangles(sna, &op->base, nbox,
+ gen7_emit_fill_state);
nbox -= nbox_this_time;
do {
@@ -3967,10 +3944,7 @@ gen7_render_fill_one(struct sna *sna, PixmapPtr dst, struct kgem_bo *bo,
gen7_emit_fill_state(sna, &tmp);
gen7_align_vertex(sna, &tmp);
- if (unlikely(!gen7_get_rectangles(sna, &tmp, 1))) {
- gen7_emit_fill_state(sna, &tmp);
- gen7_get_rectangles(sna, &tmp, 1);
- }
+ gen7_get_rectangles(sna, &tmp, 1, gen7_emit_fill_state);
DBG((" (%d, %d), (%d, %d)\n", x1, y1, x2, y2));
OUT_VERTEX(x2, y2);
@@ -4065,10 +4039,7 @@ gen7_render_clear(struct sna *sna, PixmapPtr dst, struct kgem_bo *bo)
gen7_emit_fill_state(sna, &tmp);
gen7_align_vertex(sna, &tmp);
- if (unlikely(!gen7_get_rectangles(sna, &tmp, 1))) {
- gen7_emit_fill_state(sna, &tmp);
- gen7_get_rectangles(sna, &tmp, 1);
- }
+ gen7_get_rectangles(sna, &tmp, 1, gen7_emit_fill_state);
OUT_VERTEX(dst->drawable.width, dst->drawable.height);
OUT_VERTEX_F(1);
commit fe914eaca4b9178ab3d14053a703772f93295895
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Thu Feb 23 10:40:57 2012 +0000
sna/gen5 Refactor get_rectangles() to re-emit state after a flush
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
diff --git a/src/sna/gen5_render.c b/src/sna/gen5_render.c
index 8d6a3e9..a80ce0a 100644
--- a/src/sna/gen5_render.c
+++ b/src/sna/gen5_render.c
@@ -1130,13 +1130,9 @@ static bool gen5_rectangle_begin(struct sna *sna,
assert((unsigned)id <= 3);
- ndwords = 0;
+ ndwords = op->need_magic_ca_pass ? 20 : 6;
if ((sna->render_state.gen5.vb_id & (1 << id)) == 0)
ndwords += 5;
- if (sna->render_state.gen5.vertex_offset == 0)
- ndwords += op->need_magic_ca_pass ? 20 : 6;
- if (ndwords == 0)
- return true;
if (!kgem_check_batch(&sna->kgem, ndwords))
return false;
@@ -1167,19 +1163,24 @@ static int gen5_get_rectangles__flush(struct sna *sna,
inline static int gen5_get_rectangles(struct sna *sna,
const struct sna_composite_op *op,
- int want)
+ int want,
+ void (*emit_state)(struct sna *sna,
+ const struct sna_composite_op *op))
{
- int rem = vertex_space(sna);
+ int rem;
+start:
+ rem = vertex_space(sna);
if (rem < op->floats_per_rect) {
DBG(("flushing vbo for %s: %d < %d\n",
__FUNCTION__, rem, op->floats_per_rect));
rem = gen5_get_rectangles__flush(sna, op);
- if (rem == 0)
+ if (unlikely (rem == 0))
goto flush;
}
- if (!gen5_rectangle_begin(sna, op))
+ if (unlikely(sna->render_state.gen5.vertex_offset == 0 &&
+ !gen5_rectangle_begin(sna, op)))
goto flush;
if (want * op->floats_per_rect > rem)
@@ -1194,7 +1195,8 @@ flush:
gen5_magic_ca_pass(sna, op);
}
_kgem_submit(&sna->kgem);
- return 0;
+ emit_state(sna, op);
+ goto start;
}
static uint32_t *
@@ -1562,11 +1564,7 @@ gen5_render_composite_blt(struct sna *sna,
r->dst.x, r->dst.y, op->dst.x, op->dst.y,
r->width, r->height));
- if (!gen5_get_rectangles(sna, op, 1)) {
- gen5_bind_surfaces(sna, op);
- gen5_get_rectangles(sna, op, 1);
- }
-
+ gen5_get_rectangles(sna, op, 1, gen5_bind_surfaces);
op->prim_emit(sna, op, r);
}
@@ -1581,10 +1579,7 @@ gen5_render_composite_box(struct sna *sna,
__FUNCTION__,
box->x1, box->y1, box->x2, box->y2));
- if (!gen5_get_rectangles(sna, op, 1)) {
- gen5_bind_surfaces(sna, op);
- gen5_get_rectangles(sna, op, 1);
- }
+ gen5_get_rectangles(sna, op, 1, gen5_bind_surfaces);
r.dst.x = box->x1;
r.dst.y = box->y1;
@@ -1608,11 +1603,10 @@ gen5_render_composite_boxes(struct sna *sna,
op->mask.width, op->mask.height));
do {
- int nbox_this_time = gen5_get_rectangles(sna, op, nbox);
- if (nbox_this_time == 0) {
- gen5_bind_surfaces(sna, op);
- nbox_this_time = gen5_get_rectangles(sna, op, nbox);
- }
+ int nbox_this_time;
+
+ nbox_this_time = gen5_get_rectangles(sna, op, nbox,
+ gen5_bind_surfaces);
nbox -= nbox_this_time;
do {
@@ -1669,9 +1663,9 @@ static uint32_t gen5_bind_video_source(struct sna *sna,
}
static void gen5_video_bind_surfaces(struct sna *sna,
- struct sna_composite_op *op,
- struct sna_video_frame *frame)
+ const struct sna_composite_op *op)
{
+ struct sna_video_frame *frame = op->priv;
uint32_t src_surf_format;
uint32_t src_surf_base[6];
int src_width[6];
@@ -1775,13 +1769,14 @@ gen5_render_video(struct sna *sna,
tmp.is_affine = TRUE;
tmp.floats_per_vertex = 3;
tmp.floats_per_rect = 9;
+ tmp.priv = frame;
if (!kgem_check_bo(&sna->kgem, tmp.dst.bo, frame->bo, NULL)) {
kgem_submit(&sna->kgem);
assert(kgem_check_bo(&sna->kgem, tmp.dst.bo, frame->bo, NULL));
}
- gen5_video_bind_surfaces(sna, &tmp, frame);
+ gen5_video_bind_surfaces(sna, &tmp);
gen5_align_vertex(sna, &tmp);
/* Set up the offset for translating from the given region (in screen
@@ -1812,10 +1807,7 @@ gen5_render_video(struct sna *sna,
r.y1 = box->y1 + pix_yoff;
r.y2 = box->y2 + pix_yoff;
- if (!gen5_get_rectangles(sna, &tmp, 1)) {
- gen5_video_bind_surfaces(sna, &tmp, frame);
- gen5_get_rectangles(sna, &tmp, 1);
- }
+ gen5_get_rectangles(sna, &tmp, 1, gen5_video_bind_surfaces);
OUT_VERTEX(r.x2, r.y2);
OUT_VERTEX_F((box->x2 - dxo) * src_scale_x);
@@ -2549,11 +2541,7 @@ gen5_render_composite_spans_box(struct sna *sna,
box->x2 - box->x1,
box->y2 - box->y1));
- if (gen5_get_rectangles(sna, &op->base, 1) == 0) {
- gen5_bind_surfaces(sna, &op->base);
- gen5_get_rectangles(sna, &op->base, 1);
- }
-
+ gen5_get_rectangles(sna, &op->base, 1, gen5_bind_surfaces);
op->prim_emit(sna, op, box, opacity);
}
@@ -2572,11 +2560,8 @@ gen5_render_composite_spans_boxes(struct sna *sna,
do {
int nbox_this_time;
- nbox_this_time = gen5_get_rectangles(sna, &op->base, nbox);
- if (nbox_this_time == 0) {
- gen5_bind_surfaces(sna, &op->base);
- nbox_this_time = gen5_get_rectangles(sna, &op->base, nbox);
- }
+ nbox_this_time = gen5_get_rectangles(sna, &op->base, nbox,
+ gen5_bind_surfaces);
nbox -= nbox_this_time;
do {
@@ -2871,11 +2856,10 @@ fallback_blt:
gen5_align_vertex(sna, &tmp);
do {
- int n_this_time = gen5_get_rectangles(sna, &tmp, n);
- if (n_this_time == 0) {
- gen5_copy_bind_surfaces(sna, &tmp);
- n_this_time = gen5_get_rectangles(sna, &tmp, n);
- }
+ int n_this_time;
+
+ n_this_time = gen5_get_rectangles(sna, &tmp, n,
+ gen5_copy_bind_surfaces);
n -= n_this_time;
do {
@@ -2926,10 +2910,7 @@ gen5_render_copy_blt(struct sna *sna,
DBG(("%s: src=(%d, %d), dst=(%d, %d), size=(%d, %d)\n", __FUNCTION__,
sx, sy, dx, dy, w, h));
- if (!gen5_get_rectangles(sna, &op->base, 1)) {
- gen5_copy_bind_surfaces(sna, &op->base);
- gen5_get_rectangles(sna, &op->base, 1);
- }
+ gen5_get_rectangles(sna, &op->base, 1, gen5_copy_bind_surfaces);
OUT_VERTEX(dx+w, dy+h);
OUT_VERTEX_F((sx+w)*op->base.src.scale[0]);
@@ -3173,12 +3154,12 @@ gen5_render_fill_boxes(struct sna *sna,
gen5_align_vertex(sna, &tmp);
do {
- int n_this_time = gen5_get_rectangles(sna, &tmp, n);
- if (n_this_time == 0) {
- gen5_fill_bind_surfaces(sna, &tmp);
- n_this_time = gen5_get_rectangles(sna, &tmp, n);
- }
+ int n_this_time;
+
+ n_this_time = gen5_get_rectangles(sna, &tmp, n,
+ gen5_fill_bind_surfaces);
n -= n_this_time;
+
do {
DBG((" (%d, %d), (%d, %d)\n",
box->x1, box->y1, box->x2, box->y2));
@@ -3210,10 +3191,7 @@ gen5_render_fill_op_blt(struct sna *sna,
{
DBG(("%s (%d, %d)x(%d, %d)\n", __FUNCTION__, x,y,w,h));
- if (!gen5_get_rectangles(sna, &op->base, 1)) {
- gen5_fill_bind_surfaces(sna, &op->base);
- gen5_get_rectangles(sna, &op->base, 1);
- }
+ gen5_get_rectangles(sna, &op->base, 1, gen5_fill_bind_surfaces);
OUT_VERTEX(x+w, y+h);
OUT_VERTEX_F(1);
@@ -3236,10 +3214,7 @@ gen5_render_fill_op_box(struct sna *sna,
DBG(("%s: (%d, %d),(%d, %d)\n", __FUNCTION__,
box->x1, box->y1, box->x2, box->y2));
- if (!gen5_get_rectangles(sna, &op->base, 1)) {
- gen5_fill_bind_surfaces(sna, &op->base);
- gen5_get_rectangles(sna, &op->base, 1);
- }
+ gen5_get_rectangles(sna, &op->base, 1, gen5_fill_bind_surfaces);
OUT_VERTEX(box->x2, box->y2);
OUT_VERTEX_F(1);
@@ -3264,11 +3239,10 @@ gen5_render_fill_op_boxes(struct sna *sna,
box->x1, box->y1, box->x2, box->y2, nbox));
do {
- int nbox_this_time = gen5_get_rectangles(sna, &op->base, nbox);
- if (nbox_this_time == 0) {
- gen5_fill_bind_surfaces(sna, &op->base);
- nbox_this_time = gen5_get_rectangles(sna, &op->base, nbox);
- }
+ int nbox_this_time;
+
+ nbox_this_time = gen5_get_rectangles(sna, &op->base, nbox,
+ gen5_fill_bind_surfaces);
nbox -= nbox_this_time;
do {
@@ -3452,10 +3426,7 @@ gen5_render_fill_one(struct sna *sna, PixmapPtr dst, struct kgem_bo *bo,
Reply to: