diff --git a/.pick_status.json b/.pick_status.json index be10d4455e9..408eb5f10be 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1390,7 +1390,7 @@ "description": "panfrost: Add the tiler heap to fragment jobs", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": null }, diff --git a/src/gallium/drivers/panfrost/pan_job.c b/src/gallium/drivers/panfrost/pan_job.c index 301ce459b21..2b453f7ae7e 100644 --- a/src/gallium/drivers/panfrost/pan_job.c +++ b/src/gallium/drivers/panfrost/pan_job.c @@ -978,9 +978,9 @@ panfrost_batch_submit_ioctl(struct panfrost_batch *batch, panfrost_pool_get_bo_handles(&batch->invisible_pool, bo_handles + submit.bo_handle_count); submit.bo_handle_count += panfrost_pool_num_bos(&batch->invisible_pool); - /* Used by all tiler jobs (XXX: skip for compute-only) */ - if (!(reqs & PANFROST_JD_REQ_FS)) - bo_handles[submit.bo_handle_count++] = dev->tiler_heap->gem_handle; + /* Used by all tiler jobs, and occasionally by fragment jobs. + * (XXX: skip for compute-only) */ + bo_handles[submit.bo_handle_count++] = dev->tiler_heap->gem_handle; submit.bo_handles = (u64) (uintptr_t) bo_handles; ret = drmIoctl(dev->fd, DRM_IOCTL_PANFROST_SUBMIT, &submit);