Skip to content

Commit 28bef5b

Browse files
rodrigovividanvet
authored andcommitted
drm/i915/guc: Remove sample_forcewake h2g action
This action is no-op in the GuC side for a few versions already and it is getting entirely removed soon, in an upcoming version. Time to remove before we face communication issues. Cc: Vinay Belgaumkar <[email protected]> Signed-off-by: Rodrigo Vivi <[email protected]> Signed-off-by: Matthew Brost <[email protected]> Acked-by: Michal Wajdeczko <[email protected]> Reviewed-by: Matthew Brost <[email protected]> Signed-off-by: Daniel Vetter <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent 8bb9fbc commit 28bef5b

File tree

4 files changed

+0
-25
lines changed

4 files changed

+0
-25
lines changed

drivers/gpu/drm/i915/gt/uc/intel_guc.c

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -469,22 +469,6 @@ int intel_guc_to_host_process_recv_msg(struct intel_guc *guc,
469469
return 0;
470470
}
471471

472-
int intel_guc_sample_forcewake(struct intel_guc *guc)
473-
{
474-
struct drm_i915_private *dev_priv = guc_to_gt(guc)->i915;
475-
u32 action[2];
476-
477-
action[0] = INTEL_GUC_ACTION_SAMPLE_FORCEWAKE;
478-
/* WaRsDisableCoarsePowerGating:skl,cnl */
479-
if (!HAS_RC6(dev_priv) || NEEDS_WaRsDisableCoarsePowerGating(dev_priv))
480-
action[1] = 0;
481-
else
482-
/* bit 0 and 1 are for Render and Media domain separately */
483-
action[1] = GUC_FORCEWAKE_RENDER | GUC_FORCEWAKE_MEDIA;
484-
485-
return intel_guc_send(guc, action, ARRAY_SIZE(action));
486-
}
487-
488472
/**
489473
* intel_guc_auth_huc() - Send action to GuC to authenticate HuC ucode
490474
* @guc: intel_guc structure

drivers/gpu/drm/i915/gt/uc/intel_guc.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,6 @@ int intel_guc_send_mmio(struct intel_guc *guc, const u32 *action, u32 len,
128128
u32 *response_buf, u32 response_buf_size);
129129
int intel_guc_to_host_process_recv_msg(struct intel_guc *guc,
130130
const u32 *payload, u32 len);
131-
int intel_guc_sample_forcewake(struct intel_guc *guc);
132131
int intel_guc_auth_huc(struct intel_guc *guc, u32 rsa_offset);
133132
int intel_guc_suspend(struct intel_guc *guc);
134133
int intel_guc_resume(struct intel_guc *guc);

drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -302,9 +302,6 @@ struct guc_ct_buffer_desc {
302302
#define GUC_CT_MSG_ACTION_SHIFT 16
303303
#define GUC_CT_MSG_ACTION_MASK 0xFFFF
304304

305-
#define GUC_FORCEWAKE_RENDER (1 << 0)
306-
#define GUC_FORCEWAKE_MEDIA (1 << 1)
307-
308305
#define GUC_POWER_UNSPECIFIED 0
309306
#define GUC_POWER_D0 1
310307
#define GUC_POWER_D1 2
@@ -558,7 +555,6 @@ enum intel_guc_action {
558555
INTEL_GUC_ACTION_ENTER_S_STATE = 0x501,
559556
INTEL_GUC_ACTION_EXIT_S_STATE = 0x502,
560557
INTEL_GUC_ACTION_SLPC_REQUEST = 0x3003,
561-
INTEL_GUC_ACTION_SAMPLE_FORCEWAKE = 0x3005,
562558
INTEL_GUC_ACTION_AUTHENTICATE_HUC = 0x4000,
563559
INTEL_GUC_ACTION_REGISTER_COMMAND_TRANSPORT_BUFFER = 0x4505,
564560
INTEL_GUC_ACTION_DEREGISTER_COMMAND_TRANSPORT_BUFFER = 0x4506,

drivers/gpu/drm/i915/gt/uc/intel_uc.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -502,10 +502,6 @@ static int __uc_init_hw(struct intel_uc *uc)
502502

503503
intel_huc_auth(huc);
504504

505-
ret = intel_guc_sample_forcewake(guc);
506-
if (ret)
507-
goto err_log_capture;
508-
509505
if (intel_uc_uses_guc_submission(uc))
510506
intel_guc_submission_enable(guc);
511507

0 commit comments

Comments
 (0)