Unknown, so future, gen are marked as -1 which we want to treat as -1u so that always pass >= gen checks.
Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/2298 Signed-off-by: Chris Wilson <[email protected]> Cc: Zbigniew Kempczyński <[email protected]> --- lib/intel_batchbuffer.c | 10 +++++----- lib/intel_batchbuffer.h | 10 ++++++---- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/lib/intel_batchbuffer.c b/lib/intel_batchbuffer.c index 99c2e1489..375f11962 100644 --- a/lib/intel_batchbuffer.c +++ b/lib/intel_batchbuffer.c @@ -412,7 +412,7 @@ intel_blt_copy(struct intel_batchbuffer *batch, drm_intel_bo *dst_bo, int dst_x1, int dst_y1, int dst_pitch, int width, int height, int bpp) { - const int gen = batch->gen; + const unsigned int gen = batch->gen; uint32_t src_tiling, dst_tiling, swizzle; uint32_t cmd_bits = 0; uint32_t br13_bits; @@ -551,7 +551,7 @@ unsigned igt_buf_height(const struct igt_buf *buf) * Returns: * The width of the ccs buffer data. */ -unsigned int igt_buf_intel_ccs_width(int gen, const struct igt_buf *buf) +unsigned int igt_buf_intel_ccs_width(unsigned int gen, const struct igt_buf *buf) { /* * GEN12+: The CCS unit size is 64 bytes mapping 4 main surface @@ -574,7 +574,7 @@ unsigned int igt_buf_intel_ccs_width(int gen, const struct igt_buf *buf) * Returns: * The height of the ccs buffer data. */ -unsigned int igt_buf_intel_ccs_height(int gen, const struct igt_buf *buf) +unsigned int igt_buf_intel_ccs_height(unsigned int gen, const struct igt_buf *buf) { /* * GEN12+: The CCS unit size is 64 bytes mapping 4 main surface @@ -701,7 +701,7 @@ fill_object(struct drm_i915_gem_exec_object2 *obj, uint32_t gem_handle, static void exec_blit(int fd, struct drm_i915_gem_exec_object2 *objs, uint32_t count, - int gen) + unsigned int gen) { struct drm_i915_gem_execbuffer2 exec = { .buffers_ptr = to_user_pointer(objs), @@ -2024,7 +2024,7 @@ void intel_bb_emit_blt_copy(struct intel_bb *ibb, int dst_x1, int dst_y1, int dst_pitch, int width, int height, int bpp) { - const int gen = ibb->gen; + const unsigned int gen = ibb->gen; uint32_t cmd_bits = 0; uint32_t br13_bits; uint32_t mask; diff --git a/lib/intel_batchbuffer.h b/lib/intel_batchbuffer.h index a69fffd8d..cfe743edc 100644 --- a/lib/intel_batchbuffer.h +++ b/lib/intel_batchbuffer.h @@ -15,7 +15,7 @@ struct intel_batchbuffer { drm_intel_bufmgr *bufmgr; uint32_t devid; - int gen; + unsigned int gen; drm_intel_context *ctx; drm_intel_bo *bo; @@ -263,8 +263,10 @@ static inline bool igt_buf_compressed(const struct igt_buf *buf) unsigned igt_buf_width(const struct igt_buf *buf); unsigned igt_buf_height(const struct igt_buf *buf); -unsigned int igt_buf_intel_ccs_width(int gen, const struct igt_buf *buf); -unsigned int igt_buf_intel_ccs_height(int gen, const struct igt_buf *buf); +unsigned int igt_buf_intel_ccs_width(unsigned int gen, + const struct igt_buf *buf); +unsigned int igt_buf_intel_ccs_height(unsigned int gen, + const struct igt_buf *buf); void igt_blitter_src_copy(int fd, /* src */ @@ -431,7 +433,7 @@ igt_media_spinfunc_t igt_get_media_spinfunc(int devid); */ struct intel_bb { int i915; - int gen; + unsigned int gen; bool debug; bool enforce_relocs; uint32_t devid; -- 2.28.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
