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=-16.7 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,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=unavailable 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 C1BC4C07E99 for ; Mon, 12 Jul 2021 20:12:02 +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 8DAF960FF0 for ; Mon, 12 Jul 2021 20:12:02 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8DAF960FF0 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3F59189EB8; Mon, 12 Jul 2021 20:11:59 +0000 (UTC) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id 55CDF899AB; Mon, 12 Jul 2021 20:11:57 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10043"; a="209864507" X-IronPort-AV: E=Sophos;i="5.84,234,1620716400"; d="scan'208";a="209864507" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jul 2021 13:11:56 -0700 X-IronPort-AV: E=Sophos;i="5.84,234,1620716400"; d="scan'208";a="412701272" Received: from johnharr-mobl1.amr.corp.intel.com (HELO [10.209.125.18]) ([10.209.125.18]) by orsmga003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jul 2021 13:11:56 -0700 To: Matthew Brost , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org References: <20210624070516.21893-1-matthew.brost@intel.com> <20210624070516.21893-34-matthew.brost@intel.com> From: John Harrison Message-ID: <36f5cf81-ccc5-e4b5-a7c1-65af4e30c5b6@intel.com> Date: Mon, 12 Jul 2021 13:11:55 -0700 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 In-Reply-To: <20210624070516.21893-34-matthew.brost@intel.com> Content-Language: en-GB Subject: Re: [Intel-gfx] [PATCH 33/47] drm/i915/guc: Add disable interrupts to guc sanitize X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On 6/24/2021 00:05, Matthew Brost wrote: > Add disable GuC interrupts to intel_guc_sanitize(). Part of this > requires moving the guc_*_interrupt wrapper function into header file > intel_guc.h. > > Signed-off-by: Matthew Brost > Cc: Daniele Ceraolo Spurio > --- > drivers/gpu/drm/i915/gt/uc/intel_guc.h | 16 ++++++++++++++++ > drivers/gpu/drm/i915/gt/uc/intel_uc.c | 21 +++------------------ > 2 files changed, 19 insertions(+), 18 deletions(-) > > diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc.h b/drivers/gpu/drm/i915/gt/uc/intel_guc.h > index 40c9868762d7..85ef6767f13b 100644 > --- a/drivers/gpu/drm/i915/gt/uc/intel_guc.h > +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc.h > @@ -217,9 +217,25 @@ static inline bool intel_guc_is_ready(struct intel_guc *guc) > return intel_guc_is_fw_running(guc) && intel_guc_ct_enabled(&guc->ct); > } > > +static inline void intel_guc_reset_interrupts(struct intel_guc *guc) > +{ > + guc->interrupts.reset(guc); > +} > + > +static inline void intel_guc_enable_interrupts(struct intel_guc *guc) > +{ > + guc->interrupts.enable(guc); > +} > + > +static inline void intel_guc_disable_interrupts(struct intel_guc *guc) > +{ > + guc->interrupts.disable(guc); > +} > + > static inline int intel_guc_sanitize(struct intel_guc *guc) > { > intel_uc_fw_sanitize(&guc->fw); > + intel_guc_disable_interrupts(guc); > intel_guc_ct_sanitize(&guc->ct); > guc->mmio_msg = 0; > > diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc.c b/drivers/gpu/drm/i915/gt/uc/intel_uc.c > index f0b02200aa01..ab11fe731ee7 100644 > --- a/drivers/gpu/drm/i915/gt/uc/intel_uc.c > +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc.c > @@ -207,21 +207,6 @@ static void guc_handle_mmio_msg(struct intel_guc *guc) > spin_unlock_irq(&guc->irq_lock); > } > > -static void guc_reset_interrupts(struct intel_guc *guc) > -{ > - guc->interrupts.reset(guc); > -} > - > -static void guc_enable_interrupts(struct intel_guc *guc) > -{ > - guc->interrupts.enable(guc); > -} > - > -static void guc_disable_interrupts(struct intel_guc *guc) > -{ > - guc->interrupts.disable(guc); > -} > - > static int guc_enable_communication(struct intel_guc *guc) > { > struct intel_gt *gt = guc_to_gt(guc); > @@ -242,7 +227,7 @@ static int guc_enable_communication(struct intel_guc *guc) > guc_get_mmio_msg(guc); > guc_handle_mmio_msg(guc); > > - guc_enable_interrupts(guc); > + intel_guc_enable_interrupts(guc); > > /* check for CT messages received before we enabled interrupts */ > spin_lock_irq(>->irq_lock); > @@ -265,7 +250,7 @@ static void guc_disable_communication(struct intel_guc *guc) > */ > guc_clear_mmio_msg(guc); > > - guc_disable_interrupts(guc); > + intel_guc_disable_interrupts(guc); > > intel_guc_ct_disable(&guc->ct); > > @@ -463,7 +448,7 @@ static int __uc_init_hw(struct intel_uc *uc) > if (ret) > goto err_out; > > - guc_reset_interrupts(guc); > + intel_guc_reset_interrupts(guc); > > /* WaEnableuKernelHeaderValidFix:skl */ > /* WaEnableGuCBootHashCheckNotSet:skl,bxt,kbl */ _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx