From patchwork Wed Mar 2 14:00:14 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomeu Vizoso X-Patchwork-Id: 8480831 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 6BCA6C0553 for ; Wed, 2 Mar 2016 14:01:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 364732038A for ; Wed, 2 Mar 2016 14:01:34 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 313BD20386 for ; Wed, 2 Mar 2016 14:01:30 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B57C76E834; Wed, 2 Mar 2016 14:01:27 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-x242.google.com (mail-wm0-x242.google.com [IPv6:2a00:1450:400c:c09::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5892B6E87D for ; Wed, 2 Mar 2016 14:01:14 +0000 (UTC) Received: by mail-wm0-x242.google.com with SMTP id p65so9809671wmp.1 for ; Wed, 02 Mar 2016 06:01:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=F87CKsuCVLr5Nv71TXzVL505ngzEm2kuEENZ0WldxPY=; b=luNyyJCqfVHigHCzbj6Zk3yoKgN1E1VgUFHYLYu2+sjZEgQT/SQ3FeLNBBl4CohO0R nvwg+eofcblcjMu55hX1hQ9RcUwA7GHYRZiuQq4ox3KCUPFYWVKXOt0xp+BXgZ3hSIFj neWgrMyjxQDUI/Yxpi4aOQ4Ms9J1dQBhtXxfJei/5K+5rNSwjKkizyPVEP/YcCnfuD7t XFe+bMRaAeBIhVxRHOgUrmpunTCEA/+peTB9DIqseKKNEhlEbRNkp+yswQNpthVRHH/X b39PyeQkCB1uwZvwxtsDcKXZ5J+C+Sy/pzhrTaxN4KMC7PVmGbNT0JNLQhtZE9R8QW2o eBVw== 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 :in-reply-to:references; bh=F87CKsuCVLr5Nv71TXzVL505ngzEm2kuEENZ0WldxPY=; b=JMCDSGsCCMRMfPNY0+bVNKl88KcIzt87BJjY0GU2N0I/DAF7DuMyebcH5I9MWmoy1L 8nQ+ITujscl/l0Dus0McqZW8W8ZMnFZXxuZfwq1tUh+Ah8qSiiuLq8/TM8I0c0pVyNtf g+QhwI/xc8jNYgJLTvT135+hiqWZ7jNfmn4I2wPCWNCtfwII7Hc9/vk4baQk76aP3dkD Y+u3SrEq/V9h7JUmLmV/Zu9tNa/4u4KJZaN0BLuLn25ufacvAXSzexqdTWZ99Euuwsts /o46+36KornXBJZQxDYolaGH00MoY+UMTvRGXfIOOXfDCXnV25eP7zl3ONfhJRaI38Jw l3wA== X-Gm-Message-State: AD7BkJJH6JvRByXIK06eCon6s/TVNv5sB5U9TYzyfKvo28ZHPEvPZ1qD4bSD7zhkExh62w== X-Received: by 10.194.58.12 with SMTP id m12mr29661575wjq.22.1456927272637; Wed, 02 Mar 2016 06:01:12 -0800 (PST) Received: from cizrna.lan ([109.72.12.223]) by smtp.gmail.com with ESMTPSA id e19sm4359876wmd.1.2016.03.02.06.01.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 02 Mar 2016 06:01:11 -0800 (PST) From: Tomeu Vizoso To: Intel GFX discussion Date: Wed, 2 Mar 2016 15:00:14 +0100 Message-Id: <1456927221-32421-8-git-send-email-tomeu.vizoso@collabora.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1456927221-32421-1-git-send-email-tomeu.vizoso@collabora.com> References: <1456927221-32421-1-git-send-email-tomeu.vizoso@collabora.com> Cc: Daniel Stone , Tomeu Vizoso , Micah Fedke , Gustavo Padovan , Emil Velikov Subject: [Intel-gfx] [i-g-t PATCH v1 07/14] lib: Map dumb buffers 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-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP If a buffer object is dumb, call DRM_IOCTL_MODE_MAP_DUMB when mapping it. Also, don't call DRM_IOCTL_I915_GEM_SET_DOMAIN on dumb buffers. Signed-off-by: Tomeu Vizoso --- lib/igt_fb.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/lib/igt_fb.c b/lib/igt_fb.c index 3e76a419b3ee..cd1605308308 100644 --- a/lib/igt_fb.c +++ b/lib/igt_fb.c @@ -984,7 +984,20 @@ static void destroy_cairo_surface__gtt(void *arg) static void create_cairo_surface__gtt(int fd, struct igt_fb *fb) { - void *ptr = gem_mmap__gtt(fd, fb->gem_handle, fb->size, PROT_READ | PROT_WRITE); + void *ptr; + + if (fb->is_dumb) { + struct drm_mode_map_dumb arg = {}; + + arg.handle = fb->gem_handle; + + do_ioctl(fd, DRM_IOCTL_MODE_MAP_DUMB, &arg); + + ptr = mmap(0, fb->size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, arg.offset); + igt_assert(ptr != MAP_FAILED); + } else + ptr = gem_mmap__gtt(fd, fb->gem_handle, fb->size, + PROT_READ | PROT_WRITE); fb->cairo_surface = cairo_image_surface_create_for_data(ptr, @@ -1006,8 +1019,9 @@ static cairo_surface_t *get_cairo_surface(int fd, struct igt_fb *fb) create_cairo_surface__gtt(fd, fb); } - gem_set_domain(fd, fb->gem_handle, - I915_GEM_DOMAIN_CPU, I915_GEM_DOMAIN_CPU); + if (!fb->is_dumb) + gem_set_domain(fd, fb->gem_handle, I915_GEM_DOMAIN_CPU, + I915_GEM_DOMAIN_CPU); igt_assert(cairo_surface_status(fb->cairo_surface) == CAIRO_STATUS_SUCCESS); return fb->cairo_surface;