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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 0849FC433F5 for ; Tue, 26 Apr 2022 19:19:43 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5ADA110E4D3; Tue, 26 Apr 2022 19:19:40 +0000 (UTC) Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [46.235.227.227]) by gabe.freedesktop.org (Postfix) with ESMTPS id A6CA710E3C4; Tue, 26 Apr 2022 19:19:38 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: bbeckett) with ESMTPSA id 107061F41A32 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1651000777; bh=MAjmFdqWA+Hrdq60ZeCd3OrHWgUw+ka1jffl+aLkF04=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From; b=U4W2g9y7THG9R7VpouQpRZ1L82hltGgjoux1qoqVpBWDvEKw5qIoSP2j+H1YBzZhO ajW6m+pKYyUK5uiuxPYKz0kDo37QsSYOOJWi3EFXYrWLChEvM0nf/qSL+UtYcDmuOJ wlPd5Ug6Rz8EAjED5i4Q/JYdJshiM4/jxmJXIxKQlM7jfIq8pnSPOIs4b8aTAr9gZG Uzd5vqUAw1Q3dxHbDVHnsOiVRxrXva/iLl63V3hAlfXaZfixLYs22KPDys3kYej46X ZvX5cUqrh08vjhCXLT2q0VOVVNGlEBPtpzmD9bVGp6jY3b3Bt6ynrakUp6liIoZ8lj omDh51dXTmefA== Message-ID: <780fa818-292c-a313-6006-0af0730c2743@collabora.com> Date: Tue, 26 Apr 2022 20:19:33 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.7.0 Content-Language: en-US To: "Wang, Zhi A" , Jason Gunthorpe References: <20220426155318.GQ2125828@nvidia.com> From: Robert Beckett In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Subject: Re: [Intel-gfx] [PULL] gvt-next 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: , Cc: "intel-gfx@lists.freedesktop.org" , "linux-kernel@vger.kernel.org" , "dri-devel@lists.freedesktop.org" , "Vivi, Rodrigo" , "intel-gvt-dev@lists.freedesktop.org" , Christoph Hellwig Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On 26/04/2022 17:58, Wang, Zhi A wrote: > On 4/26/22 3:53 PM, Jason Gunthorpe wrote: >> On Tue, Apr 26, 2022 at 07:58:59AM +0000, Wang, Zhi A wrote: >>> Hi folks: >>> >>> Here is the pull of gvt-next which fixs the compilation error when i915 debug >>> is open after the GVT-g refactor patches. >>> >>> Thanks so much for the efforts. >>> >>> Thanks, >>> Zhi. >>> >>> The following changes since commit 2917f53113be3b7a0f374e02cebe6d6b749366b5: >>> >>> vfio/mdev: Remove mdev drvdata (2022-04-21 07:36:56 -0400) >>> >>> are available in the Git repository at: >>> >>> https://github.com/intel/gvt-linux tags/gvt-next-2022-04-26 >>> >>> for you to fetch changes up to 2da299cee780ea797b3f72558687868072cf5eb5: >>> >>> drm/i915/gvt: Add missing export of symbols. (2022-04-25 18:03:04 -0400) >>> >>> gvt-next-2022-04-26 >>> >>> - Add two missing exports of symbols when i915 debug is enabled. >>> >>> Zhi Wang (1): >>> drm/i915/gvt: Add missing export of symbols. >>> >>> drivers/gpu/drm/i915/intel_gvt.c | 2 ++ >>> 1 file changed, 2 insertions(+) >> >> This still has another compile problem: >> >> ERROR: modpost: "intel_runtime_pm_put" [vmlinux] is a static EXPORT_SYMBOL_GPL >> >> Because: >> >> #if IS_ENABLED(CONFIG_DRM_I915_DEBUG_RUNTIME_PM) >> void intel_runtime_pm_put(struct intel_runtime_pm *rpm, intel_wakeref_t wref); >> #else >> static inline void >> intel_runtime_pm_put(struct intel_runtime_pm *rpm, intel_wakeref_t wref) >> { >> intel_runtime_pm_put_unchecked(rpm); >> } >> #endif >> >> Looks like it happens if CONFIG_DRM_I915_DEBUG_RUNTIME_PM=n >> >> I think you probably want to #ifdef the export in the same way: >> >> --- a/drivers/gpu/drm/i915/intel_gvt.c >> +++ b/drivers/gpu/drm/i915/intel_gvt.c >> @@ -309,7 +309,9 @@ EXPORT_SYMBOL_NS_GPL(__intel_context_do_pin, I915_GVT); >> EXPORT_SYMBOL_NS_GPL(__intel_context_do_unpin, I915_GVT); >> EXPORT_SYMBOL_NS_GPL(intel_ring_begin, I915_GVT); >> EXPORT_SYMBOL_NS_GPL(intel_runtime_pm_get, I915_GVT); >> +#if IS_ENABLED(CONFIG_DRM_I915_DEBUG_RUNTIME_PM) >> EXPORT_SYMBOL_NS_GPL(intel_runtime_pm_put, I915_GVT); >> +#endif > Sigh. That's tricky. Let me prepare another one. Also the following compile error: drivers/gpu/drm/i915/gvt/handlers.c:75:6: error: no previous prototype for ‘intel_gvt_match_device’ [-Werror=missing-prototypes] 75 | bool intel_gvt_match_device(struct intel_gvt *gvt, | ^~~~~~~~~~~~~~~~~~~~~~ it was removed from a header. The implementation should now be made static >> EXPORT_SYMBOL_NS_GPL(intel_runtime_pm_put_unchecked, I915_GVT); >> EXPORT_SYMBOL_NS_GPL(intel_uncore_forcewake_for_reg, I915_GVT); >> EXPORT_SYMBOL_NS_GPL(intel_uncore_forcewake_get, I915_GVT); >> >> Jason >> >