From patchwork Thu Oct 20 18:25:03 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jani Nikula X-Patchwork-Id: 9387423 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 A66ED60487 for ; Thu, 20 Oct 2016 18:25:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9E9D7294BF for ; Thu, 20 Oct 2016 18:25:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 92D91294B0; Thu, 20 Oct 2016 18:25:21 +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 3E197294B0 for ; Thu, 20 Oct 2016 18:25:20 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 327AB6E180; Thu, 20 Oct 2016 18:25:20 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id BFD8A6E180; Thu, 20 Oct 2016 18:25:13 +0000 (UTC) Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga105.jf.intel.com with ESMTP; 20 Oct 2016 11:25:10 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.31,372,1473145200"; d="scan'208";a="775163444" Received: from meidenso-mobl3.ger.corp.intel.com (HELO localhost) ([10.252.51.164]) by FMSMGA003.fm.intel.com with ESMTP; 20 Oct 2016 11:25:07 -0700 From: Jani Nikula To: Daniel Vetter , Randy Dunlap , Zhenyu Wang Subject: Re: [Intel-gfx] linux-next: Tree for Oct 20 (gpu/drm/i915) In-Reply-To: Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20161020142037.709ffeb1@canb.auug.org.au> <0c3c853b-3116-2935-c449-f63b21bb569d@infradead.org> Date: Thu, 20 Oct 2016 21:25:03 +0300 Message-ID: <87twc6q3nk.fsf@intel.com> MIME-Version: 1.0 Cc: Stephen Rothwell , intel-gfx , linux-next , Linux Kernel Mailing List , dri-devel X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 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" X-Virus-Scanned: ClamAV using ClamSMTP On Thu, 20 Oct 2016, Daniel Vetter wrote: > On Thu, Oct 20, 2016 at 7:37 PM, Randy Dunlap wrote: >> On 10/19/16 20:20, Stephen Rothwell wrote: >>> Hi all, >>> >>> Changes since 20161019: >>> >> >> on i386: when CONFIG_ACPI is not enabled: > > Adding Zhenyu. Might be good to have a fix just for this that I > directly pick up, since I want to tag the first 4.10 pull for Dave > Airlie this w/e. How about just this? > -Daniel > >> ../drivers/gpu/drm/i915/gvt/opregion.c: In function 'intel_gvt_init_opregion': >> ../drivers/gpu/drm/i915/gvt/opregion.c:183:2: error: implicit declaration of function 'acpi_os_ioremap' [-Werror=implicit-function-declaration] >> gvt->opregion.opregion_va = acpi_os_ioremap(gvt->opregion.opregion_pa, >> ^ >> ../drivers/gpu/drm/i915/gvt/opregion.c:183:28: warning: assignment makes pointer from integer without a cast [enabled by default] >> gvt->opregion.opregion_va = acpi_os_ioremap(gvt->opregion.opregion_pa, >> ^ >> ../drivers/gpu/drm/i915/gvt/gtt.c: In function 'read_pte64': >> ../drivers/gpu/drm/i915/gvt/gtt.c:277:2: warning: left shift count >= width of type [enabled by default] >> pte |= ioread32(addr + 4) << 32; >> ^ >> ../drivers/gpu/drm/i915/gvt/gtt.c: In function 'gen8_gtt_get_pfn': >> ../drivers/gpu/drm/i915/gvt/gtt.c:360:3: warning: left shift count >= width of type [enabled by default] >> pfn = (e->val64 & ADDR_4K_MASK) >> 12; >> ^ >> ../drivers/gpu/drm/i915/gvt/gtt.c: In function 'gen8_gtt_set_pfn': >> ../drivers/gpu/drm/i915/gvt/gtt.c:373:3: warning: left shift count >= width of type [enabled by default] >> e->val64 &= ~ADDR_4K_MASK; >> ^ >> ../drivers/gpu/drm/i915/gvt/gtt.c:374:3: warning: left shift count >= width of type [enabled by default] >> pfn &= (ADDR_4K_MASK >> 12); >> ^ >> ../drivers/gpu/drm/i915/gvt/gtt.c: In function 'gen8_gma_to_pml4_index': >> ../drivers/gpu/drm/i915/gvt/gtt.c:436:1: warning: right shift count >= width of type [enabled by default] >> DEFINE_PPGTT_GMA_TO_INDEX(gen8, pml4, (gma >> 39 & 0x1ff)); >> ^ >> CC drivers/gpu/drm/radeon/si_smc.o >> In file included from ../drivers/gpu/drm/i915/i915_drv.h:46:0, >> from ../drivers/gpu/drm/i915/gvt/gtt.c:36: >> ../drivers/gpu/drm/i915/gvt/gtt.c: In function 'intel_gvt_create_scratch_page': >> ../drivers/gpu/drm/i915/gvt/gtt.c:1945:47: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] >> gvt_err("fail to translate vaddr:0x%llx\n", (u64)vaddr); >> ^ >> ../include/drm/drmP.h:201:43: note: in definition of macro 'DRM_ERROR' >> drm_printk(KERN_ERR, DRM_UT_NONE, fmt, ##__VA_ARGS__) >> ^ >> ../drivers/gpu/drm/i915/gvt/gtt.c:1945:3: note: in expansion of macro 'gvt_err' >> gvt_err("fail to translate vaddr:0x%llx\n", (u64)vaddr); >> ^ >> >> >> >> -- >> ~Randy >> _______________________________________________ >> Intel-gfx mailing list >> Intel-gfx@lists.freedesktop.org >> https://lists.freedesktop.org/mailman/listinfo/intel-gfx diff --git a/drivers/gpu/drm/i915/Kconfig b/drivers/gpu/drm/i915/Kconfig index 6aedc96aa412..94914381e8ef 100644 --- a/drivers/gpu/drm/i915/Kconfig +++ b/drivers/gpu/drm/i915/Kconfig @@ -85,7 +85,7 @@ config DRM_I915_USERPTR config DRM_I915_GVT bool "Enable Intel GVT-g graphics virtualization host support" - depends on DRM_I915 + depends on DRM_I915 && ACPI default n help Choose this option if you want to enable Intel GVT-g graphics