From bbe91576b7f5d69dc201f411cce5e619498cfef5 Mon Sep 17 00:00:00 2001 From: Chia-I Wu Date: Sun, 8 Mar 2015 04:26:45 +0800 Subject: ilo: move intel_winsys.h to core Add a new subdirectory and start moving files that do not depend on ilo_screen/ilo_context to it. --- src/gallium/drivers/ilo/Makefile.sources | 2 +- src/gallium/drivers/ilo/core/intel_winsys.h | 329 ++++++++++++++++++++++++ src/gallium/drivers/ilo/ilo_builder.h | 2 +- src/gallium/drivers/ilo/ilo_builder_3d_bottom.h | 2 +- src/gallium/drivers/ilo/ilo_builder_3d_top.h | 2 +- src/gallium/drivers/ilo/ilo_builder_blt.h | 2 +- src/gallium/drivers/ilo/ilo_builder_decode.c | 2 +- src/gallium/drivers/ilo/ilo_builder_media.h | 2 +- src/gallium/drivers/ilo/ilo_builder_mi.h | 2 +- src/gallium/drivers/ilo/ilo_builder_render.h | 2 +- src/gallium/drivers/ilo/ilo_cp.c | 2 +- src/gallium/drivers/ilo/ilo_cp.h | 2 +- src/gallium/drivers/ilo/ilo_draw.c | 2 +- src/gallium/drivers/ilo/ilo_query.c | 2 +- src/gallium/drivers/ilo/ilo_render.c | 2 +- src/gallium/drivers/ilo/ilo_resource.h | 2 +- src/gallium/drivers/ilo/ilo_screen.c | 2 +- src/gallium/drivers/ilo/ilo_shader.c | 2 +- src/gallium/drivers/ilo/ilo_state_3d.h | 2 +- src/gallium/drivers/ilo/intel_winsys.h | 329 ------------------------ src/gallium/winsys/intel/drm/intel_drm_winsys.c | 2 +- 21 files changed, 348 insertions(+), 348 deletions(-) create mode 100644 src/gallium/drivers/ilo/core/intel_winsys.h delete mode 100644 src/gallium/drivers/ilo/intel_winsys.h (limited to 'src') diff --git a/src/gallium/drivers/ilo/Makefile.sources b/src/gallium/drivers/ilo/Makefile.sources index b07362f4f9a..dbdfffe7a4f 100644 --- a/src/gallium/drivers/ilo/Makefile.sources +++ b/src/gallium/drivers/ilo/Makefile.sources @@ -1,4 +1,5 @@ C_SOURCES := \ + core/intel_winsys.h \ ilo_blit.c \ ilo_blit.h \ ilo_blitter.c \ @@ -56,7 +57,6 @@ C_SOURCES := \ ilo_transfer.h \ ilo_video.c \ ilo_video.h \ - intel_winsys.h \ \ shader/ilo_shader_cs.c \ shader/ilo_shader_fs.c \ diff --git a/src/gallium/drivers/ilo/core/intel_winsys.h b/src/gallium/drivers/ilo/core/intel_winsys.h new file mode 100644 index 00000000000..afd038c45f3 --- /dev/null +++ b/src/gallium/drivers/ilo/core/intel_winsys.h @@ -0,0 +1,329 @@ +/* + * Mesa 3-D graphics library + * + * Copyright (C) 2012-2014 LunarG, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included + * in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + * + * Authors: + * Chia-I Wu + */ + +#ifndef INTEL_WINSYS_H +#define INTEL_WINSYS_H + +#include "pipe/p_compiler.h" + +/* this is compatible with i915_drm.h's definitions */ +enum intel_ring_type { + INTEL_RING_RENDER = 1, + INTEL_RING_BSD = 2, + INTEL_RING_BLT = 3, + INTEL_RING_VEBOX = 4, +}; + +/* this is compatible with i915_drm.h's definitions */ +enum intel_exec_flag { + INTEL_EXEC_GEN7_SOL_RESET = 1 << 8, +}; + +/* this is compatible with i915_drm.h's definitions */ +enum intel_reloc_flag { + INTEL_RELOC_FENCE = 1 << 0, + INTEL_RELOC_GGTT = 1 << 1, + INTEL_RELOC_WRITE = 1 << 2, +}; + +/* this is compatible with i915_drm.h's definitions */ +enum intel_tiling_mode { + INTEL_TILING_NONE = 0, + INTEL_TILING_X = 1, + INTEL_TILING_Y = 2, +}; + +struct winsys_handle; +struct intel_winsys; +struct intel_context; +struct intel_bo; + +struct intel_winsys_info { + int devid; + + /* the sizes of the aperture in bytes */ + size_t aperture_total; + size_t aperture_mappable; + + bool has_llc; + bool has_address_swizzling; + bool has_logical_context; + bool has_ppgtt; + + /* valid registers for intel_winsys_read_reg() */ + bool has_timestamp; + + /* valid flags for intel_winsys_submit_bo() */ + bool has_gen7_sol_reset; +}; + +void +intel_winsys_destroy(struct intel_winsys *winsys); + +const struct intel_winsys_info * +intel_winsys_get_info(const struct intel_winsys *winsys); + +/** + * Create a logical context for use with the render ring. + */ +struct intel_context * +intel_winsys_create_context(struct intel_winsys *winsys); + +/** + * Destroy a logical context. + */ +void +intel_winsys_destroy_context(struct intel_winsys *winsys, + struct intel_context *ctx); + +/** + * Read a register. Only registers that are considered safe, such as + * + * TIMESTAMP (0x2358) + * + * can be read. + */ +int +intel_winsys_read_reg(struct intel_winsys *winsys, + uint32_t reg, uint64_t *val); + +/** + * Return the numbers of submissions lost due to GPU reset. + * + * \param active_lost Number of lost active/guilty submissions + * \param pending_lost Number of lost pending/innocent submissions + */ +int +intel_winsys_get_reset_stats(struct intel_winsys *winsys, + struct intel_context *ctx, + uint32_t *active_lost, + uint32_t *pending_lost); +/** + * Allocate a buffer object. + * + * \param name Informative description of the bo. + * \param size Size of the bo. + * \param cpu_init Will be initialized by CPU. + */ +struct intel_bo * +intel_winsys_alloc_bo(struct intel_winsys *winsys, + const char *name, + unsigned long size, + bool cpu_init); + +/** + * Create a bo from a user memory pointer. Both \p userptr and \p size must + * be page aligned. + */ +struct intel_bo * +intel_winsys_import_userptr(struct intel_winsys *winsys, + const char *name, + void *userptr, + unsigned long size, + unsigned long flags); + +/** + * Create a bo from a winsys handle. + */ +struct intel_bo * +intel_winsys_import_handle(struct intel_winsys *winsys, + const char *name, + const struct winsys_handle *handle, + unsigned long height, + enum intel_tiling_mode *tiling, + unsigned long *pitch); + +/** + * Export \p bo as a winsys handle for inter-process sharing. \p tiling and + * \p pitch must match those set by \p intel_bo_set_tiling(). + */ +int +intel_winsys_export_handle(struct intel_winsys *winsys, + struct intel_bo *bo, + enum intel_tiling_mode tiling, + unsigned long pitch, + unsigned long height, + struct winsys_handle *handle); + +/** + * Return true when buffer objects directly specified in \p bo_array, and + * those indirectly referenced by them, can fit in the aperture space. + */ +bool +intel_winsys_can_submit_bo(struct intel_winsys *winsys, + struct intel_bo **bo_array, + int count); + +/** + * Submit \p bo for execution. + * + * \p bo and all bos referenced by \p bo will be considered busy until all + * commands are parsed and executed. \p ctx is ignored when the bo is not + * submitted to the render ring. + */ +int +intel_winsys_submit_bo(struct intel_winsys *winsys, + enum intel_ring_type ring, + struct intel_bo *bo, int used, + struct intel_context *ctx, + unsigned long flags); + +/** + * Decode the commands contained in \p bo. For debugging. + * + * \param bo Batch buffer to decode. + * \param used Size of the commands in bytes. + */ +void +intel_winsys_decode_bo(struct intel_winsys *winsys, + struct intel_bo *bo, int used); + +/** + * Increase the reference count of \p bo. No-op when \p bo is NULL. + */ +struct intel_bo * +intel_bo_ref(struct intel_bo *bo); + +/** + * Decrease the reference count of \p bo. When the reference count reaches + * zero, \p bo is destroyed. No-op when \p bo is NULL. + */ +void +intel_bo_unref(struct intel_bo *bo); + +/** + * Set the tiling of \p bo. The info is used by GTT mapping and bo export. + */ +int +intel_bo_set_tiling(struct intel_bo *bo, + enum intel_tiling_mode tiling, + unsigned long pitch); + +/** + * Map \p bo for CPU access. Recursive mapping is allowed. + * + * map() maps the backing store into CPU address space, cached. It will block + * if the bo is busy. This variant allows fastest random reads and writes, + * but the caller needs to handle tiling or swizzling manually if the bo is + * tiled or swizzled. If write is enabled and there is no shared last-level + * cache (LLC), the CPU cache will be flushed, which is expensive. + * + * map_gtt() maps the bo for MMIO access, uncached but write-combined. It + * will block if the bo is busy. This variant promises a reasonable speed for + * sequential writes, but reads would be very slow. Callers always have a + * linear view of the bo. + * + * map_async() and map_gtt_async() work similar to map() and map_gtt() + * respectively, except that they do not block. + */ +void * +intel_bo_map(struct intel_bo *bo, bool write_enable); + +void * +intel_bo_map_async(struct intel_bo *bo); + +void * +intel_bo_map_gtt(struct intel_bo *bo); + +void * +intel_bo_map_gtt_async(struct intel_bo *bo); + +/** + * Unmap \p bo. + */ +void +intel_bo_unmap(struct intel_bo *bo); + +/** + * Write data to \p bo. + */ +int +intel_bo_pwrite(struct intel_bo *bo, unsigned long offset, + unsigned long size, const void *data); + +/** + * Read data from the bo. + */ +int +intel_bo_pread(struct intel_bo *bo, unsigned long offset, + unsigned long size, void *data); + +/** + * Add \p target_bo to the relocation list. + * + * When \p bo is submitted for execution, and if \p target_bo has moved, + * the kernel will patch \p bo at \p offset to \p target_bo->offset plus + * \p target_offset. + * + * \p presumed_offset should be written to \p bo at \p offset. + */ +int +intel_bo_add_reloc(struct intel_bo *bo, uint32_t offset, + struct intel_bo *target_bo, uint32_t target_offset, + uint32_t flags, uint64_t *presumed_offset); + +/** + * Return the current number of relocations. + */ +int +intel_bo_get_reloc_count(struct intel_bo *bo); + +/** + * Truncate all relocations except the first \p start ones. + * + * Combined with \p intel_bo_get_reloc_count(), they can be used to undo the + * \p intel_bo_add_reloc() calls that were just made. + */ +void +intel_bo_truncate_relocs(struct intel_bo *bo, int start); + +/** + * Return true if \p target_bo is on the relocation list of \p bo, or on + * the relocation list of some bo that is referenced by \p bo. + */ +bool +intel_bo_has_reloc(struct intel_bo *bo, struct intel_bo *target_bo); + +/** + * Wait until \bo is idle, or \p timeout nanoseconds have passed. A + * negative timeout means to wait indefinitely. + * + * \return 0 only when \p bo is idle + */ +int +intel_bo_wait(struct intel_bo *bo, int64_t timeout); + +/** + * Return true if \p bo is busy. + */ +static inline bool +intel_bo_is_busy(struct intel_bo *bo) +{ + return (intel_bo_wait(bo, 0) != 0); +} + +#endif /* INTEL_WINSYS_H */ diff --git a/src/gallium/drivers/ilo/ilo_builder.h b/src/gallium/drivers/ilo/ilo_builder.h index e0e9f535928..6e58a6b45da 100644 --- a/src/gallium/drivers/ilo/ilo_builder.h +++ b/src/gallium/drivers/ilo/ilo_builder.h @@ -28,7 +28,7 @@ #ifndef ILO_BUILDER_H #define ILO_BUILDER_H -#include "intel_winsys.h" +#include "core/intel_winsys.h" #include "ilo_common.h" enum ilo_builder_writer_type { diff --git a/src/gallium/drivers/ilo/ilo_builder_3d_bottom.h b/src/gallium/drivers/ilo/ilo_builder_3d_bottom.h index 4f203d1e9f5..cad8bf275e9 100644 --- a/src/gallium/drivers/ilo/ilo_builder_3d_bottom.h +++ b/src/gallium/drivers/ilo/ilo_builder_3d_bottom.h @@ -29,7 +29,7 @@ #define ILO_BUILDER_3D_BOTTOM_H #include "genhw/genhw.h" -#include "intel_winsys.h" +#include "core/intel_winsys.h" #include "ilo_common.h" #include "ilo_format.h" diff --git a/src/gallium/drivers/ilo/ilo_builder_3d_top.h b/src/gallium/drivers/ilo/ilo_builder_3d_top.h index b968beb35c5..9fa53050dff 100644 --- a/src/gallium/drivers/ilo/ilo_builder_3d_top.h +++ b/src/gallium/drivers/ilo/ilo_builder_3d_top.h @@ -29,7 +29,7 @@ #define ILO_BUILDER_3D_TOP_H #include "genhw/genhw.h" -#include "intel_winsys.h" +#include "core/intel_winsys.h" #include "ilo_common.h" #include "ilo_resource.h" diff --git a/src/gallium/drivers/ilo/ilo_builder_blt.h b/src/gallium/drivers/ilo/ilo_builder_blt.h index 327f6988cba..72aa5c35afa 100644 --- a/src/gallium/drivers/ilo/ilo_builder_blt.h +++ b/src/gallium/drivers/ilo/ilo_builder_blt.h @@ -29,7 +29,7 @@ #define ILO_BUILDER_BLT_H #include "genhw/genhw.h" -#include "intel_winsys.h" +#include "core/intel_winsys.h" #include "ilo_common.h" #include "ilo_builder.h" diff --git a/src/gallium/drivers/ilo/ilo_builder_decode.c b/src/gallium/drivers/ilo/ilo_builder_decode.c index 0bc0bb46767..039346aa5de 100644 --- a/src/gallium/drivers/ilo/ilo_builder_decode.c +++ b/src/gallium/drivers/ilo/ilo_builder_decode.c @@ -29,7 +29,7 @@ #include #include "genhw/genhw.h" #include "shader/toy_compiler.h" -#include "intel_winsys.h" +#include "core/intel_winsys.h" #include "ilo_builder.h" static const uint32_t * diff --git a/src/gallium/drivers/ilo/ilo_builder_media.h b/src/gallium/drivers/ilo/ilo_builder_media.h index f5d634f28e1..ed269441f9d 100644 --- a/src/gallium/drivers/ilo/ilo_builder_media.h +++ b/src/gallium/drivers/ilo/ilo_builder_media.h @@ -29,7 +29,7 @@ #define ILO_BUILDER_MEDIA_H #include "genhw/genhw.h" -#include "intel_winsys.h" +#include "core/intel_winsys.h" #include "ilo_common.h" #include "ilo_shader.h" diff --git a/src/gallium/drivers/ilo/ilo_builder_mi.h b/src/gallium/drivers/ilo/ilo_builder_mi.h index 65ffc65e8b1..a34edc7d7e0 100644 --- a/src/gallium/drivers/ilo/ilo_builder_mi.h +++ b/src/gallium/drivers/ilo/ilo_builder_mi.h @@ -29,7 +29,7 @@ #define ILO_BUILDER_MI_H #include "genhw/genhw.h" -#include "intel_winsys.h" +#include "core/intel_winsys.h" #include "ilo_common.h" #include "ilo_builder.h" diff --git a/src/gallium/drivers/ilo/ilo_builder_render.h b/src/gallium/drivers/ilo/ilo_builder_render.h index 34a2e2c2486..33d5a9249fb 100644 --- a/src/gallium/drivers/ilo/ilo_builder_render.h +++ b/src/gallium/drivers/ilo/ilo_builder_render.h @@ -29,7 +29,7 @@ #define ILO_BUILDER_RENDER_H #include "genhw/genhw.h" -#include "intel_winsys.h" +#include "core/intel_winsys.h" #include "ilo_common.h" #include "ilo_builder.h" diff --git a/src/gallium/drivers/ilo/ilo_cp.c b/src/gallium/drivers/ilo/ilo_cp.c index 9d2dffd5e16..4cbb2d75c9e 100644 --- a/src/gallium/drivers/ilo/ilo_cp.c +++ b/src/gallium/drivers/ilo/ilo_cp.c @@ -25,7 +25,7 @@ * Chia-I Wu */ -#include "intel_winsys.h" +#include "core/intel_winsys.h" #include "ilo_builder_mi.h" #include "ilo_shader.h" diff --git a/src/gallium/drivers/ilo/ilo_cp.h b/src/gallium/drivers/ilo/ilo_cp.h index dcab55b6ee2..364a06a3b44 100644 --- a/src/gallium/drivers/ilo/ilo_cp.h +++ b/src/gallium/drivers/ilo/ilo_cp.h @@ -28,7 +28,7 @@ #ifndef ILO_CP_H #define ILO_CP_H -#include "intel_winsys.h" +#include "core/intel_winsys.h" #include "ilo_builder.h" #include "ilo_common.h" diff --git a/src/gallium/drivers/ilo/ilo_draw.c b/src/gallium/drivers/ilo/ilo_draw.c index 02e5225f4cd..fc91fd312d2 100644 --- a/src/gallium/drivers/ilo/ilo_draw.c +++ b/src/gallium/drivers/ilo/ilo_draw.c @@ -26,7 +26,7 @@ */ #include "util/u_prim.h" -#include "intel_winsys.h" +#include "core/intel_winsys.h" #include "ilo_render.h" #include "ilo_blit.h" diff --git a/src/gallium/drivers/ilo/ilo_query.c b/src/gallium/drivers/ilo/ilo_query.c index 7a2e5030e00..b3329bc3ce1 100644 --- a/src/gallium/drivers/ilo/ilo_query.c +++ b/src/gallium/drivers/ilo/ilo_query.c @@ -25,7 +25,7 @@ * Chia-I Wu */ -#include "intel_winsys.h" +#include "core/intel_winsys.h" #include "ilo_context.h" #include "ilo_cp.h" diff --git a/src/gallium/drivers/ilo/ilo_render.c b/src/gallium/drivers/ilo/ilo_render.c index af18e89744f..227faed8c58 100644 --- a/src/gallium/drivers/ilo/ilo_render.c +++ b/src/gallium/drivers/ilo/ilo_render.c @@ -27,7 +27,7 @@ #include "genhw/genhw.h" #include "util/u_prim.h" -#include "intel_winsys.h" +#include "core/intel_winsys.h" #include "ilo_builder.h" #include "ilo_builder_mi.h" diff --git a/src/gallium/drivers/ilo/ilo_resource.h b/src/gallium/drivers/ilo/ilo_resource.h index be42386b8e8..930f4e9c9af 100644 --- a/src/gallium/drivers/ilo/ilo_resource.h +++ b/src/gallium/drivers/ilo/ilo_resource.h @@ -28,7 +28,7 @@ #ifndef ILO_RESOURCE_H #define ILO_RESOURCE_H -#include "intel_winsys.h" +#include "core/intel_winsys.h" #include "ilo_common.h" #include "ilo_layout.h" diff --git a/src/gallium/drivers/ilo/ilo_screen.c b/src/gallium/drivers/ilo/ilo_screen.c index 80ea4c75241..d34c8394e64 100644 --- a/src/gallium/drivers/ilo/ilo_screen.c +++ b/src/gallium/drivers/ilo/ilo_screen.c @@ -31,7 +31,7 @@ #include "vl/vl_decoder.h" #include "vl/vl_video_buffer.h" #include "genhw/genhw.h" /* for GEN6_REG_TIMESTAMP */ -#include "intel_winsys.h" +#include "core/intel_winsys.h" #include "ilo_context.h" #include "ilo_format.h" diff --git a/src/gallium/drivers/ilo/ilo_shader.c b/src/gallium/drivers/ilo/ilo_shader.c index 0798ccc8186..aa7826b6c32 100644 --- a/src/gallium/drivers/ilo/ilo_shader.c +++ b/src/gallium/drivers/ilo/ilo_shader.c @@ -27,7 +27,7 @@ #include "genhw/genhw.h" /* for SBE setup */ #include "tgsi/tgsi_parse.h" -#include "intel_winsys.h" +#include "core/intel_winsys.h" #include "shader/ilo_shader_internal.h" #include "ilo_builder.h" diff --git a/src/gallium/drivers/ilo/ilo_state_3d.h b/src/gallium/drivers/ilo/ilo_state_3d.h index cb4b89a7c04..78f55a96af8 100644 --- a/src/gallium/drivers/ilo/ilo_state_3d.h +++ b/src/gallium/drivers/ilo/ilo_state_3d.h @@ -29,7 +29,7 @@ #define ILO_STATE_3D_H #include "genhw/genhw.h" -#include "intel_winsys.h" +#include "core/intel_winsys.h" #include "ilo_common.h" #include "ilo_state.h" diff --git a/src/gallium/drivers/ilo/intel_winsys.h b/src/gallium/drivers/ilo/intel_winsys.h deleted file mode 100644 index afd038c45f3..00000000000 --- a/src/gallium/drivers/ilo/intel_winsys.h +++ /dev/null @@ -1,329 +0,0 @@ -/* - * Mesa 3-D graphics library - * - * Copyright (C) 2012-2014 LunarG, Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - * - * Authors: - * Chia-I Wu - */ - -#ifndef INTEL_WINSYS_H -#define INTEL_WINSYS_H - -#include "pipe/p_compiler.h" - -/* this is compatible with i915_drm.h's definitions */ -enum intel_ring_type { - INTEL_RING_RENDER = 1, - INTEL_RING_BSD = 2, - INTEL_RING_BLT = 3, - INTEL_RING_VEBOX = 4, -}; - -/* this is compatible with i915_drm.h's definitions */ -enum intel_exec_flag { - INTEL_EXEC_GEN7_SOL_RESET = 1 << 8, -}; - -/* this is compatible with i915_drm.h's definitions */ -enum intel_reloc_flag { - INTEL_RELOC_FENCE = 1 << 0, - INTEL_RELOC_GGTT = 1 << 1, - INTEL_RELOC_WRITE = 1 << 2, -}; - -/* this is compatible with i915_drm.h's definitions */ -enum intel_tiling_mode { - INTEL_TILING_NONE = 0, - INTEL_TILING_X = 1, - INTEL_TILING_Y = 2, -}; - -struct winsys_handle; -struct intel_winsys; -struct intel_context; -struct intel_bo; - -struct intel_winsys_info { - int devid; - - /* the sizes of the aperture in bytes */ - size_t aperture_total; - size_t aperture_mappable; - - bool has_llc; - bool has_address_swizzling; - bool has_logical_context; - bool has_ppgtt; - - /* valid registers for intel_winsys_read_reg() */ - bool has_timestamp; - - /* valid flags for intel_winsys_submit_bo() */ - bool has_gen7_sol_reset; -}; - -void -intel_winsys_destroy(struct intel_winsys *winsys); - -const struct intel_winsys_info * -intel_winsys_get_info(const struct intel_winsys *winsys); - -/** - * Create a logical context for use with the render ring. - */ -struct intel_context * -intel_winsys_create_context(struct intel_winsys *winsys); - -/** - * Destroy a logical context. - */ -void -intel_winsys_destroy_context(struct intel_winsys *winsys, - struct intel_context *ctx); - -/** - * Read a register. Only registers that are considered safe, such as - * - * TIMESTAMP (0x2358) - * - * can be read. - */ -int -intel_winsys_read_reg(struct intel_winsys *winsys, - uint32_t reg, uint64_t *val); - -/** - * Return the numbers of submissions lost due to GPU reset. - * - * \param active_lost Number of lost active/guilty submissions - * \param pending_lost Number of lost pending/innocent submissions - */ -int -intel_winsys_get_reset_stats(struct intel_winsys *winsys, - struct intel_context *ctx, - uint32_t *active_lost, - uint32_t *pending_lost); -/** - * Allocate a buffer object. - * - * \param name Informative description of the bo. - * \param size Size of the bo. - * \param cpu_init Will be initialized by CPU. - */ -struct intel_bo * -intel_winsys_alloc_bo(struct intel_winsys *winsys, - const char *name, - unsigned long size, - bool cpu_init); - -/** - * Create a bo from a user memory pointer. Both \p userptr and \p size must - * be page aligned. - */ -struct intel_bo * -intel_winsys_import_userptr(struct intel_winsys *winsys, - const char *name, - void *userptr, - unsigned long size, - unsigned long flags); - -/** - * Create a bo from a winsys handle. - */ -struct intel_bo * -intel_winsys_import_handle(struct intel_winsys *winsys, - const char *name, - const struct winsys_handle *handle, - unsigned long height, - enum intel_tiling_mode *tiling, - unsigned long *pitch); - -/** - * Export \p bo as a winsys handle for inter-process sharing. \p tiling and - * \p pitch must match those set by \p intel_bo_set_tiling(). - */ -int -intel_winsys_export_handle(struct intel_winsys *winsys, - struct intel_bo *bo, - enum intel_tiling_mode tiling, - unsigned long pitch, - unsigned long height, - struct winsys_handle *handle); - -/** - * Return true when buffer objects directly specified in \p bo_array, and - * those indirectly referenced by them, can fit in the aperture space. - */ -bool -intel_winsys_can_submit_bo(struct intel_winsys *winsys, - struct intel_bo **bo_array, - int count); - -/** - * Submit \p bo for execution. - * - * \p bo and all bos referenced by \p bo will be considered busy until all - * commands are parsed and executed. \p ctx is ignored when the bo is not - * submitted to the render ring. - */ -int -intel_winsys_submit_bo(struct intel_winsys *winsys, - enum intel_ring_type ring, - struct intel_bo *bo, int used, - struct intel_context *ctx, - unsigned long flags); - -/** - * Decode the commands contained in \p bo. For debugging. - * - * \param bo Batch buffer to decode. - * \param used Size of the commands in bytes. - */ -void -intel_winsys_decode_bo(struct intel_winsys *winsys, - struct intel_bo *bo, int used); - -/** - * Increase the reference count of \p bo. No-op when \p bo is NULL. - */ -struct intel_bo * -intel_bo_ref(struct intel_bo *bo); - -/** - * Decrease the reference count of \p bo. When the reference count reaches - * zero, \p bo is destroyed. No-op when \p bo is NULL. - */ -void -intel_bo_unref(struct intel_bo *bo); - -/** - * Set the tiling of \p bo. The info is used by GTT mapping and bo export. - */ -int -intel_bo_set_tiling(struct intel_bo *bo, - enum intel_tiling_mode tiling, - unsigned long pitch); - -/** - * Map \p bo for CPU access. Recursive mapping is allowed. - * - * map() maps the backing store into CPU address space, cached. It will block - * if the bo is busy. This variant allows fastest random reads and writes, - * but the caller needs to handle tiling or swizzling manually if the bo is - * tiled or swizzled. If write is enabled and there is no shared last-level - * cache (LLC), the CPU cache will be flushed, which is expensive. - * - * map_gtt() maps the bo for MMIO access, uncached but write-combined. It - * will block if the bo is busy. This variant promises a reasonable speed for - * sequential writes, but reads would be very slow. Callers always have a - * linear view of the bo. - * - * map_async() and map_gtt_async() work similar to map() and map_gtt() - * respectively, except that they do not block. - */ -void * -intel_bo_map(struct intel_bo *bo, bool write_enable); - -void * -intel_bo_map_async(struct intel_bo *bo); - -void * -intel_bo_map_gtt(struct intel_bo *bo); - -void * -intel_bo_map_gtt_async(struct intel_bo *bo); - -/** - * Unmap \p bo. - */ -void -intel_bo_unmap(struct intel_bo *bo); - -/** - * Write data to \p bo. - */ -int -intel_bo_pwrite(struct intel_bo *bo, unsigned long offset, - unsigned long size, const void *data); - -/** - * Read data from the bo. - */ -int -intel_bo_pread(struct intel_bo *bo, unsigned long offset, - unsigned long size, void *data); - -/** - * Add \p target_bo to the relocation list. - * - * When \p bo is submitted for execution, and if \p target_bo has moved, - * the kernel will patch \p bo at \p offset to \p target_bo->offset plus - * \p target_offset. - * - * \p presumed_offset should be written to \p bo at \p offset. - */ -int -intel_bo_add_reloc(struct intel_bo *bo, uint32_t offset, - struct intel_bo *target_bo, uint32_t target_offset, - uint32_t flags, uint64_t *presumed_offset); - -/** - * Return the current number of relocations. - */ -int -intel_bo_get_reloc_count(struct intel_bo *bo); - -/** - * Truncate all relocations except the first \p start ones. - * - * Combined with \p intel_bo_get_reloc_count(), they can be used to undo the - * \p intel_bo_add_reloc() calls that were just made. - */ -void -intel_bo_truncate_relocs(struct intel_bo *bo, int start); - -/** - * Return true if \p target_bo is on the relocation list of \p bo, or on - * the relocation list of some bo that is referenced by \p bo. - */ -bool -intel_bo_has_reloc(struct intel_bo *bo, struct intel_bo *target_bo); - -/** - * Wait until \bo is idle, or \p timeout nanoseconds have passed. A - * negative timeout means to wait indefinitely. - * - * \return 0 only when \p bo is idle - */ -int -intel_bo_wait(struct intel_bo *bo, int64_t timeout); - -/** - * Return true if \p bo is busy. - */ -static inline bool -intel_bo_is_busy(struct intel_bo *bo) -{ - return (intel_bo_wait(bo, 0) != 0); -} - -#endif /* INTEL_WINSYS_H */ diff --git a/src/gallium/winsys/intel/drm/intel_drm_winsys.c b/src/gallium/winsys/intel/drm/intel_drm_winsys.c index b5ffceb7e65..1c5aabe3304 100644 --- a/src/gallium/winsys/intel/drm/intel_drm_winsys.c +++ b/src/gallium/winsys/intel/drm/intel_drm_winsys.c @@ -41,7 +41,7 @@ #include "util/u_inlines.h" #include "util/u_memory.h" #include "util/u_debug.h" -#include "ilo/intel_winsys.h" +#include "ilo/core/intel_winsys.h" #include "intel_drm_public.h" struct intel_winsys { -- cgit v1.2.3