From patchwork Tue Jul 25 19:21:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Auld X-Patchwork-Id: 9862867 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 12381600F5 for ; Tue, 25 Jul 2017 19:23:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F244B286FE for ; Tue, 25 Jul 2017 19:23:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E746928700; Tue, 25 Jul 2017 19:23:09 +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=-4.2 required=2.0 tests=BAYES_00, 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 ABAA1286FE for ; Tue, 25 Jul 2017 19:23:09 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 599996E5B3; Tue, 25 Jul 2017 19:23:09 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id B0B366E3D2 for ; Tue, 25 Jul 2017 19:22:43 +0000 (UTC) Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 25 Jul 2017 12:22:43 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.40,412,1496127600"; d="scan'208";a="997093478" Received: from unknown (HELO mwahaha.ger.corp.intel.com) ([10.252.13.138]) by orsmga003.jf.intel.com with ESMTP; 25 Jul 2017 12:22:40 -0700 From: Matthew Auld To: intel-gfx@lists.freedesktop.org Date: Tue, 25 Jul 2017 20:21:30 +0100 Message-Id: <20170725192133.2012-19-matthew.auld@intel.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170725192133.2012-1-matthew.auld@intel.com> References: <20170725192133.2012-1-matthew.auld@intel.com> Subject: [Intel-gfx] [PATCH 18/21] drm/i915: disable platform support for vGPU huge gtt pages 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 Currently gvt gtt handling doesn't support huge page entries, so disable for now. Suggested-by: Zhenyu Wang Signed-off-by: Matthew Auld Cc: Joonas Lahtinen Cc: Chris Wilson Cc: Zhenyu Wang --- drivers/gpu/drm/i915/i915_gem.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 74ad006cac15..c171511d3251 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -4871,6 +4871,15 @@ int i915_gem_init(struct drm_i915_private *dev_priv) mutex_lock(&dev_priv->drm.struct_mutex); + /* If the guest supports the 48b PPGGT, then we need to fallback to 4K + * pages, since gvt gtt handling doesn't support huge page entries - we + * need to check either hypervisor mm can support huge guest page or + * just do emulation in gvt. + */ + if (USES_FULL_48BIT_PPGTT(dev_priv) && intel_vgpu_active(dev_priv)) + mkwrite_device_info(dev_priv)->page_size_mask = + I915_GTT_PAGE_SIZE_4K; + dev_priv->mm.unordered_timeline = dma_fence_context_alloc(1); if (!i915.enable_execlists) {