From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ben Widawsky Subject: Re: [RFC] drm/i915: context support unit test-r2 Date: Mon, 24 Jan 2011 16:18:02 -0800 Message-ID: <20110125001802.GA20759@snipes.kumite> References: <20110115072828.GA20773@lundgren.kumite> <20110119001926.GA26334@snipes.kumite> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="vtzGhvizbBRQ85DL" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-px0-f177.google.com (mail-px0-f177.google.com [209.85.212.177]) by gabe.freedesktop.org (Postfix) with ESMTP id A28F09E76A for ; Mon, 24 Jan 2011 16:18:08 -0800 (PST) Received: by pxi7 with SMTP id 7so856920pxi.36 for ; Mon, 24 Jan 2011 16:18:08 -0800 (PST) Content-Disposition: inline In-Reply-To: <20110119001926.GA26334@snipes.kumite> 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: benjamin.widawsky@linux.intel.com List-Id: intel-gfx@lists.freedesktop.org --vtzGhvizbBRQ85DL Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Another update to the unit test which shows resubmission of the context on failure. This was brought up by Daniel Vetter. The first version of context support will require the client to resubmit context if any of the buffers associated with the context have moved. Use case works like this term1> ./gem_ctx_basic #start test, blit and setup context term2> sudo ./gem_fill #fill up the GTT term1> #run the contexted blit, which will fail since context >------->-------#buffers have been evicted term2> #remove all crap from gtt term1> # try blit again restoring context Any comments are welcome. Ben --vtzGhvizbBRQ85DL Content-Type: text/x-c; charset=unknown-8bit Content-Disposition: attachment; filename="gem_ctx_basic.c" Content-Transfer-Encoding: quoted-printable /* * Copyright =C2=A9 2011 Intel Corporation * * Permission is hereby granted, free of charge, to any person obtaining = a * copy of this software and associated documentation files (the "Softwar= e"), * to deal in the Software without restriction, including without limitat= ion * the rights to use, copy, modify, merge, publish, distribute, sublicens= e, * and/or sell copies of the Software, and to permit persons to whom the * Software is furnished to do so, subject to the following conditions: * * The above copyright notice and this permission notice (including the n= ext * paragraph) shall be included in all copies or substantial portions of = the * Software. * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRES= S OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILIT= Y, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHA= LL * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR O= THER * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISIN= G * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DE= ALINGS * IN THE SOFTWARE. */ #include "drmtest.h" #include "intel_batchbuffer.h" #include "intel_gpu_tools.h" #include "drm.h" #include "i915_drm.h" #include "intel_bufmgr.h" #include "intel_context.h" static drm_intel_bufmgr *bufmgr; static drm_intel_ctx *ctx; struct intel_batchbuffer *batch; /* Would normally malloc this */ #define MAX_BOS_PER_BATCH 2 static drm_intel_ctx_flags ctx_flags[MAX_BOS_PER_BATCH]; #define RSVD_BUF_SLOT 0 #define SRC_BUF_SLOT 1 #define DEST_BUF_SLOT 2 /* XXX: We'll turn on ppgtt, but it's real usage won't get until gen7 */ #undef USE_PPGTT static void fill_ctx_bo_data(int which, drm_intel_bo *bo, int slot, unsigned long add= r) { if (addr !=3D 0) { printf("Warning, PPGTT/user controlled relocations are not yet" " supported\n"); } /* XXX: reference to the bo handle */ ctx_flags[which].handle =3D bo->handle; /* XXX: which slot the dest buffer refers to in the context */ ctx_flags[which].slot =3D slot; /* XXX: place to put the buffer (ppgtt only) */ ctx_flags[which].offset =3D addr; /* XXX: domains */ ctx_flags[which].read_domain =3D I915_GEM_DOMAIN_RENDER; ctx_flags[which].write_domain =3D 0; /* XXX: what else? */ //drm_intel_ctx_set_cmd(&ctx_flags[which], CTX_BUF_ASSOCIATE); ctx_flags[which].command =3D I915_CTX_ASSOC_BUF; } static void blit(drm_intel_bo *src_bo, drm_intel_bo *dest_bo) { uint32_t src_pitch =3D 512, dst_pitch =3D 512; uint32_t cmd_bits =3D 0; /* XXX: populate context info for the src and dest buffers */ fill_ctx_bo_data(0, dest_bo, DEST_BUF_SLOT, 0); fill_ctx_bo_data(1, src_bo, SRC_BUF_SLOT, 0); /* XXX: associate the flags per bo with the context */ drm_intel_ctx_set_flags(ctx, ctx_flags, 2); BEGIN_BATCH(8); OUT_BATCH(XY_SRC_COPY_BLT_CMD | XY_SRC_COPY_BLT_WRITE_ALPHA | XY_SRC_COPY_BLT_WRITE_RGB | cmd_bits); OUT_BATCH((3 << 24) | /* 32 bits */ (0xcc << 16) | /* copy ROP */ dst_pitch); OUT_BATCH(0); /* dst x1,y1 */ OUT_BATCH((64 << 16) | 64); /* 64x64 blit */ #ifdef USE_PPGTT OUT_BATCH(ctx_flags[0].addr); #else OUT_RELOC(dest_bo, I915_GEM_DOMAIN_RENDER, 0, 0); #endif OUT_BATCH(0); /* src x1,y1 */ OUT_BATCH(src_pitch); #ifdef USE_PPGTT OUT_BATCH(ctx_flags[1].addr); #else OUT_RELOC(src_bo, I915_GEM_DOMAIN_RENDER, 0, 0); #endif ADVANCE_BATCH(); /* XXX: new flush with context data, where ctx has a pointer * to the array of information per buffer object */ intel_batchbuffer_flush_with_ctx(batch, ctx); } /* Do the blit with previously assigned context */ static int contexted_blit(drm_intel_bo *src_bo, drm_intel_bo *dest_bo) { uint32_t src_pitch =3D 512, dst_pitch =3D 512; uint32_t cmd_bits =3D 0; int ret; /* XXX: no more per context flags */ drm_intel_ctx_set_flags(ctx, NULL, 0); BEGIN_BATCH(8); OUT_BATCH(XY_SRC_COPY_BLT_CMD | XY_SRC_COPY_BLT_WRITE_ALPHA | XY_SRC_COPY_BLT_WRITE_RGB | cmd_bits); OUT_BATCH((3 << 24) | /* 32 bits */ (0xcc << 16) | /* copy ROP */ dst_pitch); OUT_BATCH(0); /* dst x1,y1 */ OUT_BATCH((64 << 16) | 64); /* 64x64 blit */ OUT_BATCH(ctx_flags[0].offset); OUT_BATCH(0); /* src x1,y1 */ OUT_BATCH(src_pitch); OUT_BATCH(ctx_flags[1].offset); ADVANCE_BATCH(); return intel_batchbuffer_flush_with_ctx(batch, ctx); } int main(int argc, char **argv) { drm_intel_bo *src, *dest; int fd, ret; const unsigned int aperture_size =3D 64 * 1024 * 1024; /* XXX rsvd slot + src slot + dest slot */ const int ctx_bo_slots =3D 3; fd =3D drm_open_any(); bufmgr =3D drm_intel_bufmgr_gem_init(fd, 4096); drm_intel_bufmgr_set_debug(bufmgr, 1); drm_intel_bufmgr_gem_enable_reuse(bufmgr); /* XXX: Create a new context for our work 64MB aperture, 3 slots*/ ctx =3D drm_intel_ctx_gem_init(bufmgr, aperture_size, ctx_bo_slots); if (ctx =3D=3D NULL) return -1; batch =3D intel_batchbuffer_alloc(bufmgr, intel_get_drm_devid(fd)); src =3D drm_intel_bo_alloc(bufmgr, "src", 1024 * 16, 4096); dest =3D drm_intel_bo_alloc(bufmgr, "dest", 1024 * 16, 4096); blit(src, dest); printf("Finished initial blit\n press enter to continue" "(try running \"sudo gem_fill\" to fill GTT and make context blit fail)= \n"); getchar(); ret =3D contexted_blit(src, dest); if (ret) { printf("context has been lost, resubmitting full context (hit enter)\n"= ); getchar(); blit(src, dest); ret =3D contexted_blit(src, dest); assert(ret =3D=3D 0); } intel_batchbuffer_free(batch); drm_intel_ctx_gem_destroy(ctx); drm_intel_bufmgr_destroy(bufmgr); close(fd); return 0; } --vtzGhvizbBRQ85DL Content-Type: text/x-c; charset=unknown-8bit Content-Disposition: attachment; filename="gem_fill.c" Content-Transfer-Encoding: quoted-printable /* * Copyright =C2=A9 2011 Intel Corporation * * Permission is hereby granted, free of charge, to any person obtaining = a * copy of this software and associated documentation files (the "Softwar= e"), * to deal in the Software without restriction, including without limitat= ion * the rights to use, copy, modify, merge, publish, distribute, sublicens= e, * and/or sell copies of the Software, and to permit persons to whom the * Software is furnished to do so, subject to the following conditions: * * The above copyright notice and this permission notice (including the n= ext * paragraph) shall be included in all copies or substantial portions of = the * Software. * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRES= S OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILIT= Y, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHA= LL * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR O= THER * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISIN= G * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DE= ALINGS * IN THE SOFTWARE. */ #include #include #include "drmtest.h" #include "intel_batchbuffer.h" #include "intel_gpu_tools.h" #include "drm.h" #include "i915_drm.h" #include "intel_bufmgr.h" #include "intel_context.h" static drm_intel_bufmgr *bufmgr; #define LARGE_OBJ_SIZE (4 << 10) unsigned char data[LARGE_OBJ_SIZE]; static int test_large_object(int fd) { struct drm_i915_gem_create create; struct drm_i915_gem_pwrite pwrite; struct drm_i915_gem_pin pin; int ret; memset(&create, 0, sizeof(create)); memset(&pwrite, 0, sizeof(pwrite)); memset(&pin, 0, sizeof(pin)); create.size =3D LARGE_OBJ_SIZE; ret =3D ioctl(fd, DRM_IOCTL_I915_GEM_CREATE, &create); if (ret) { fprintf(stderr, "object creation failed: %s\n", strerror(errno)); return ret; } pin.handle =3D create.handle; ret =3D ioctl(fd, DRM_IOCTL_I915_GEM_PIN, &pin); if (ret) { fprintf(stderr, "pin failed: %s\n", strerror(errno)); return ret; } pwrite.handle =3D create.handle; pwrite.size =3D LARGE_OBJ_SIZE; pwrite.data_ptr =3D (uint64_t)data; ret =3D ioctl(fd, DRM_IOCTL_I915_GEM_PWRITE, &pwrite); if (ret) { fprintf(stderr, "pwrite failed: %s\n", strerror(errno)); return ret; } /* kernel should clean this up for us */ return 0; } int main(int argc, char **argv) { int fd; fd =3D drm_open_any(); bufmgr =3D drm_intel_bufmgr_gem_init(fd, 4096); drm_intel_bufmgr_set_debug(bufmgr, 1); drm_intel_bufmgr_gem_enable_reuse(bufmgr); /* XXX Fill up the GTT so no_ass fails */ while(!test_large_object(fd)); printf("press enter to quit\n"); getchar(); drm_intel_bufmgr_destroy(bufmgr); close(fd); return 0; } --vtzGhvizbBRQ85DL 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 --vtzGhvizbBRQ85DL--