From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [PATCH] tests/kms_flip: test a fb backed by a bo too big for its own good Date: Fri, 16 May 2014 15:04:21 +0300 Message-ID: <20140516120421.GP27580@intel.com> References: <1400238531-10414-1-git-send-email-oscar.mateo@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id A5C076E892 for ; Fri, 16 May 2014 05:04:33 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1400238531-10414-1-git-send-email-oscar.mateo@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: oscar.mateo@intel.com Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Fri, May 16, 2014 at 12:08:51PM +0100, oscar.mateo@intel.com wrote: > From: Oscar Mateo > = > This is a "review by igt test" for a bug located in > i915_gem_object_pin_to_display_plane and fixed by: > = > commit 392013bdd4b6128795e33c84bd6d6d3fd66ff0a3 > Author: Oscar Mateo > Date: Fri May 16 11:23:12 2014 +0100 > = > drm/i915: Gracefully handle obj not bound to GGTT in is_pin_display > = > Otherwise, we do a NULL pointer dereference. > = > I've seen this happen while handling an error in > i915_gem_object_pin_to_display_plane(): > = > If i915_gem_object_set_cache_level() fails, we call is_pin_display() > to handle the error. At this point, the object is still not pinned > to GGTT and maybe not even bound, so we have to check before we > dereference its GGTT vma. > = > v2: Chris Wilson says restoring the old value is easier, but that > is_pin_display is useful as a theory of operation. Take the solomonic > decision: at least this way is_pin_display is a little more robust > (until Chris can kill it off). > = > Signed-off-by: Oscar Mateo > --- > tests/kms_flip.c | 102 +++++++++++++++++++++++++++++++++++++++++++++++++= +++--- > 1 file changed, 97 insertions(+), 5 deletions(-) > = > diff --git a/tests/kms_flip.c b/tests/kms_flip.c > index bb4f71d..7296122 100644 > --- a/tests/kms_flip.c > +++ b/tests/kms_flip.c > @@ -74,6 +74,7 @@ > #define TEST_RPM (1 << 25) > #define TEST_SUSPEND (1 << 26) > #define TEST_TS_CONT (1 << 27) > +#define TEST_BO_TOOBIG (1 << 28) > = > #define EVENT_FLIP (1 << 0) > #define EVENT_VBLANK (1 << 1) > @@ -1208,6 +1209,84 @@ static void free_test_output(struct test_output *o) > } > } > = > +static int create_bigbo_for_fb(int fd, int width, int height, int bpp, > + bool tiled, uint32_t *gem_handle_ret, > + unsigned *size_ret, unsigned *stride_ret) > +{ > + uint32_t gem_handle; > + int size, ret =3D 0; > + unsigned stride; > + > + if (tiled) { > + int v; > + > + v =3D width * bpp / 8; > + for (stride =3D 512; stride < v; stride *=3D 2) > + ; > + > + v =3D stride * height; > + for (size =3D 1024*1024; size < v; size *=3D 2) > + ; > + } else { > + /* Scan-out has a 64 byte alignment restriction */ > + stride =3D (width * (bpp / 8) + 63) & ~63; > + size =3D stride * height; > + } > + > + /* 256 MB is usually the maximum mappable aperture, > + * (make it 4x times that to ensure failure) */ > + gem_handle =3D gem_create(fd, 4*256*1024*1024); > + > + if (tiled) > + ret =3D __gem_set_tiling(fd, gem_handle, I915_TILING_X, stride); > + > + *stride_ret =3D stride; > + *size_ret =3D size; > + *gem_handle_ret =3D gem_handle; > + > + return ret; > +} > + > +static unsigned int igt_create_fb_with_bigbo(int fd, int width, int heig= ht, > + uint32_t format, bool tiled, > + struct igt_fb *fb) > +{ > + uint32_t handles[4]; > + uint32_t pitches[4]; > + uint32_t offsets[4]; > + uint32_t fb_id; > + int bpp; > + int ret; > + > + memset(fb, 0, sizeof(*fb)); > + > + bpp =3D igt_drm_format_to_bpp(format); > + ret =3D create_bigbo_for_fb(fd, width, height, bpp, tiled, > + &fb->gem_handle, &fb->size, &fb->stride); > + if (ret < 0) > + return ret; > + > + memset(handles, 0, sizeof(handles)); > + handles[0] =3D fb->gem_handle; > + memset(pitches, 0, sizeof(pitches)); > + pitches[0] =3D fb->stride; > + memset(offsets, 0, sizeof(offsets)); > + if (drmModeAddFB2(fd, width, height, format, handles, pitches, > + offsets, &fb_id, 0) < 0) { > + gem_close(fd, fb->gem_handle); > + > + return 0; > + } > + > + fb->width =3D width; > + fb->height =3D height; > + fb->tiling =3D tiled; > + fb->drm_format =3D format; > + fb->fb_id =3D fb_id; > + > + return fb_id; > +} Could we avoid a bit of code duplication with something like this? create_bo_for_fb(..., bo_size) { ... if (bo_size =3D=3D 0) bo_size =3D size; gem_handle =3D gem_create(fd, bo_size); ... } igt_create_fb_with_bo_size(xxx, bo_size) { ... create_bo_for_fb(..., bo_size); ... } igt_create_fb(xxx) { return igt_create_fb_with_bo_size(xxx, 0); } Otherwise looks pretty good. > + > static void run_test_on_crtc_set(struct test_output *o, int *crtc_idxs, > int crtc_count, int duration_ms) > { > @@ -1252,9 +1331,15 @@ static void run_test_on_crtc_set(struct test_outpu= t *o, int *crtc_idxs, > o->fb_ids[0] =3D igt_create_fb(drm_fd, o->fb_width, o->fb_height, > igt_bpp_depth_to_drm_format(o->bpp, o->depth), > tiled, &o->fb_info[0]); > - o->fb_ids[1] =3D igt_create_fb(drm_fd, o->fb_width, o->fb_height, > - igt_bpp_depth_to_drm_format(o->bpp, o->depth), > - tiled, &o->fb_info[1]); > + if (o->flags & TEST_BO_TOOBIG) { > + o->fb_ids[1] =3D igt_create_fb_with_bigbo(drm_fd, o->fb_width, o->fb_h= eight, > + igt_bpp_depth_to_drm_format(o->bpp, o->depth), > + tiled, &o->fb_info[1]); > + } else { > + o->fb_ids[1] =3D igt_create_fb(drm_fd, o->fb_width, o->fb_height, > + igt_bpp_depth_to_drm_format(o->bpp, o->depth), > + tiled, &o->fb_info[1]); > + } > o->fb_ids[2] =3D igt_create_fb(drm_fd, o->fb_width, o->fb_height, > igt_bpp_depth_to_drm_format(o->bpp, o->depth), > true, &o->fb_info[2]); > @@ -1264,7 +1349,8 @@ static void run_test_on_crtc_set(struct test_output= *o, int *crtc_idxs, > igt_require(o->fb_ids[2]); > = > paint_flip_mode(&o->fb_info[0], false); > - paint_flip_mode(&o->fb_info[1], true); > + if (!(o->flags & TEST_BO_TOOBIG)) > + paint_flip_mode(&o->fb_info[1], true); > if (o->fb_ids[2]) > paint_flip_mode(&o->fb_info[2], true); > = > @@ -1288,10 +1374,15 @@ static void run_test_on_crtc_set(struct test_outp= ut *o, int *crtc_idxs, > if (o->flags & TEST_CHECK_TS) > sleep(1); > = > - igt_assert(do_page_flip(o, o->fb_ids[1], true) =3D=3D 0); > + if (o->flags & TEST_BO_TOOBIG) { > + igt_assert(do_page_flip(o, o->fb_ids[1], true) =3D=3D -E2BIG); > + goto out; > + } else > + igt_assert(do_page_flip(o, o->fb_ids[1], true) =3D=3D 0); > wait_for_events(o); > = > o->current_fb_id =3D 1; > + > if (o->flags & TEST_FLIP) > o->flip_state.seq_step =3D 1; > else > @@ -1543,6 +1634,7 @@ int main(int argc, char **argv) > { 10, TEST_VBLANK | TEST_DPMS | TEST_SUSPEND | TEST_TS_CONT, "dpms-vs-= suspend" }, > { 0, TEST_VBLANK | TEST_MODESET | TEST_RPM | TEST_TS_CONT, "modeset-vs= -rpm" }, > { 0, TEST_VBLANK | TEST_MODESET | TEST_SUSPEND | TEST_TS_CONT, "modese= t-vs-suspend" }, > + { 0, TEST_BO_TOOBIG | TEST_NO_2X_OUTPUT, "bo-too-big" }, > }; > int i; > = > -- = > 1.9.0 > = > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- = Ville Syrj=E4l=E4 Intel OTC