panfrost: Stop including pan_device.h from pan_bo.h

We want to define structures containing pan_pool objects in pan_device.h
but it is prevented by the

      pan_device.h -> pan_pool.h -> pan_bo.h
          ^____________________________|

loop.

Break this loop by not including pan_device.h from pan_bo.h.

Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: Alyssa Rosenzweig <alyssa@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8700>
This commit is contained in:
Boris Brezillon 2021-04-06 11:36:34 +02:00 committed by Marge Bot
parent 363c1ef0c0
commit 9a08c9097f
4 changed files with 6 additions and 1 deletions

View File

@ -31,6 +31,7 @@
#include "drm-uapi/panfrost_drm.h"
#include "pan_bo.h"
#include "pan_device.h"
#include "pan_util.h"
#include "wrap.h"

View File

@ -27,7 +27,7 @@
#define __PAN_BO_H__
#include "util/list.h"
#include "pan_device.h"
#include "panfrost-job.h"
#include <time.h>
/* Flags for allocated memory */
@ -68,6 +68,8 @@
/* BO is accessed by the fragment job. */
#define PAN_BO_ACCESS_FRAGMENT (1 << 4)
struct panfrost_device;
struct panfrost_ptr {
/* CPU address */
void *cpu;

View File

@ -24,6 +24,7 @@
*/
#include "pan_bo.h"
#include "pan_device.h"
#include "pan_pool.h"
/* Transient command stream pooling: command stream uploads try to simply copy

View File

@ -34,6 +34,7 @@
#include "compiler/shader_enums.h"
#include "midgard_pack.h"
#include "pan_bo.h"
#include "pan_device.h"
#define PAN_MODIFIER_COUNT 4
extern uint64_t pan_best_modifiers[PAN_MODIFIER_COUNT];