diff options
| author | Alyssa Rosenzweig <[email protected]> | 2020-07-07 17:23:09 -0400 |
|---|---|---|
| committer | Alyssa Rosenzweig <[email protected]> | 2020-07-09 12:03:08 -0400 |
| commit | 1fdeef5e4a11f0590f443b805b53be842f745018 (patch) | |
| tree | 8f468a48b0069b5678811b82fab65696c7e22e0f /src | |
| parent | 7ec6ee405789c9835ef50407ab8c948e513d4a9d (diff) | |
panfrost: Move scoreboarding routines to common
Signed-off-by: Alyssa Rosenzweig <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5827>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gallium/drivers/panfrost/Makefile.sources | 1 | ||||
| -rw-r--r-- | src/gallium/drivers/panfrost/meson.build | 1 | ||||
| -rw-r--r-- | src/panfrost/Makefile.sources | 2 | ||||
| -rw-r--r-- | src/panfrost/encoder/meson.build | 1 | ||||
| -rw-r--r-- | src/panfrost/encoder/pan_scoreboard.c (renamed from src/gallium/drivers/panfrost/pan_scoreboard.c) | 7 | ||||
| -rw-r--r-- | src/panfrost/encoder/pan_scoreboard.h (renamed from src/gallium/drivers/panfrost/pan_scoreboard.h) | 3 |
6 files changed, 9 insertions, 6 deletions
diff --git a/src/gallium/drivers/panfrost/Makefile.sources b/src/gallium/drivers/panfrost/Makefile.sources index 4688754672c..3ce48b2c50b 100644 --- a/src/gallium/drivers/panfrost/Makefile.sources +++ b/src/gallium/drivers/panfrost/Makefile.sources @@ -22,7 +22,6 @@ C_SOURCES := \ pan_public.h \ pan_resource.c \ pan_resource.h \ - pan_scoreboard.c \ pan_screen.c \ pan_screen.h \ pan_sfbd.c \ diff --git a/src/gallium/drivers/panfrost/meson.build b/src/gallium/drivers/panfrost/meson.build index 154d05a7344..f71a4cc2db5 100644 --- a/src/gallium/drivers/panfrost/meson.build +++ b/src/gallium/drivers/panfrost/meson.build @@ -38,7 +38,6 @@ files_panfrost = files( 'pan_cmdstream.c', 'pan_compute.c', 'pan_fragment.c', - 'pan_scoreboard.c', 'pan_sfbd.c', 'pan_mfbd.c', ) diff --git a/src/panfrost/Makefile.sources b/src/panfrost/Makefile.sources index d085b763e3e..4efd694b3a7 100644 --- a/src/panfrost/Makefile.sources +++ b/src/panfrost/Makefile.sources @@ -33,6 +33,8 @@ encoder_FILES := \ encoder/pan_pool.h \ encoder/pan_props.c \ encoder/pan_sampler.c \ + encoder/pan_scoreboard.c \ + encoder/pan_scoreboard.h \ encoder/pan_tiler.c \ encoder/pan_texture.c \ encoder/pan_scratch.c \ diff --git a/src/panfrost/encoder/meson.build b/src/panfrost/encoder/meson.build index 2e5baea4fc5..e7b28e16338 100644 --- a/src/panfrost/encoder/meson.build +++ b/src/panfrost/encoder/meson.build @@ -30,6 +30,7 @@ libpanfrost_encoder_files = files( 'pan_sampler.c', 'pan_tiler.c', 'pan_texture.c', + 'pan_scoreboard.c', 'pan_scratch.c', 'pan_pool.c', 'pan_props.c', diff --git a/src/gallium/drivers/panfrost/pan_scoreboard.c b/src/panfrost/encoder/pan_scoreboard.c index d2cc0568789..c72c9a37c3a 100644 --- a/src/gallium/drivers/panfrost/pan_scoreboard.c +++ b/src/panfrost/encoder/pan_scoreboard.c @@ -22,11 +22,10 @@ * */ -#include "pan_context.h" -#include "pan_job.h" -#include "pan_pool.h" +#include <string.h> +#include "pan_scoreboard.h" +#include "pan_device.h" #include "panfrost-quirks.h" -#include "util/bitset.h" /* * There are various types of Mali jobs: diff --git a/src/gallium/drivers/panfrost/pan_scoreboard.h b/src/panfrost/encoder/pan_scoreboard.h index 329635f095a..71667d4b5de 100644 --- a/src/gallium/drivers/panfrost/pan_scoreboard.h +++ b/src/panfrost/encoder/pan_scoreboard.h @@ -27,6 +27,9 @@ #ifndef __PAN_SCOREBOARD_H__ #define __PAN_SCOREBOARD_H__ +#include "panfrost-job.h" +#include "pan_pool.h" + struct pan_scoreboard { /* The first job in the batch */ mali_ptr first_job; |