UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/i915: New structure to contain GuC logging related fields 

So far there were 2 fields related to GuC logs in 'intel_guc' structure.
For the support of capturing GuC logs & storing them in a local buffer,
multiple new fields would have to be added. This warrants a separate
structure to contain the fields related to GuC logging state.
Added a new structure 'intel_guc_log' and instance of it inside
'intel_guc' structure.

v2: Rebase.

Signed-off-by: Akash Goel <akash.goel@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
This commit is contained in:
Akash Goel 2016-10-12 21:54:29 +05:30 committed by Tvrtko Ursulin
parent 5d34e85a9e
commit d6b40b4b17
4 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/drm/i915/i915_debugfs.c
View File

@ -2500,10 +2500,10 @@ static int i915_guc_log_dump(struct seq_file *m, void *data)
struct drm_i915_gem_object *obj; struct drm_i915_gem_object *obj;
int i = 0, pg; int i = 0, pg;
if (!dev_priv->guc.log_vma) if (!dev_priv->guc.log.vma)
return 0; return 0;
obj = dev_priv->guc.log_vma->obj; obj = dev_priv->guc.log.vma->obj;
for (pg = 0; pg < obj->base.size / PAGE_SIZE; pg++) { for (pg = 0; pg < obj->base.size / PAGE_SIZE; pg++) {
u32 *log = kmap_atomic(i915_gem_object_get_page(obj, pg)); u32 *log = kmap_atomic(i915_gem_object_get_page(obj, pg));

8
drivers/gpu/drm/i915/i915_guc_submission.c
View File

@ -862,7 +862,7 @@ static void guc_log_create(struct intel_guc *guc)
GUC_LOG_ISR_PAGES + 1 + GUC_LOG_ISR_PAGES + 1 +
GUC_LOG_CRASH_PAGES + 1) << PAGE_SHIFT; GUC_LOG_CRASH_PAGES + 1) << PAGE_SHIFT;
vma = guc->log_vma; vma = guc->log.vma;
if (!vma) { if (!vma) {
vma = guc_allocate_vma(guc, size); vma = guc_allocate_vma(guc, size);
if (IS_ERR(vma)) { if (IS_ERR(vma)) {
@ -871,7 +871,7 @@ static void guc_log_create(struct intel_guc *guc)
return; return;
} }
guc->log_vma = vma; guc->log.vma = vma;
} }
/* each allocated unit is a page */ /* each allocated unit is a page */
@ -881,7 +881,7 @@ static void guc_log_create(struct intel_guc *guc)
(GUC_LOG_CRASH_PAGES << GUC_LOG_CRASH_SHIFT); (GUC_LOG_CRASH_PAGES << GUC_LOG_CRASH_SHIFT);
offset = i915_ggtt_offset(vma) >> PAGE_SHIFT; /* in pages */ offset = i915_ggtt_offset(vma) >> PAGE_SHIFT; /* in pages */
guc->log_flags = (offset << GUC_LOG_BUF_ADDR_SHIFT) | flags; guc->log.flags = (offset << GUC_LOG_BUF_ADDR_SHIFT) | flags;
} }
static void guc_policies_init(struct guc_policies *policies) static void guc_policies_init(struct guc_policies *policies)
@ -1065,7 +1065,7 @@ void i915_guc_submission_fini(struct drm_i915_private *dev_priv)
struct intel_guc *guc = &dev_priv->guc; struct intel_guc *guc = &dev_priv->guc;
i915_vma_unpin_and_release(&guc->ads_vma); i915_vma_unpin_and_release(&guc->ads_vma);
i915_vma_unpin_and_release(&guc->log_vma); i915_vma_unpin_and_release(&guc->log.vma);
if (guc->ctx_pool_vma) if (guc->ctx_pool_vma)
ida_destroy(&guc->ctx_ids); ida_destroy(&guc->ctx_ids);

8
drivers/gpu/drm/i915/intel_guc.h
View File

@ -123,10 +123,14 @@ struct intel_guc_fw {
uint32_t ucode_offset; uint32_t ucode_offset;
}; };
struct intel_guc_log {
uint32_t flags;
struct i915_vma *vma;
};
struct intel_guc { struct intel_guc {
struct intel_guc_fw guc_fw; struct intel_guc_fw guc_fw;
uint32_t log_flags; struct intel_guc_log log;
struct i915_vma *log_vma;
struct i915_vma *ads_vma; struct i915_vma *ads_vma;
struct i915_vma *ctx_pool_vma; struct i915_vma *ctx_pool_vma;

2
drivers/gpu/drm/i915/intel_guc_loader.c
View File

@ -211,7 +211,7 @@ static void guc_params_init(struct drm_i915_private *dev_priv)
params[GUC_CTL_FEATURE] |= GUC_CTL_DISABLE_SCHEDULER | params[GUC_CTL_FEATURE] |= GUC_CTL_DISABLE_SCHEDULER |
GUC_CTL_VCS2_ENABLED; GUC_CTL_VCS2_ENABLED;
params[GUC_CTL_LOG_PARAMS] = guc->log_flags; params[GUC_CTL_LOG_PARAMS] = guc->log.flags;
if (i915.guc_log_level >= 0) { if (i915.guc_log_level >= 0) {
params[GUC_CTL_DEBUG] = params[GUC_CTL_DEBUG] =