mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 17:30:02 +00:00
![Alex Dai](/assets/img/avatar_default.png)
For now, remove the spinlocks that protected the GuC's statistics block and work queue; they are only accessed by code that already holds the global struct_mutex, and so are redundant (until the big struct_mutex rewrite!). The specific problem that the spinlocks caused was that if the work queue was full, the driver would try to spinwait for one jiffy, but with interrupts disabled the jiffy count would not advance, leading to a system hang. The issue was found using test case igt/gem_close_race. The new version will usleep() instead, still holding the struct_mutex but without any spinlocks. v4: Reorganize commit message (Dave Gordon) v3: Remove unnecessary whitespace churn v2: Clean up wq_lock too v1: Clean up host2guc lock as well Signed-off-by: Alex Dai <yu.dai@intel.com> Reviewed-by: Dave Gordon <david.s.gordon@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1449104189-27591-1-git-send-email-yu.dai@intel.com Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
126 lines
3.9 KiB
C
126 lines
3.9 KiB
C
/*
|
|
* Copyright © 2014 Intel Corporation
|
|
*
|
|
* 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 (including the next
|
|
* paragraph) 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.
|
|
*
|
|
*/
|
|
#ifndef _INTEL_GUC_H_
|
|
#define _INTEL_GUC_H_
|
|
|
|
#include "intel_guc_fwif.h"
|
|
#include "i915_guc_reg.h"
|
|
|
|
struct i915_guc_client {
|
|
struct drm_i915_gem_object *client_obj;
|
|
struct intel_context *owner;
|
|
struct intel_guc *guc;
|
|
uint32_t priority;
|
|
uint32_t ctx_index;
|
|
|
|
uint32_t proc_desc_offset;
|
|
uint32_t doorbell_offset;
|
|
uint32_t cookie;
|
|
uint16_t doorbell_id;
|
|
uint16_t padding; /* Maintain alignment */
|
|
|
|
uint32_t wq_offset;
|
|
uint32_t wq_size;
|
|
uint32_t wq_tail;
|
|
|
|
/* GuC submission statistics & status */
|
|
uint64_t submissions[I915_NUM_RINGS];
|
|
uint32_t q_fail;
|
|
uint32_t b_fail;
|
|
int retcode;
|
|
};
|
|
|
|
enum intel_guc_fw_status {
|
|
GUC_FIRMWARE_FAIL = -1,
|
|
GUC_FIRMWARE_NONE = 0,
|
|
GUC_FIRMWARE_PENDING,
|
|
GUC_FIRMWARE_SUCCESS
|
|
};
|
|
|
|
/*
|
|
* This structure encapsulates all the data needed during the process
|
|
* of fetching, caching, and loading the firmware image into the GuC.
|
|
*/
|
|
struct intel_guc_fw {
|
|
struct drm_device * guc_dev;
|
|
const char * guc_fw_path;
|
|
size_t guc_fw_size;
|
|
struct drm_i915_gem_object * guc_fw_obj;
|
|
enum intel_guc_fw_status guc_fw_fetch_status;
|
|
enum intel_guc_fw_status guc_fw_load_status;
|
|
|
|
uint16_t guc_fw_major_wanted;
|
|
uint16_t guc_fw_minor_wanted;
|
|
uint16_t guc_fw_major_found;
|
|
uint16_t guc_fw_minor_found;
|
|
|
|
uint32_t header_size;
|
|
uint32_t header_offset;
|
|
uint32_t rsa_size;
|
|
uint32_t rsa_offset;
|
|
uint32_t ucode_size;
|
|
uint32_t ucode_offset;
|
|
};
|
|
|
|
struct intel_guc {
|
|
struct intel_guc_fw guc_fw;
|
|
uint32_t log_flags;
|
|
struct drm_i915_gem_object *log_obj;
|
|
|
|
struct drm_i915_gem_object *ctx_pool_obj;
|
|
struct ida ctx_ids;
|
|
|
|
struct i915_guc_client *execbuf_client;
|
|
|
|
DECLARE_BITMAP(doorbell_bitmap, GUC_MAX_DOORBELLS);
|
|
uint32_t db_cacheline; /* Cyclic counter mod pagesize */
|
|
|
|
/* Action status & statistics */
|
|
uint64_t action_count; /* Total commands issued */
|
|
uint32_t action_cmd; /* Last command word */
|
|
uint32_t action_status; /* Last return status */
|
|
uint32_t action_fail; /* Total number of failures */
|
|
int32_t action_err; /* Last error code */
|
|
|
|
uint64_t submissions[I915_NUM_RINGS];
|
|
uint32_t last_seqno[I915_NUM_RINGS];
|
|
};
|
|
|
|
/* intel_guc_loader.c */
|
|
extern void intel_guc_ucode_init(struct drm_device *dev);
|
|
extern int intel_guc_ucode_load(struct drm_device *dev);
|
|
extern void intel_guc_ucode_fini(struct drm_device *dev);
|
|
extern const char *intel_guc_fw_status_repr(enum intel_guc_fw_status status);
|
|
extern int intel_guc_suspend(struct drm_device *dev);
|
|
extern int intel_guc_resume(struct drm_device *dev);
|
|
|
|
/* i915_guc_submission.c */
|
|
int i915_guc_submission_init(struct drm_device *dev);
|
|
int i915_guc_submission_enable(struct drm_device *dev);
|
|
int i915_guc_submit(struct i915_guc_client *client,
|
|
struct drm_i915_gem_request *rq);
|
|
void i915_guc_submission_disable(struct drm_device *dev);
|
|
void i915_guc_submission_fini(struct drm_device *dev);
|
|
|
|
#endif
|