From: Eric Anholt Subject: Re: [PATCH v2 1/2] i965: Cleanup MapRangeBuffer Date: Mon, 26 Sep 2011 09:40:12 -0700 Message-ID: <874nzz9s0j.fsf@eliezer.anholt.net> References: <1317000932-731-1-git-send-email-ben@bwidawsk.net> <1317000932-731-5-git-send-email-ben@bwidawsk.net> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0500739535==" Return-path: In-Reply-To: <1317000932-731-5-git-send-email-ben@bwidawsk.net> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: intel-gfx@lists.freedesktop.org Cc: Ben Widawsky , Chad Versace List-Id: intel-gfx@lists.freedesktop.org --===============0500739535== Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha1; protocol="application/pgp-signature" --=-=-= Content-Transfer-Encoding: quoted-printable On Sun, 25 Sep 2011 18:35:31 -0700, Ben Widawsky wrote: > Clean the code up, and always use a BO when creating a new buffer. I've > not seen any regressions but haven't yet tried this on < Gen6. >=20 > Cc: Chad Versace > Cc: Eric Anholt > Signed-off-by: Ben Widawsky > --- > src/mesa/drivers/dri/intel/intel_buffer_objects.c | 114 ++++++++++-----= ------ > src/mesa/drivers/dri/intel/intel_buffer_objects.h | 4 +- > 2 files changed, 55 insertions(+), 63 deletions(-) >=20 > diff --git a/src/mesa/drivers/dri/intel/intel_buffer_objects.c b/src/mesa= /drivers/dri/intel/intel_buffer_objects.c > index 4df2d76..78e3468 100644 > --- a/src/mesa/drivers/dri/intel/intel_buffer_objects.c > +++ b/src/mesa/drivers/dri/intel/intel_buffer_objects.c > @@ -291,6 +291,19 @@ intel_bufferobj_map_range(struct gl_context * ctx, >=20=20 > assert(intel_obj); >=20=20 > + /* Catch some errors early to make real logic a bit easier */ > + if ((access & (GL_MAP_FLUSH_EXPLICIT_BIT | GL_MAP_WRITE_BIT)) =3D=3D > + GL_MAP_INVALIDATE_RANGE_BIT) > + goto error_out; > + > + if ((access & (GL_MAP_INVALIDATE_RANGE_BIT | GL_MAP_READ_BIT)) =3D=3D > + (GL_MAP_INVALIDATE_RANGE_BIT|GL_MAP_READ_BIT)) > + goto error_out; > + > + if ((access & (GL_MAP_INVALIDATE_BUFFER_BIT | GL_MAP_READ_BIT)) =3D=3D > + (GL_MAP_INVALIDATE_BUFFER_BIT | GL_MAP_READ_BIT)) > + goto error_out; > + Why are you introducing broken error checks for things that are already correctly checked in Mesa core? > /* If the user doesn't care about existing buffer contents and mapping > * would cause us to block, then throw out the old buffer. > */ > @@ -344,36 +355,30 @@ intel_bufferobj_map_range(struct gl_context * ctx, > */ > if ((access & GL_MAP_INVALIDATE_RANGE_BIT) && > drm_intel_bo_busy(intel_obj->buffer)) { > - if (access & GL_MAP_FLUSH_EXPLICIT_BIT) { > - intel_obj->range_map_buffer =3D malloc(length); > - obj->Pointer =3D intel_obj->range_map_buffer; > - } else { > - intel_obj->range_map_bo =3D drm_intel_bo_alloc(intel->bufmgr, > - "range map", > - length, 64); > - if (!(access & GL_MAP_READ_BIT)) { > - drm_intel_gem_bo_map_gtt(intel_obj->range_map_bo); > - intel_obj->mapped_gtt =3D GL_TRUE; > - } else { > - drm_intel_bo_map(intel_obj->range_map_bo, > - (access & GL_MAP_WRITE_BIT) !=3D 0); > - intel_obj->mapped_gtt =3D GL_FALSE; > - } > - obj->Pointer =3D intel_obj->range_map_bo->virtual; > - } > - return obj->Pointer; > - } > - > - if (!(access & GL_MAP_READ_BIT)) { > + intel_obj->range_map_bo =3D drm_intel_bo_alloc(intel->bufmgr, > + "range map", > + length, 64); > + drm_intel_gem_bo_map_gtt(intel_obj->range_map_bo); > + intel_obj->mapped_gtt =3D true; > + obj->Pointer =3D intel_obj->range_map_bo->virtual; > + } else if (!(access & GL_MAP_READ_BIT)) { /* Write only */ > drm_intel_gem_bo_map_gtt(intel_obj->buffer); > - intel_obj->mapped_gtt =3D GL_TRUE; > - } else { > + intel_obj->mapped_gtt =3D true; > + obj->Pointer =3D intel_obj->buffer->virtual + offset; > + } else { /* R/W or RO */ > drm_intel_bo_map(intel_obj->buffer, (access & GL_MAP_WRITE_BIT) != =3D 0); > - intel_obj->mapped_gtt =3D GL_FALSE; > + intel_obj->mapped_gtt =3D false; > + obj->Pointer =3D intel_obj->buffer->virtual + offset; > } >=20=20 > - obj->Pointer =3D intel_obj->buffer->virtual + offset; > + if (!(access & GL_MAP_FLUSH_EXPLICIT_BIT)) > + intel_obj->needs_flush_at_unmap =3D true; > + > return obj->Pointer; > + > +error_out: > + obj->Pointer =3D NULL; > + return NULL; > } >=20=20 > /* Ideally we'd use a BO to avoid taking up cache space for the temporary > @@ -388,27 +393,22 @@ intel_bufferobj_flush_mapped_range(struct gl_contex= t *ctx, > { > struct intel_context *intel =3D intel_context(ctx); > struct intel_buffer_object *intel_obj =3D intel_buffer_object(obj); > - drm_intel_bo *temp_bo; >=20=20 > - /* Unless we're in the range map using a temporary system buffer, > - * there's no work to do. > - */ > - if (intel_obj->range_map_buffer =3D=3D NULL) > - return; > + assert(intel_obj->needs_flush_at_unmap =3D=3D false); >=20=20 > if (length =3D=3D 0) > return; >=20=20 > - temp_bo =3D drm_intel_bo_alloc(intel->bufmgr, "range map flush", leng= th, 64); > - > - drm_intel_bo_subdata(temp_bo, 0, length, intel_obj->range_map_buffer); > - > - intel_emit_linear_blit(intel, > - intel_obj->buffer, obj->Offset + offset, > - temp_bo, 0, > - length); > + if (!intel_obj->range_map_bo) { > + intel_batchbuffer_emit_mi_flush(intel); > + } else { > + intel_emit_linear_blit(intel, > + intel_obj->buffer, obj->Offset + offset, > + intel_obj->range_map_bo, 0, > + length); >=20=20 > - drm_intel_bo_unreference(temp_bo); > + drm_intel_bo_unreference(intel_obj->range_map_bo); > + } > } >=20=20 >=20=20 > @@ -425,15 +425,6 @@ intel_bufferobj_unmap(struct gl_context * ctx, struc= t gl_buffer_object *obj) > assert(obj->Pointer); > if (intel_obj->sys_buffer !=3D NULL) { > /* always keep the mapping around. */ > - } else if (intel_obj->range_map_buffer !=3D NULL) { > - /* Since we've emitted some blits to buffers that will (likely) be= used > - * in rendering operations in other cache domains in this batch, e= mit a > - * flush. Once again, we wish for a domain tracker in libdrm to c= over > - * usage inside of a batchbuffer. > - */ > - intel_batchbuffer_emit_mi_flush(intel); > - free(intel_obj->range_map_buffer); > - intel_obj->range_map_buffer =3D NULL; > } else if (intel_obj->range_map_bo !=3D NULL) { > if (intel_obj->mapped_gtt) { > drm_intel_gem_bo_unmap_gtt(intel_obj->range_map_bo); > @@ -441,10 +432,13 @@ intel_bufferobj_unmap(struct gl_context * ctx, stru= ct gl_buffer_object *obj) > drm_intel_bo_unmap(intel_obj->range_map_bo); > } >=20=20 > - intel_emit_linear_blit(intel, > - intel_obj->buffer, obj->Offset, > - intel_obj->range_map_bo, 0, > - obj->Length); > + if (intel_obj->needs_flush_at_unmap) { > + intel_emit_linear_blit(intel, > + intel_obj->buffer, obj->Offset, > + intel_obj->range_map_bo, 0, > + obj->Length); > + drm_intel_bo_unreference(intel_obj->range_map_bo); > + } >=20=20 > /* Since we've emitted some blits to buffers that will (likely) be= used > * in rendering operations in other cache domains in this batch, e= mit a > @@ -452,8 +446,6 @@ intel_bufferobj_unmap(struct gl_context * ctx, struct= gl_buffer_object *obj) > * usage inside of a batchbuffer. > */ > intel_batchbuffer_emit_mi_flush(intel); If you have this flush here, you don't need it in the explicit range flushes where you added it. --=-=-= Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iEYEARECAAYFAk6AquwACgkQHUdvYGzw6vfYGgCfQb4NyLFoE062nPc5SXES1QyG igcAn3nXht+FwEdlCT9WNWFKaIoLEa/M =MVNl -----END PGP SIGNATURE----- --=-=-=-- --===============0500739535== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx --===============0500739535==--