mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-24 17:59:32 +00:00
drm/i915/guc: Reset GuC ADS during sanitize
GuC stores some data in there, which might be stale after a reset. Reinitialize whole ADS in case any part of it was corrupted during previous GuC run. v2: s/reinit/init, update functions descriptions (Tomek/Michal) v3: reset ADS right before fw upload Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com> Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> Cc: MichaĹ Winiarski <michal.winiarski@intel.com> Cc: Tomasz Lis <tomasz.lis@intel.com> Reviewed-by: Tomasz Lis <tomasz.lis@intel.com> #v2 Reviewed-by: MichaĹ Winiarski <michal.winiarski@intel.com> #v2 Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Link: https://patchwork.freedesktop.org/patch/msgid/20190527183613.17076-5-michal.wajdeczko@intel.com
This commit is contained in:
parent
ffd5ce22fa
commit
386e300fe9
3 changed files with 63 additions and 32 deletions
|
@ -72,43 +72,28 @@ static void guc_ct_pool_entries_init(struct guc_ct_pool_entry *pool, u32 num)
|
|||
*/
|
||||
#define LR_HW_CONTEXT_SIZE (80 * sizeof(u32))
|
||||
|
||||
/**
|
||||
* intel_guc_ads_create() - creates GuC ADS
|
||||
* @guc: intel_guc struct
|
||||
*
|
||||
*/
|
||||
int intel_guc_ads_create(struct intel_guc *guc)
|
||||
/* The ads obj includes the struct itself and buffers passed to GuC */
|
||||
struct __guc_ads_blob {
|
||||
struct guc_ads ads;
|
||||
struct guc_policies policies;
|
||||
struct guc_mmio_reg_state reg_state;
|
||||
struct guc_gt_system_info system_info;
|
||||
struct guc_clients_info clients_info;
|
||||
struct guc_ct_pool_entry ct_pool[GUC_CT_POOL_SIZE];
|
||||
u8 reg_state_buffer[GUC_S3_SAVE_SPACE_PAGES * PAGE_SIZE];
|
||||
} __packed;
|
||||
|
||||
static int __guc_ads_init(struct intel_guc *guc)
|
||||
{
|
||||
struct drm_i915_private *dev_priv = guc_to_i915(guc);
|
||||
struct i915_vma *vma;
|
||||
/* The ads obj includes the struct itself and buffers passed to GuC */
|
||||
struct {
|
||||
struct guc_ads ads;
|
||||
struct guc_policies policies;
|
||||
struct guc_mmio_reg_state reg_state;
|
||||
struct guc_gt_system_info system_info;
|
||||
struct guc_clients_info clients_info;
|
||||
struct guc_ct_pool_entry ct_pool[GUC_CT_POOL_SIZE];
|
||||
u8 reg_state_buffer[GUC_S3_SAVE_SPACE_PAGES * PAGE_SIZE];
|
||||
} __packed *blob;
|
||||
struct __guc_ads_blob *blob;
|
||||
const u32 skipped_size = LRC_PPHWSP_SZ * PAGE_SIZE + LR_HW_CONTEXT_SIZE;
|
||||
u32 base;
|
||||
u8 engine_class;
|
||||
int ret;
|
||||
|
||||
GEM_BUG_ON(guc->ads_vma);
|
||||
|
||||
vma = intel_guc_allocate_vma(guc, PAGE_ALIGN(sizeof(*blob)));
|
||||
if (IS_ERR(vma))
|
||||
return PTR_ERR(vma);
|
||||
|
||||
guc->ads_vma = vma;
|
||||
|
||||
blob = i915_gem_object_pin_map(guc->ads_vma->obj, I915_MAP_WB);
|
||||
if (IS_ERR(blob)) {
|
||||
ret = PTR_ERR(blob);
|
||||
goto err_vma;
|
||||
}
|
||||
if (IS_ERR(blob))
|
||||
return PTR_ERR(blob);
|
||||
|
||||
/* GuC scheduling policies */
|
||||
guc_policies_init(&blob->policies);
|
||||
|
@ -143,7 +128,7 @@ int intel_guc_ads_create(struct intel_guc *guc)
|
|||
blob->system_info.vebox_enable_mask = VEBOX_MASK(dev_priv);
|
||||
blob->system_info.vdbox_sfc_support_mask = RUNTIME_INFO(dev_priv)->vdbox_sfc_access;
|
||||
|
||||
base = intel_guc_ggtt_offset(guc, vma);
|
||||
base = intel_guc_ggtt_offset(guc, guc->ads_vma);
|
||||
|
||||
/* Clients info */
|
||||
guc_ct_pool_entries_init(blob->ct_pool, ARRAY_SIZE(blob->ct_pool));
|
||||
|
@ -162,6 +147,34 @@ int intel_guc_ads_create(struct intel_guc *guc)
|
|||
i915_gem_object_unpin_map(guc->ads_vma->obj);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* intel_guc_ads_create() - allocates and initializes GuC ADS.
|
||||
* @guc: intel_guc struct
|
||||
*
|
||||
* GuC needs memory block (Additional Data Struct), where it will store
|
||||
* some data. Allocate and initialize such memory block for GuC use.
|
||||
*/
|
||||
int intel_guc_ads_create(struct intel_guc *guc)
|
||||
{
|
||||
const u32 size = PAGE_ALIGN(sizeof(struct __guc_ads_blob));
|
||||
struct i915_vma *vma;
|
||||
int ret;
|
||||
|
||||
GEM_BUG_ON(guc->ads_vma);
|
||||
|
||||
vma = intel_guc_allocate_vma(guc, size);
|
||||
if (IS_ERR(vma))
|
||||
return PTR_ERR(vma);
|
||||
|
||||
guc->ads_vma = vma;
|
||||
|
||||
ret = __guc_ads_init(guc);
|
||||
if (ret)
|
||||
goto err_vma;
|
||||
|
||||
return 0;
|
||||
|
||||
err_vma:
|
||||
i915_vma_unpin_and_release(&guc->ads_vma, 0);
|
||||
|
@ -172,3 +185,18 @@ void intel_guc_ads_destroy(struct intel_guc *guc)
|
|||
{
|
||||
i915_vma_unpin_and_release(&guc->ads_vma, 0);
|
||||
}
|
||||
|
||||
/**
|
||||
* intel_guc_ads_reset() - prepares GuC Additional Data Struct for reuse
|
||||
* @guc: intel_guc struct
|
||||
*
|
||||
* GuC stores some data in ADS, which might be stale after a reset.
|
||||
* Reinitialize whole ADS in case any part of it was corrupted during
|
||||
* previous GuC run.
|
||||
*/
|
||||
void intel_guc_ads_reset(struct intel_guc *guc)
|
||||
{
|
||||
if (!guc->ads_vma)
|
||||
return;
|
||||
__guc_ads_init(guc);
|
||||
}
|
||||
|
|
|
@ -29,5 +29,6 @@ struct intel_guc;
|
|||
|
||||
int intel_guc_ads_create(struct intel_guc *guc);
|
||||
void intel_guc_ads_destroy(struct intel_guc *guc);
|
||||
void intel_guc_ads_reset(struct intel_guc *guc);
|
||||
|
||||
#endif
|
||||
|
|
|
@ -24,8 +24,9 @@
|
|||
|
||||
#include "gt/intel_reset.h"
|
||||
#include "intel_uc.h"
|
||||
#include "intel_guc_submission.h"
|
||||
#include "intel_guc.h"
|
||||
#include "intel_guc_ads.h"
|
||||
#include "intel_guc_submission.h"
|
||||
#include "i915_drv.h"
|
||||
|
||||
static void guc_free_load_err_log(struct intel_guc *guc);
|
||||
|
@ -414,6 +415,7 @@ int intel_uc_init_hw(struct drm_i915_private *i915)
|
|||
goto err_out;
|
||||
}
|
||||
|
||||
intel_guc_ads_reset(guc);
|
||||
intel_guc_init_params(guc);
|
||||
ret = intel_guc_fw_upload(guc);
|
||||
if (ret == 0)
|
||||
|
|
Loading…
Reference in a new issue