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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id CB0DDC433F5 for ; Thu, 10 Feb 2022 23:56:28 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1137810E992; Thu, 10 Feb 2022 23:56:28 +0000 (UTC) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id D156510E992; Thu, 10 Feb 2022 23:56:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1644537386; x=1676073386; h=date:from:to:subject:message-id:references:mime-version: content-transfer-encoding:in-reply-to; bh=3BcjqQIQxRoKscjXKhIKCcgm+/zM2SLzHzpBlQBKX0I=; b=HgmCfs8wrsBwv4yxyylEuBWB43I7vdbjQCovdqmkAB5dhti5hBsV9fqx B1x6kKsnqNS0Bgzyj7CEFT7jgLT20V2DAwwrCKybvYZBS1HXKqvNL8SLG h12UL6gdzlpQiQnqWj+woX9ngph+D7h8eb7XJQXhtcNWzXBFZdD34TiSn AAVAJQwby/NaL9QPwIu6gY4KdIHWTKTnXX6d83/SKtbZlG8I02rEm4gtk p73VIIlvJxc2q+Ts70sMlHSrjM/cSS2vUgtOVs5Q+Mq+gp8v8dyj6QWm3 2SPylIR0tNbK0d6VGugxBQ5pWMYI7wFE0ZpggQOthwZNIoqw2VYO7h5Mx w==; X-IronPort-AV: E=McAfee;i="6200,9189,10254"; a="249371249" X-IronPort-AV: E=Sophos;i="5.88,359,1635231600"; d="scan'208";a="249371249" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Feb 2022 15:56:26 -0800 X-IronPort-AV: E=Sophos;i="5.88,359,1635231600"; d="scan'208";a="537479062" Received: from jjmurray-mobl.amr.corp.intel.com (HELO msatwood-mobl) ([10.209.24.65]) by fmsmga007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Feb 2022 15:56:25 -0800 Date: Thu, 10 Feb 2022 15:56:11 -0800 From: Matt Atwood To: Lucas De Marchi ;, intel-gfx@lists.freedesktop.org;, dri-devel@lists.freedesktop.org Subject: Re: [Intel-gfx] [PATCH v2 07/18] drm/i915/guc: Convert policies update to iosys_map Message-ID: <20220210235611.GD4707@msatwood-mobl> References: <20220208104524.2516209-1-lucas.demarchi@intel.com> <20220208104524.2516209-8-lucas.demarchi@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20220208104524.2516209-8-lucas.demarchi@intel.com> 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: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Tue, Feb 08, 2022 at 02:45:13AM -0800, Lucas De Marchi wrote: > Use iosys_map to write the policies update so access to IO and system > memory is abstracted away. > > Cc: Matt Roper > Cc: Thomas Hellström > Cc: Daniel Vetter > Cc: John Harrison > Cc: Matthew Brost > Cc: Daniele Ceraolo Spurio Reviewed-by: Matt Atwood > Signed-off-by: Lucas De Marchi > --- > drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c | 41 ++++++++++++---------- > 1 file changed, 23 insertions(+), 18 deletions(-) > > diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c > index b5b3a39f0c28..6a34ab38b45f 100644 > --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c > +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c > @@ -130,33 +130,37 @@ static u32 guc_ads_blob_size(struct intel_guc *guc) > guc_ads_private_data_size(guc); > } > > -static void guc_policies_init(struct intel_guc *guc, struct guc_policies *policies) > +static void guc_policies_init(struct intel_guc *guc) > { > struct intel_gt *gt = guc_to_gt(guc); > struct drm_i915_private *i915 = gt->i915; > + u32 global_flags = 0; > > - policies->dpc_promote_time = GLOBAL_POLICY_DEFAULT_DPC_PROMOTE_TIME_US; > - policies->max_num_work_items = GLOBAL_POLICY_MAX_NUM_WI; > + ads_blob_write(guc, policies.dpc_promote_time, > + GLOBAL_POLICY_DEFAULT_DPC_PROMOTE_TIME_US); > + ads_blob_write(guc, policies.max_num_work_items, > + GLOBAL_POLICY_MAX_NUM_WI); > > - policies->global_flags = 0; > if (i915->params.reset < 2) > - policies->global_flags |= GLOBAL_POLICY_DISABLE_ENGINE_RESET; > + global_flags |= GLOBAL_POLICY_DISABLE_ENGINE_RESET; > > - policies->is_valid = 1; > + ads_blob_write(guc, policies.global_flags, global_flags); > + ads_blob_write(guc, policies.is_valid, 1); > } > > void intel_guc_ads_print_policy_info(struct intel_guc *guc, > struct drm_printer *dp) > { > - struct __guc_ads_blob *blob = guc->ads_blob; > - > - if (unlikely(!blob)) > + if (unlikely(iosys_map_is_null(&guc->ads_map))) > return; > > drm_printf(dp, "Global scheduling policies:\n"); > - drm_printf(dp, " DPC promote time = %u\n", blob->policies.dpc_promote_time); > - drm_printf(dp, " Max num work items = %u\n", blob->policies.max_num_work_items); > - drm_printf(dp, " Flags = %u\n", blob->policies.global_flags); > + drm_printf(dp, " DPC promote time = %u\n", > + ads_blob_read(guc, policies.dpc_promote_time)); > + drm_printf(dp, " Max num work items = %u\n", > + ads_blob_read(guc, policies.max_num_work_items)); > + drm_printf(dp, " Flags = %u\n", > + ads_blob_read(guc, policies.global_flags)); > } > > static int guc_action_policies_update(struct intel_guc *guc, u32 policy_offset) > @@ -171,23 +175,24 @@ static int guc_action_policies_update(struct intel_guc *guc, u32 policy_offset) > > int intel_guc_global_policies_update(struct intel_guc *guc) > { > - struct __guc_ads_blob *blob = guc->ads_blob; > struct intel_gt *gt = guc_to_gt(guc); > + u32 scheduler_policies; > intel_wakeref_t wakeref; > int ret; > > - if (!blob) > + if (iosys_map_is_null(&guc->ads_map)) > return -EOPNOTSUPP; > > - GEM_BUG_ON(!blob->ads.scheduler_policies); > + scheduler_policies = ads_blob_read(guc, ads.scheduler_policies); > + GEM_BUG_ON(!scheduler_policies); > > - guc_policies_init(guc, &blob->policies); > + guc_policies_init(guc); > > if (!intel_guc_is_ready(guc)) > return 0; > > with_intel_runtime_pm(>->i915->runtime_pm, wakeref) > - ret = guc_action_policies_update(guc, blob->ads.scheduler_policies); > + ret = guc_action_policies_update(guc, scheduler_policies); > > return ret; > } > @@ -554,7 +559,7 @@ static void __guc_ads_init(struct intel_guc *guc) > u32 base; > > /* GuC scheduling policies */ > - guc_policies_init(guc, &blob->policies); > + guc_policies_init(guc); > > /* System info */ > fill_engine_enable_masks(gt, &blob->system_info); > -- > 2.35.1 >