Commit abb7700d authored by Daniel Vetter's avatar Daniel Vetter
Browse files

Merge tag 'drm-intel-fixes-2021-09-30' of... 

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

 into drm-fixes

drm/i915 fixes for v5.15-rc4:
- Fix GVT scheduler ww lock usage
- Fix pdfdocs documentation build
- Fix request early tracepoints
- Fix an invalid warning from rps worker

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
From: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/87lf3ev44z.fsf@intel.com
parents 05812b97 4b8bcaf8

drivers/gpu/drm/i915/gt/intel_rps.c

+0 −2
Original line number Diff line number Diff line
@@ -882,8 +882,6 @@ void intel_rps_park(struct intel_rps *rps) 
	if (!intel_rps_is_enabled(rps))

		return;



	GEM_BUG_ON(atomic_read(&rps->num_waiters));



	if (!intel_rps_clear_active(rps))

		return;

drivers/gpu/drm/i915/gt/uc/abi/guc_communication_ctb_abi.h

+5 −5
Original line number Diff line number Diff line
@@ -102,11 +102,11 @@ static_assert(sizeof(struct guc_ct_buffer_desc) == 64); 
 *  |   +-------+--------------------------------------------------------------+

 *  |   |   7:0 | NUM_DWORDS = length (in dwords) of the embedded HXG message  |

 *  +---+-------+--------------------------------------------------------------+

 *  | 1 |  31:0 |  +--------------------------------------------------------+  |

 *  +---+-------+  |                                                        |  |

 *  |...|       |  |  Embedded `HXG Message`_                               |  |

 *  +---+-------+  |                                                        |  |

 *  | n |  31:0 |  +--------------------------------------------------------+  |

 *  | 1 |  31:0 |                                                              |

 *  +---+-------+                                                              |

 *  |...|       | [Embedded `HXG Message`_]                                    |

 *  +---+-------+                                                              |

 *  | n |  31:0 |                                                              |

 *  +---+-------+--------------------------------------------------------------+

 */

drivers/gpu/drm/i915/gt/uc/abi/guc_communication_mmio_abi.h

+5 −5
Original line number Diff line number Diff line
@@ -38,11 +38,11 @@ 
 *  +---+-------+--------------------------------------------------------------+

 *  |   | Bits  | Description                                                  |

 *  +===+=======+==============================================================+

 *  | 0 |  31:0 |  +--------------------------------------------------------+  |

 *  +---+-------+  |                                                        |  |

 *  |...|       |  |  Embedded `HXG Message`_                               |  |

 *  +---+-------+  |                                                        |  |

 *  | n |  31:0 |  +--------------------------------------------------------+  |

 *  | 0 |  31:0 |                                                              |

 *  +---+-------+                                                              |

 *  |...|       | [Embedded `HXG Message`_]                                    |

 *  +---+-------+                                                              |

 *  | n |  31:0 |                                                              |

 *  +---+-------+--------------------------------------------------------------+

 */

drivers/gpu/drm/i915/gvt/scheduler.c

+2 −2
Original line number Diff line number Diff line
@@ -576,7 +576,7 @@ static int prepare_shadow_batch_buffer(struct intel_vgpu_workload *workload) 


			/* No one is going to touch shadow bb from now on. */

			i915_gem_object_flush_map(bb->obj);

			i915_gem_object_unlock(bb->obj);

			i915_gem_ww_ctx_fini(&ww);

		}

	}

	return 0;
@@ -630,7 +630,7 @@ static int prepare_shadow_wa_ctx(struct intel_shadow_wa_ctx *wa_ctx) 
		return ret;

	}



	i915_gem_object_unlock(wa_ctx->indirect_ctx.obj);

	i915_gem_ww_ctx_fini(&ww);



	/* FIXME: we are not tracking our pinned VMA leaving it

	 * up to the core to fix up the stray pin_count upon

drivers/gpu/drm/i915/i915_request.c

+2 −9
Original line number Diff line number Diff line
@@ -829,8 +829,6 @@ static void __i915_request_ctor(void *arg) 
	i915_sw_fence_init(&rq->submit, submit_notify);

	i915_sw_fence_init(&rq->semaphore, semaphore_notify);



	dma_fence_init(&rq->fence, &i915_fence_ops, &rq->lock, 0, 0);



	rq->capture_list = NULL;



	init_llist_head(&rq->execute_cb);
@@ -905,17 +903,12 @@ __i915_request_create(struct intel_context *ce, gfp_t gfp) 
	rq->ring = ce->ring;

	rq->execution_mask = ce->engine->mask;



	kref_init(&rq->fence.refcount);

	rq->fence.flags = 0;

	rq->fence.error = 0;

	INIT_LIST_HEAD(&rq->fence.cb_list);



	ret = intel_timeline_get_seqno(tl, rq, &seqno);

	if (ret)

		goto err_free;



	rq->fence.context = tl->fence_context;

	rq->fence.seqno = seqno;

	dma_fence_init(&rq->fence, &i915_fence_ops, &rq->lock,

		       tl->fence_context, seqno);



	RCU_INIT_POINTER(rq->timeline, tl);

	rq->hwsp_seqno = tl->hwsp_seqno;