Commit 05097b19 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-fixes-2021-12-29' of... 

Merge tag 'drm-intel-fixes-2021-12-29' of git://anongit.freedesktop.org/drm/drm-intel

 into drm-fixes

drm/i915 fixes for v5.16:
- Fix possible uninitialized variable
- Fix composite fence seqno icrement on each fence creation

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/87h7ark5r5.fsf@intel.com
parents fc74e0a4 d46f329a

drivers/gpu/drm/i915/gem/i915_gem_context.c

+1 −1
Original line number Diff line number Diff line
@@ -564,6 +564,7 @@ set_proto_ctx_engines_parallel_submit(struct i915_user_extension __user *base, 
		container_of_user(base, typeof(*ext), base);

	const struct set_proto_ctx_engines *set = data;

	struct drm_i915_private *i915 = set->i915;

	struct i915_engine_class_instance prev_engine;

	u64 flags;

	int err = 0, n, i, j;

	u16 slot, width, num_siblings;
@@ -629,7 +630,6 @@ set_proto_ctx_engines_parallel_submit(struct i915_user_extension __user *base, 
	/* Create contexts / engines */

	for (i = 0; i < width; ++i) {

		intel_engine_mask_t current_mask = 0;

		struct i915_engine_class_instance prev_engine;



		for (j = 0; j < num_siblings; ++j) {

			struct i915_engine_class_instance ci;

drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c

+1 −1
Original line number Diff line number Diff line
@@ -3017,7 +3017,7 @@ eb_composite_fence_create(struct i915_execbuffer *eb, int out_fence_fd) 
	fence_array = dma_fence_array_create(eb->num_batches,

					     fences,

					     eb->context->parallel.fence_context,

					     eb->context->parallel.seqno,

					     eb->context->parallel.seqno++,

					     false);

	if (!fence_array) {

		kfree(fences);