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=-13.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 DD154C433B4 for ; Tue, 13 Apr 2021 09:44:07 +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 988DA6128E for ; Tue, 13 Apr 2021 09:44:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 988DA6128E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.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 24F676E14F; Tue, 13 Apr 2021 09:44:07 +0000 (UTC) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id 464E06E14F for ; Tue, 13 Apr 2021 09:44:06 +0000 (UTC) IronPort-SDR: Usw7msny5Dmg39x8uKjD6vWmVvDRT//FqWNLBxQdo2RI6n5li1ge7TSWkFJwaELgTE4/pbA64v j9dpToraz+6w== X-IronPort-AV: E=McAfee;i="6200,9189,9952"; a="194409112" X-IronPort-AV: E=Sophos;i="5.82,219,1613462400"; d="scan'208";a="194409112" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Apr 2021 02:44:05 -0700 IronPort-SDR: LdwlUChltlBO17Bn2GVBhLrlewK3H64PuUCcIk4D8dnALh6s5davzWC388Uy0muTulnr2grwTg +qeoSER8YMlQ== X-IronPort-AV: E=Sophos;i="5.82,219,1613462400"; d="scan'208";a="424180870" Received: from alinapar-mobl2.ger.corp.intel.com (HELO localhost) ([10.249.36.253]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Apr 2021 02:44:02 -0700 From: Jani Nikula To: Lucas De Marchi , intel-gfx@lists.freedesktop.org In-Reply-To: <20210413051002.92589-10-lucas.demarchi@intel.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20210413051002.92589-1-lucas.demarchi@intel.com> <20210413051002.92589-10-lucas.demarchi@intel.com> Date: Tue, 13 Apr 2021 12:43:59 +0300 Message-ID: <87lf9mh63k.fsf@intel.com> MIME-Version: 1.0 Subject: Re: [Intel-gfx] [PATCH v2 09/12] drm/i915: eliminate remaining uses of intel_device_info->gen 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-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Mon, 12 Apr 2021, Lucas De Marchi wrote: > Replace gen with the new graphics_ver value and use GRAPHICS_VER() > in those places. > > Signed-off-by: Lucas De Marchi > --- > .../gpu/drm/i915/gem/i915_gem_execbuffer.c | 22 +++++++++---------- > drivers/gpu/drm/i915/i915_drv.c | 2 +- > drivers/gpu/drm/i915/intel_device_info.c | 2 +- > 3 files changed, 13 insertions(+), 13 deletions(-) > > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c > index 5964e67c7d36..297143511f99 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c > +++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c > @@ -274,7 +274,7 @@ struct i915_execbuffer { > struct drm_mm_node node; /** temporary GTT binding */ > unsigned long vaddr; /** Current kmap address */ > unsigned long page; /** Currently mapped page index */ > - unsigned int gen; /** Cached value of INTEL_GEN */ > + unsigned int graphics_ver; /** Cached value of GRAPHICS_VER */ Is this unsigned int for efficiency or what? *shrug* > bool use_64bit_reloc : 1; > bool has_llc : 1; > bool has_fence : 1; > @@ -1049,10 +1049,10 @@ static void reloc_cache_init(struct reloc_cache *cache, > cache->page = -1; > cache->vaddr = 0; > /* Must be a variable in the struct to allow GCC to unroll. */ > - cache->gen = INTEL_GEN(i915); > + cache->graphics_ver = GRAPHICS_VER(i915); > cache->has_llc = HAS_LLC(i915); > cache->use_64bit_reloc = HAS_64BIT_RELOC(i915); > - cache->has_fence = cache->gen < 4; > + cache->has_fence = cache->graphics_ver < 4; > cache->needs_unfenced = INTEL_INFO(i915)->unfenced_needs_alignment; > cache->node.flags = 0; > reloc_cache_clear(cache); > @@ -1402,7 +1402,7 @@ static int __reloc_gpu_alloc(struct i915_execbuffer *eb, > > err = eb->engine->emit_bb_start(rq, > batch->node.start, PAGE_SIZE, > - cache->gen > 5 ? 0 : I915_DISPATCH_SECURE); > + cache->graphics_ver > 5 ? 0 : I915_DISPATCH_SECURE); > if (err) > goto skip_request; > > @@ -1503,14 +1503,14 @@ static int __reloc_entry_gpu(struct i915_execbuffer *eb, > u64 offset, > u64 target_addr) > { > - const unsigned int gen = eb->reloc_cache.gen; > + const unsigned int ver = eb->reloc_cache.graphics_ver; Nitpick, I think I'd like to use the more specific name throughout, also for local variables, i.e. graphics_ver, media_ver, or display_ver. Does not need to be changed in this patch though. Reviewed-by: Jani Nikula > unsigned int len; > u32 *batch; > u64 addr; > > - if (gen >= 8) > + if (ver >= 8) > len = offset & 7 ? 8 : 5; > - else if (gen >= 4) > + else if (ver >= 4) > len = 4; > else > len = 3; > @@ -1522,7 +1522,7 @@ static int __reloc_entry_gpu(struct i915_execbuffer *eb, > return false; > > addr = gen8_canonical_addr(vma->node.start + offset); > - if (gen >= 8) { > + if (ver >= 8) { > if (offset & 7) { > *batch++ = MI_STORE_DWORD_IMM_GEN4; > *batch++ = lower_32_bits(addr); > @@ -1542,7 +1542,7 @@ static int __reloc_entry_gpu(struct i915_execbuffer *eb, > *batch++ = lower_32_bits(target_addr); > *batch++ = upper_32_bits(target_addr); > } > - } else if (gen >= 6) { > + } else if (ver >= 6) { > *batch++ = MI_STORE_DWORD_IMM_GEN4; > *batch++ = 0; > *batch++ = addr; > @@ -1552,12 +1552,12 @@ static int __reloc_entry_gpu(struct i915_execbuffer *eb, > *batch++ = 0; > *batch++ = vma_phys_addr(vma, offset); > *batch++ = target_addr; > - } else if (gen >= 4) { > + } else if (ver >= 4) { > *batch++ = MI_STORE_DWORD_IMM_GEN4 | MI_USE_GGTT; > *batch++ = 0; > *batch++ = addr; > *batch++ = target_addr; > - } else if (gen >= 3 && > + } else if (ver >= 3 && > !(IS_I915G(eb->i915) || IS_I915GM(eb->i915))) { > *batch++ = MI_STORE_DWORD_IMM | MI_MEM_VIRTUAL; > *batch++ = addr; > diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c > index 825b45cb3543..e477d278ca73 100644 > --- a/drivers/gpu/drm/i915/i915_drv.c > +++ b/drivers/gpu/drm/i915/i915_drv.c > @@ -794,7 +794,7 @@ int i915_driver_probe(struct pci_dev *pdev, const struct pci_device_id *ent) > return PTR_ERR(i915); > > /* Disable nuclear pageflip by default on pre-ILK */ > - if (!i915->params.nuclear_pageflip && match_info->gen < 5) > + if (!i915->params.nuclear_pageflip && match_info->graphics_ver < 5) > i915->drm.driver_features &= ~DRIVER_ATOMIC; > > /* > diff --git a/drivers/gpu/drm/i915/intel_device_info.c b/drivers/gpu/drm/i915/intel_device_info.c > index de02207f6ec6..b58bc7bff65e 100644 > --- a/drivers/gpu/drm/i915/intel_device_info.c > +++ b/drivers/gpu/drm/i915/intel_device_info.c > @@ -95,7 +95,7 @@ static const char *iommu_name(void) > void intel_device_info_print_static(const struct intel_device_info *info, > struct drm_printer *p) > { > - drm_printf(p, "gen: %d\n", info->gen); > + drm_printf(p, "graphics_ver: %u\n", info->graphics_ver); > drm_printf(p, "gt: %d\n", info->gt); > drm_printf(p, "iommu: %s\n", iommu_name()); > drm_printf(p, "memory-regions: %x\n", info->memory_regions); -- Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx