From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Dave Airlie <airlied@linux•ie>
Cc: Daniel Vetter <daniel.vetter@ffwll•ch>,
Jani Nikula <jani.nikula@linux•intel.com>,
Joonas Lahtinen <joonas.lahtinen@linux•intel.com>,
Rodrigo Vivi <rodrigo.vivi@intel•com>,
Intel Graphics <intel-gfx@lists•freedesktop.org>,
DRI <dri-devel@lists•freedesktop.org>,
Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Changbin Du <changbin.du@intel•com>,
Zhenyu Wang <zhenyuw@linux•intel.com>
Subject: Re: linux-next: build failure after merge of the drm-intel tree
Date: Mon, 23 Jul 2018 12:29:00 +1000 [thread overview]
Message-ID: <20180723122900.60562ff8@canb.auug.org.au> (raw)
In-Reply-To: <20180713115419.1270c385@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1894 bytes --]
Hi all,
On Fri, 13 Jul 2018 11:54:19 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> [Dave cc'd because this will probably turn up in the drm tree soon.]
And now it has ...
> After merging the drm-intel tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/gpu/drm/i915/gvt/kvmgt.c: In function 'gvt_dma_map_page':
> drivers/gpu/drm/i915/gvt/kvmgt.c:188:17: error: 'pfn' undeclared (first use in this function); did you mean 'gfn'?
> if (!pfn_valid(pfn)) {
> ^~~
>
> Caused by commit
>
> 79e542f5af79 ("drm/i915/kvmgt: Support setting dma map for huge pages")
>
> interacting with commit
>
> 39b4cbadb9a9 ("drm/i915/kvmgt: Check the pfn got from vfio_pin_pages")
>
> from Linus' tree (v4.18-rc1).
>
> I added the following merge fix patch:
>
> From: Stephen Rothwell <sfr@canb•auug.org.au>
> Date: Fri, 13 Jul 2018 11:48:41 +1000
> Subject: [PATCH] drm/i915/kvmgt: merge fixup for "Check the pfn got from
> vfio_pin_pages"
>
> Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
> ---
> drivers/gpu/drm/i915/gvt/kvmgt.c | 6 ------
> 1 file changed, 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gvt/kvmgt.c b/drivers/gpu/drm/i915/gvt/kvmgt.c
> index 718ab307a500..4d2f53ae9f0f 100644
> --- a/drivers/gpu/drm/i915/gvt/kvmgt.c
> +++ b/drivers/gpu/drm/i915/gvt/kvmgt.c
> @@ -185,12 +185,6 @@ static int gvt_dma_map_page(struct intel_vgpu *vgpu, unsigned long gfn,
> if (ret)
> return ret;
>
> - if (!pfn_valid(pfn)) {
> - gvt_vgpu_err("pfn 0x%lx is not mem backed\n", pfn);
> - vfio_unpin_pages(mdev_dev(vgpu->vdev.mdev), &gfn, 1);
> - return -EINVAL;
> - }
> -
> /* Setup DMA mapping. */
> *dma_addr = dma_map_page(dev, page, 0, size, PCI_DMA_BIDIRECTIONAL);
> ret = dma_mapping_error(dev, *dma_addr);
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2018-07-23 2:29 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-13 1:54 linux-next: build failure after merge of the drm-intel tree Stephen Rothwell
2018-07-23 2:29 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2026-03-16 17:15 Mark Brown
2026-03-17 9:00 ` Jani Nikula
2024-08-29 3:46 Stephen Rothwell
2024-06-12 4:12 Stephen Rothwell
2024-06-17 19:19 ` Rodrigo Vivi
2024-06-27 21:48 ` Dave Airlie
2024-06-28 9:29 ` Jani Nikula
2022-08-26 2:36 Stephen Rothwell
2022-08-26 7:50 ` Jani Nikula
2022-04-26 2:08 Stephen Rothwell
2022-04-26 7:36 ` Jani Nikula
2022-02-15 1:10 Stephen Rothwell
2022-02-15 12:11 ` Jani Nikula
2021-05-21 1:58 Stephen Rothwell
2021-01-19 23:57 Stephen Rothwell
2021-01-21 1:11 ` Stephen Rothwell
[not found] <20191210093957.5120f717@canb.auug.org.au>
[not found] ` <20191210094224.4a294cb7@canb.auug.org.au>
2019-12-11 9:31 ` Jani Nikula
2019-03-27 2:59 Stephen Rothwell
2019-03-27 11:07 ` Joonas Lahtinen
2019-03-27 11:31 ` Stephen Rothwell
2018-05-08 1:07 Stephen Rothwell
2018-05-08 7:08 ` Oleksandr Andrushchenko
2018-05-09 5:02 ` Stephen Rothwell
2018-05-09 5:08 ` Christoph Hellwig
2018-05-09 5:18 ` Stephen Rothwell
2016-08-23 1:56 Stephen Rothwell
2016-08-23 16:33 ` Daniel Vetter
2016-05-23 2:24 Stephen Rothwell
2014-04-03 1:24 Stephen Rothwell
2014-03-19 0:53 Stephen Rothwell
2014-03-19 1:18 ` Steven Rostedt
2013-02-15 2:37 Stephen Rothwell
2013-02-15 9:30 ` Daniel Vetter
2013-02-15 16:16 ` Jesse Barnes
2013-02-19 2:01 ` Stephen Rothwell
2013-02-19 10:28 ` Daniel Vetter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180723122900.60562ff8@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=airlied@linux$(echo .)ie \
--cc=changbin.du@intel$(echo .)com \
--cc=daniel.vetter@ffwll$(echo .)ch \
--cc=dri-devel@lists$(echo .)freedesktop.org \
--cc=intel-gfx@lists$(echo .)freedesktop.org \
--cc=jani.nikula@linux$(echo .)intel.com \
--cc=joonas.lahtinen@linux$(echo .)intel.com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=rodrigo.vivi@intel$(echo .)com \
--cc=zhenyuw@linux$(echo .)intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox