From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.3 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D0412C04FF3 for ; Mon, 24 May 2021 10:48:26 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 96DB4610C8 for ; Mon, 24 May 2021 10:48:26 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 96DB4610C8 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8079289D40; Mon, 24 May 2021 10:48:25 +0000 (UTC) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id C2F8D89916; Mon, 24 May 2021 10:48:17 +0000 (UTC) IronPort-SDR: 5SbSCI4xoNNPUD5buvzE1X3EecxCdRMYbd5NuZyXEhZwepr/wvoBGUPgkcxrbIbspQVfeOW4dj vVQKL7hgbTLA== X-IronPort-AV: E=McAfee;i="6200,9189,9993"; a="201928669" X-IronPort-AV: E=Sophos;i="5.82,319,1613462400"; d="scan'208";a="201928669" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 May 2021 03:48:16 -0700 IronPort-SDR: xe+ssaUxAmDUaIAAbUyl6lX472bQEG00m+dVQzlIEX/7+PRzk/9Z8GP2cONn4CCLYCZsLqIwVa LsMGuB9rkTLg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.82,319,1613462400"; d="scan'208";a="629603780" Received: from irvmail001.ir.intel.com ([10.43.11.63]) by fmsmga006.fm.intel.com with ESMTP; 24 May 2021 03:48:13 -0700 Received: from [10.249.134.123] (mwajdecz-MOBL.ger.corp.intel.com [10.249.134.123]) by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id 14OAmCqP001680; Mon, 24 May 2021 11:48:12 +0100 Subject: Re: [RFC PATCH 07/97] drm/i915/guc: Remove sample_forcewake h2g action To: Matthew Brost , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org References: <20210506191451.77768-1-matthew.brost@intel.com> <20210506191451.77768-8-matthew.brost@intel.com> From: Michal Wajdeczko Message-ID: Date: Mon, 24 May 2021 12:48:12 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.10.2 MIME-Version: 1.0 In-Reply-To: <20210506191451.77768-8-matthew.brost@intel.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: tvrtko.ursulin@intel.com, jason.ekstrand@intel.com, daniele.ceraolospurio@intel.com, jon.bloomfield@intel.com, daniel.vetter@intel.com, john.c.harrison@intel.com Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On 06.05.2021 21:13, Matthew Brost wrote: > From: Rodrigo Vivi > > 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 > Signed-off-by: Rodrigo Vivi > Signed-off-by: Matthew Brost Acked-by: Michal Wajdeczko > --- > drivers/gpu/drm/i915/gt/uc/intel_guc.c | 16 ---------------- > drivers/gpu/drm/i915/gt/uc/intel_guc.h | 1 - > drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h | 4 ---- > drivers/gpu/drm/i915/gt/uc/intel_uc.c | 4 ---- > 4 files changed, 25 deletions(-) > > diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc.c b/drivers/gpu/drm/i915/gt/uc/intel_guc.c > index adae04c47aab..ab2c8fe8cdfa 100644 > --- a/drivers/gpu/drm/i915/gt/uc/intel_guc.c > +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc.c > @@ -469,22 +469,6 @@ int intel_guc_to_host_process_recv_msg(struct intel_guc *guc, > return 0; > } > > -int intel_guc_sample_forcewake(struct intel_guc *guc) > -{ > - struct drm_i915_private *dev_priv = guc_to_gt(guc)->i915; > - u32 action[2]; > - > - action[0] = INTEL_GUC_ACTION_SAMPLE_FORCEWAKE; > - /* WaRsDisableCoarsePowerGating:skl,cnl */ > - if (!HAS_RC6(dev_priv) || NEEDS_WaRsDisableCoarsePowerGating(dev_priv)) > - action[1] = 0; > - else > - /* bit 0 and 1 are for Render and Media domain separately */ > - action[1] = GUC_FORCEWAKE_RENDER | GUC_FORCEWAKE_MEDIA; > - > - return intel_guc_send(guc, action, ARRAY_SIZE(action)); > -} > - > /** > * intel_guc_auth_huc() - Send action to GuC to authenticate HuC ucode > * @guc: intel_guc structure > diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc.h b/drivers/gpu/drm/i915/gt/uc/intel_guc.h > index bc2ba7d0626c..c20f3839de12 100644 > --- a/drivers/gpu/drm/i915/gt/uc/intel_guc.h > +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc.h > @@ -128,7 +128,6 @@ int intel_guc_send_mmio(struct intel_guc *guc, const u32 *action, u32 len, > u32 *response_buf, u32 response_buf_size); > int intel_guc_to_host_process_recv_msg(struct intel_guc *guc, > const u32 *payload, u32 len); > -int intel_guc_sample_forcewake(struct intel_guc *guc); > int intel_guc_auth_huc(struct intel_guc *guc, u32 rsa_offset); > int intel_guc_suspend(struct intel_guc *guc); > int intel_guc_resume(struct intel_guc *guc); > diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h b/drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h > index 79c560d9c0b6..0f9afcde1d0b 100644 > --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h > +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h > @@ -302,9 +302,6 @@ struct guc_ct_buffer_desc { > #define GUC_CT_MSG_ACTION_SHIFT 16 > #define GUC_CT_MSG_ACTION_MASK 0xFFFF > > -#define GUC_FORCEWAKE_RENDER (1 << 0) > -#define GUC_FORCEWAKE_MEDIA (1 << 1) > - > #define GUC_POWER_UNSPECIFIED 0 > #define GUC_POWER_D0 1 > #define GUC_POWER_D1 2 > @@ -558,7 +555,6 @@ enum intel_guc_action { > INTEL_GUC_ACTION_ENTER_S_STATE = 0x501, > INTEL_GUC_ACTION_EXIT_S_STATE = 0x502, > INTEL_GUC_ACTION_SLPC_REQUEST = 0x3003, > - INTEL_GUC_ACTION_SAMPLE_FORCEWAKE = 0x3005, > INTEL_GUC_ACTION_AUTHENTICATE_HUC = 0x4000, > INTEL_GUC_ACTION_REGISTER_COMMAND_TRANSPORT_BUFFER = 0x4505, > INTEL_GUC_ACTION_DEREGISTER_COMMAND_TRANSPORT_BUFFER = 0x4506, > diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc.c b/drivers/gpu/drm/i915/gt/uc/intel_uc.c > index 892c1315ce49..ab0789d66e06 100644 > --- a/drivers/gpu/drm/i915/gt/uc/intel_uc.c > +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc.c > @@ -502,10 +502,6 @@ static int __uc_init_hw(struct intel_uc *uc) > > intel_huc_auth(huc); > > - ret = intel_guc_sample_forcewake(guc); > - if (ret) > - goto err_log_capture; > - > if (intel_uc_uses_guc_submission(uc)) > intel_guc_submission_enable(guc); > >