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.2 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 59CA5C4338F for ; Fri, 13 Aug 2021 08:19:54 +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 25CA96109E for ; Fri, 13 Aug 2021 08:19:54 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 25CA96109E 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=lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1F7E46E573; Fri, 13 Aug 2021 08:19:50 +0000 (UTC) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id 698C96E56A; Fri, 13 Aug 2021 08:19:48 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10074"; a="212411480" X-IronPort-AV: E=Sophos;i="5.84,318,1620716400"; d="scan'208";a="212411480" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Aug 2021 01:19:42 -0700 X-IronPort-AV: E=Sophos;i="5.84,318,1620716400"; d="scan'208";a="528352765" Received: from mbubula-mobl1.ger.corp.intel.com (HELO [10.252.55.29]) ([10.252.55.29]) by fmsmga002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Aug 2021 01:19:40 -0700 To: Jason Ekstrand , Daniel Vetter Cc: intel-gfx , dri-devel References: <20210812124452.622233-1-maarten.lankhorst@linux.intel.com> <20210812124452.622233-2-maarten.lankhorst@linux.intel.com> From: Maarten Lankhorst Message-ID: <3aeb1745-f8ea-95c5-a23b-d077f0a4bccd@linux.intel.com> Date: Fri, 13 Aug 2021 10:19:38 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Firefox/78.0 Thunderbird/78.12.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Content-Language: en-US Subject: Re: [Intel-gfx] [PATCH 2/2] drm/i915: Add pci ids and uapi for DG1 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: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Op 12-08-2021 om 23:10 schreef Jason Ekstrand: > On Thu, Aug 12, 2021 at 9:49 AM Daniel Vetter wrote: >> On Thu, Aug 12, 2021 at 2:44 PM Maarten Lankhorst >> wrote: >>> DG1 has support for local memory, which requires the usage of the >>> lmem placement extension for creating bo's, and memregion queries >>> to obtain the size. Because of this, those parts of the uapi are >>> no longer guarded behind FAKE_LMEM. >>> >>> According to the pull request referenced below, mesa should be mostly >>> ready for DG1. VK_EXT_memory_budget is not hooked up yet, but we >>> should definitely just enable the uapi parts by default. >>> >>> Signed-off-by: Maarten Lankhorst >>> References: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11584 >>> Cc: Jordan Justen jordan.l.justen@intel.com >>> Cc: Jason Ekstrand jason@jlekstrand.net >> Acked-by: Daniel Vetter > Acked-by: Jason Ekstrand > >>> --- >>> drivers/gpu/drm/i915/gem/i915_gem_create.c | 3 --- >>> drivers/gpu/drm/i915/i915_pci.c | 1 + >>> drivers/gpu/drm/i915/i915_query.c | 3 --- >>> 3 files changed, 1 insertion(+), 6 deletions(-) >>> >>> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_create.c b/drivers/gpu/drm/i915/gem/i915_gem_create.c >>> index 23fee13a3384..1d341b8c47c0 100644 >>> --- a/drivers/gpu/drm/i915/gem/i915_gem_create.c >>> +++ b/drivers/gpu/drm/i915/gem/i915_gem_create.c >>> @@ -347,9 +347,6 @@ static int ext_set_placements(struct i915_user_extension __user *base, >>> { >>> struct drm_i915_gem_create_ext_memory_regions ext; >>> >>> - if (!IS_ENABLED(CONFIG_DRM_I915_UNSTABLE_FAKE_LMEM)) >>> - return -ENODEV; >>> - >>> if (copy_from_user(&ext, base, sizeof(ext))) >>> return -EFAULT; >>> >>> diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c >>> index 1bbd09ad5287..93ccdc6bbd03 100644 >>> --- a/drivers/gpu/drm/i915/i915_pci.c >>> +++ b/drivers/gpu/drm/i915/i915_pci.c >>> @@ -1115,6 +1115,7 @@ static const struct pci_device_id pciidlist[] = { >>> INTEL_RKL_IDS(&rkl_info), >>> INTEL_ADLS_IDS(&adl_s_info), >>> INTEL_ADLP_IDS(&adl_p_info), >>> + INTEL_DG1_IDS(&dg1_info), >>> {0, 0, 0} >>> }; >>> MODULE_DEVICE_TABLE(pci, pciidlist); >>> diff --git a/drivers/gpu/drm/i915/i915_query.c b/drivers/gpu/drm/i915/i915_query.c >>> index e49da36c62fb..5e2b909827f4 100644 >>> --- a/drivers/gpu/drm/i915/i915_query.c >>> +++ b/drivers/gpu/drm/i915/i915_query.c >>> @@ -432,9 +432,6 @@ static int query_memregion_info(struct drm_i915_private *i915, >>> u32 total_length; >>> int ret, id, i; >>> >>> - if (!IS_ENABLED(CONFIG_DRM_I915_UNSTABLE_FAKE_LMEM)) >>> - return -ENODEV; >>> - >>> if (query_item->flags != 0) >>> return -EINVAL; >>> >>> -- >>> 2.32.0 >>> >> >> -- >> Daniel Vetter >> Software Engineer, Intel Corporation >> http://blog.ffwll.ch Pushed this patch and did the revert from previous patch in drm-intel/topic/core-for-ci, enjoy!