From patchwork Fri Feb 24 14:01:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: oscar.mateo@intel.com X-Patchwork-Id: 9591283 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 170B760471 for ; Fri, 24 Feb 2017 22:01:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1506228249 for ; Fri, 24 Feb 2017 22:01:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0A0DD2851D; Fri, 24 Feb 2017 22:01:54 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00, DATE_IN_PAST_06_12, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B86AE28249 for ; Fri, 24 Feb 2017 22:01:53 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 13B326E19D; Fri, 24 Feb 2017 22:01:51 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id 91F716ED25 for ; Fri, 24 Feb 2017 22:01:50 +0000 (UTC) Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 24 Feb 2017 14:01:49 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.35,201,1484035200"; d="scan'208";a="828190468" Received: from omateolo-linux.fm.intel.com ([10.1.27.55]) by FMSMGA003.fm.intel.com with ESMTP; 24 Feb 2017 14:01:49 -0800 From: Oscar Mateo To: intel-gfx@lists.freedesktop.org Date: Fri, 24 Feb 2017 06:01:36 -0800 Message-Id: <1487944897-31558-4-git-send-email-oscar.mateo@intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1487944897-31558-1-git-send-email-oscar.mateo@intel.com> References: <1487944897-31558-1-git-send-email-oscar.mateo@intel.com> Subject: [Intel-gfx] [PATCH 3/4] drm/i915/guc: s/ads_vma/addon X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP This vma contains much more than just the additional data struct (ads) and since we were already using the word "addon" as an object in guc_addon_create, make it the preffered one. No need for the vma suffix either, as that dependency is given by the type. while at it, add an explanation of what things go inside the addon object. Cc: Daniele Ceraolo Spurio Cc: Joonas Lahtinen Signed-off-by: Oscar Mateo Reviewed-by: Joonas Lahtinen --- drivers/gpu/drm/i915/i915_guc_submission.c | 12 ++++++++---- drivers/gpu/drm/i915/intel_guc_loader.c | 4 ++-- drivers/gpu/drm/i915/intel_uc.h | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_guc_submission.c b/drivers/gpu/drm/i915/i915_guc_submission.c index 7562343c..e1922fe 100644 --- a/drivers/gpu/drm/i915/i915_guc_submission.c +++ b/drivers/gpu/drm/i915/i915_guc_submission.c @@ -834,9 +834,13 @@ static int guc_addon_create(struct intel_guc *guc) struct page *page; u32 size; - GEM_BUG_ON(guc->ads_vma); + GEM_BUG_ON(guc->addon); - /* The ads obj includes the struct itself and buffers passed to GuC */ + /* The additional data struct (ADS) has pointers for different buffers + * used by the GuC. The addon object contains the ADS itself (guc_ads), + * the scheduling policies (guc_policies), a structure describing + * a collection of register sets (guc_mmio_reg_state) and some extra + * pages for the GuC to save its internal state for sleep */ size = sizeof(struct guc_ads) + sizeof(struct guc_policies) + sizeof(struct guc_mmio_reg_state) + GUC_S3_SAVE_SPACE_PAGES * PAGE_SIZE; @@ -845,7 +849,7 @@ static int guc_addon_create(struct intel_guc *guc) if (IS_ERR(vma)) return PTR_ERR(vma); - guc->ads_vma = vma; + guc->addon = vma; page = i915_vma_first_page(vma); ads = kmap(page); @@ -894,7 +898,7 @@ static int guc_addon_create(struct intel_guc *guc) static void guc_addon_destroy(struct intel_guc *guc) { - i915_vma_unpin_and_release(&guc->ads_vma); + i915_vma_unpin_and_release(&guc->addon); } /* diff --git a/drivers/gpu/drm/i915/intel_guc_loader.c b/drivers/gpu/drm/i915/intel_guc_loader.c index 1f9ec54..1eb0c51 100644 --- a/drivers/gpu/drm/i915/intel_guc_loader.c +++ b/drivers/gpu/drm/i915/intel_guc_loader.c @@ -213,8 +213,8 @@ static void guc_params_init(struct drm_i915_private *dev_priv) } else params[GUC_CTL_DEBUG] = GUC_LOG_DISABLED; - if (guc->ads_vma) { - u32 ads = guc_ggtt_offset(guc->ads_vma) >> PAGE_SHIFT; + if (guc->addon) { + u32 ads = guc_ggtt_offset(guc->addon) >> PAGE_SHIFT; params[GUC_CTL_DEBUG] |= ads << GUC_ADS_ADDR_SHIFT; params[GUC_CTL_DEBUG] |= GUC_ADS_ENABLED; } diff --git a/drivers/gpu/drm/i915/intel_uc.h b/drivers/gpu/drm/i915/intel_uc.h index 330d08f..d8897b5 100644 --- a/drivers/gpu/drm/i915/intel_uc.h +++ b/drivers/gpu/drm/i915/intel_uc.h @@ -152,7 +152,7 @@ struct intel_guc { /* intel_guc_recv interrupt related state */ bool interrupts_enabled; - struct i915_vma *ads_vma; + struct i915_vma *addon; struct i915_vma *ctx_pool; void *ctx_pool_vaddr; struct ida ctx_ids;