From patchwork Tue Jul 12 12:04:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 9225171 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 8ED56604DB for ; Tue, 12 Jul 2016 12:05:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7F58026E51 for ; Tue, 12 Jul 2016 12:05:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 725BA27CCB; Tue, 12 Jul 2016 12:05:06 +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.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B3B9226E51 for ; Tue, 12 Jul 2016 12:05:05 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 55FE46E1A4; Tue, 12 Jul 2016 12:05:02 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-x244.google.com (mail-wm0-x244.google.com [IPv6:2a00:1450:400c:c09::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id F26976E1A4 for ; Tue, 12 Jul 2016 12:04:59 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id x83so1807337wma.3 for ; Tue, 12 Jul 2016 05:04:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id; bh=IZMuvuyg72CWfdfhEk8zMp7icsOfFWLCNNkdOV756s4=; b=vutVpZ+aMMAjGkA5W4isNsU+L+lqNkr+wMXX96Ewb3+B4IqRzWGZysHH27utQ9kOGN eT5qD/vrNA5CmxGeDKo2r1MMigwhX0y4QhcmFnpOT37gKMBLU7+CUH+lfSLJclkHIlP0 o5fsdp+PqgtidJgXBqwgFhjusDWa+U4DPRnlkQsMgYs2Pyuasi9hpIwBw5HavPRP7PCF l7V6QEHD5qw/o5csSNLszBvaQp1mnHczcLoj1X+J8xfHFMgVWSQwORF7Hu87l4mculm2 kj4+Qmit/KtJ64lpSFTCQII/T6eZO2PrNCXMvfybvMdp39J3mB5epL2nRy6l+EuRznD/ zn2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=IZMuvuyg72CWfdfhEk8zMp7icsOfFWLCNNkdOV756s4=; b=DSZXzn/sknzZzS/BT2kAxfLDwg0UosevSQK5tMQt7NA0Wr33cesEakSOaBPuaw16sk ve5kAUep/3rcYFBIlS9Ocoe1IT51WpiQV3ARvel0EPjj1Ce4zNNyLE5j0mJeUvMeXh69 sZPC9K4Oniw6sXUFzs/ofzIjXMGYPtEXNQNGN1ZYMrpYY7xh08DjMhHYb4g3ixnoYtx2 UVKRxgPJ6nuezOgIwecu17bz0L18CRWkObbku/qGnux40f67afVVfONs51DbW7TWZp+z mTl1Fa76dwzs151A9aCHtNltWiySNx5YuWSuGyQofq0M32ZhgkInarSWHTB52NXoUJw3 SNxA== X-Gm-Message-State: ALyK8tLIx4Sc8fQqdV/OxQlkXGx6Nt2wzbwhwtV3c9PSF9/tUrOaYY3/PJDRkHEyEHsxwQ== X-Received: by 10.28.150.18 with SMTP id y18mr19333991wmd.83.1468325098033; Tue, 12 Jul 2016 05:04:58 -0700 (PDT) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id o142sm27569091wme.20.2016.07.12.05.04.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Jul 2016 05:04:57 -0700 (PDT) From: Chris Wilson To: dri-devel@lists.freedesktop.org Subject: [PATCH] drm/vgem: Use PAGE_KERNEL in place of x86-specific PAGE_KERNEL_IO Date: Tue, 12 Jul 2016 13:04:50 +0100 Message-Id: <1468325090-27966-1-git-send-email-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.8.1 Cc: Daniel Vetter , Matthew Auld 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: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Since PAGE_KERNEL_IO is specific to x86 and equivalent to PAGE_KERNEL for our wrapping with pgprot_writecombine(), just use the common define. drivers/gpu/drm/vgem/vgem_drv.c: In function 'vgem_prime_vmap': >> drivers/gpu/drm/vgem/vgem_drv.c:238:53: error: 'PAGE_KERNEL_IO' undeclared (first use in this function) addr = vmap(pages, n_pages, 0, pgprot_writecombine(PAGE_KERNEL_IO)); Reported-by: 0day Fixes: e6f15b763ab2 ("drm/vgem: Enable dmabuf interface for export") Signed-off-by: Chris Wilson Cc: Matthew Auld Cc: Daniel Vetter --- drivers/gpu/drm/vgem/vgem_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/vgem/vgem_drv.c b/drivers/gpu/drm/vgem/vgem_drv.c index b5fb968d2d5c..29c2aab3c1a7 100644 --- a/drivers/gpu/drm/vgem/vgem_drv.c +++ b/drivers/gpu/drm/vgem/vgem_drv.c @@ -235,7 +235,7 @@ static void *vgem_prime_vmap(struct drm_gem_object *obj) if (IS_ERR(pages)) return NULL; - addr = vmap(pages, n_pages, 0, pgprot_writecombine(PAGE_KERNEL_IO)); + addr = vmap(pages, n_pages, 0, pgprot_writecombine(PAGE_KERNEL)); drm_gem_put_pages(obj, pages, false, false); return addr;