|
@@ -338,7 +338,7 @@ static void guc_stage_desc_init(struct intel_guc *guc,
|
|
|
|
|
|
for_each_engine_masked(engine, dev_priv, client->engines, tmp) {
|
|
|
struct intel_context *ce = &ctx->engine[engine->id];
|
|
|
- uint32_t guc_engine_id = engine->guc_id;
|
|
|
+ u32 guc_engine_id = engine->guc_id;
|
|
|
struct guc_execlist_context *lrc = &desc->lrc[guc_engine_id];
|
|
|
|
|
|
/* TODO: We have a design issue to be solved here. Only when we
|
|
@@ -388,13 +388,13 @@ static void guc_stage_desc_init(struct intel_guc *guc,
|
|
|
gfx_addr = guc_ggtt_offset(client->vma);
|
|
|
desc->db_trigger_phy = sg_dma_address(client->vma->pages->sgl) +
|
|
|
client->doorbell_offset;
|
|
|
- desc->db_trigger_cpu = (uintptr_t)__get_doorbell(client);
|
|
|
+ desc->db_trigger_cpu = (u64)__get_doorbell(client);
|
|
|
desc->db_trigger_uk = gfx_addr + client->doorbell_offset;
|
|
|
desc->process_desc = gfx_addr + client->proc_desc_offset;
|
|
|
desc->wq_addr = gfx_addr + GUC_DB_SIZE;
|
|
|
desc->wq_size = GUC_WQ_SIZE;
|
|
|
|
|
|
- desc->desc_private = (uintptr_t)client;
|
|
|
+ desc->desc_private = (u64)client;
|
|
|
}
|
|
|
|
|
|
static void guc_stage_desc_fini(struct intel_guc *guc,
|
|
@@ -755,8 +755,8 @@ static int guc_init_doorbell_hw(struct intel_guc *guc)
|
|
|
*/
|
|
|
static struct i915_guc_client *
|
|
|
guc_client_alloc(struct drm_i915_private *dev_priv,
|
|
|
- uint32_t engines,
|
|
|
- uint32_t priority,
|
|
|
+ u32 engines,
|
|
|
+ u32 priority,
|
|
|
struct i915_gem_context *ctx)
|
|
|
{
|
|
|
struct i915_guc_client *client;
|