fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-03-12 04:40:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

panfrost: Remove 32-bit next_job path

Browse source 
It has been unused for a while; let's just remove the abstraction.
Technically the hardware does support 32-bit job descriptors, but we
don't and we can't keep them from breaking so let's not pretend they
work.

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Suggested-by: Boris Brezillon <boris.brezillon@collabora.com>
This commit is contained in:
Alyssa Rosenzweig 2019-12-27 13:03:22 -05:00
parent 95ba661b49
commit 65e5c1942a
3 changed files with 4 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/gallium/drivers/panfrost/pan_scoreboard.c
View file

@ -100,17 +100,6 @@
*
*/
/* Accessor to set the next job field */
static void
panfrost_set_job_next(struct mali_job_descriptor_header *first, mali_ptr next)
{
if (first->job_descriptor_size)
first->next_job_64 = (u64) (uintptr_t) next;
else
first->next_job_32 = (u32) (uintptr_t) next;
}
/* Coerce a panfrost_transfer to a header */
static inline struct mali_job_descriptor_header *
@ -452,7 +441,7 @@ panfrost_scoreboard_link_batch(struct panfrost_batch *batch)
if (tail) {
/* Link us to the last node */
panfrost_set_job_next(tail, addr);
tail->next_job = addr;
} else {
/* We are the first/last node */
batch->first_job.cpu = (uint8_t *) n;

6
src/panfrost/include/panfrost-job.h
View file

@ -620,11 +620,7 @@ struct mali_job_descriptor_header {
u16 job_index;
u16 job_dependency_index_1;
u16 job_dependency_index_2;
union {
u64 next_job_64;
u32 next_job_32;
};
u64 next_job;
} __attribute__((packed));
/* These concern exception_status */

8
src/panfrost/pandecode/decode.c
View file

@ -2962,16 +2962,12 @@ pandecode_jc(mali_ptr jc_gpu_va, bool bifrost, unsigned gpu_id)
if (!first) {
pandecode_log("((struct mali_job_descriptor_header *) (uintptr_t) job_%d_p)->", job_no - 1);
if (last_size)
pandecode_log_cont("next_job_64 = job_%d_p;\n\n", job_no);
else
pandecode_log_cont("next_job_32 = (u32) (uintptr_t) job_%d_p;\n\n", job_no);
pandecode_log_cont("next_job = job_%d_p;\n\n", job_no);
}
first = false;
} while ((jc_gpu_va = h->job_descriptor_size ? h->next_job_64 : h->next_job_32));
} while ((jc_gpu_va = h->next_job));
return start_number;
}