From: Alyssa Rosenzweig Date: Sun, 23 Jun 2019 18:20:00 +0000 (-0700) Subject: panfrost: Clamp tile coordinates before job submission X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=65e9d9b625460ab6e18c58173a1c0a6f72a835ef;p=mesa.git panfrost: Clamp tile coordinates before job submission Fixes TILE_RANGE_FAULT raised on some tests in dEQP-GLES3.functional.fbo.blit.* Signed-off-by: Alyssa Rosenzweig --- diff --git a/src/gallium/drivers/panfrost/pan_fragment.c b/src/gallium/drivers/panfrost/pan_fragment.c index d6b8afdc6b9..5dbca021141 100644 --- a/src/gallium/drivers/panfrost/pan_fragment.c +++ b/src/gallium/drivers/panfrost/pan_fragment.c @@ -69,6 +69,26 @@ panfrost_fragment_job(struct panfrost_context *ctx, bool has_draws) struct panfrost_job *job = panfrost_get_job_for_fbo(ctx); + /* The passed tile coords can be out of range in some cases, so we need + * to clamp them to the framebuffer size to avoid a TILE_RANGE_FAULT. + * Theoretically we also need to clamp the coordinates positive, but we + * avoid that edge case as all four values are unsigned. Also, + * theoretically we could clamp the minima, but if that has to happen + * the asserts would fail anyway (since the maxima would get clamped + * and then be smaller than the minima). An edge case of sorts occurs + * when no scissors are added to draw, so by default min=~0 and max=0. + * But that can't happen if any actual drawing occurs (beyond a + * wallpaper reload), so this is again irrelevant in practice. */ + + job->maxx = MIN2(job->maxx, fb->width); + job->maxy = MIN2(job->maxy, fb->height); + + /* Rendering region must be at least 1x1; otherwise, there is nothing + * to do and the whole job chain should have been discarded. */ + + assert(job->maxx > job->minx); + assert(job->maxy > job->miny); + struct mali_payload_fragment payload = { .min_tile_coord = MALI_COORDINATE_TO_TILE_MIN(job->minx, job->miny), .max_tile_coord = MALI_COORDINATE_TO_TILE_MAX(job->maxx, job->maxy),