From patchwork Wed Aug 7 14:52:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Paul X-Patchwork-Id: 11082345 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D5B1713A4 for ; Wed, 7 Aug 2019 14:53:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C6AD228A77 for ; Wed, 7 Aug 2019 14:53:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BAC6028A0E; Wed, 7 Aug 2019 14:53: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=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, 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 6853C286C0 for ; Wed, 7 Aug 2019 14:53:06 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A072A6E720; Wed, 7 Aug 2019 14:53:05 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-yb1-xb43.google.com (mail-yb1-xb43.google.com [IPv6:2607:f8b0:4864:20::b43]) by gabe.freedesktop.org (Postfix) with ESMTPS id 779A66E720 for ; Wed, 7 Aug 2019 14:53:04 +0000 (UTC) Received: by mail-yb1-xb43.google.com with SMTP id o82so556233ybg.10 for ; Wed, 07 Aug 2019 07:53:04 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Yzd13DG1rp+WsyyQG2U0e84Dj24v4+N318aTRdw7530=; b=K2nJ/K1tN/DIugmpbw5HzBXfXrLRfOtYVs5mEiXnP59BvVvnWC/8Kzvgm1DONpAdyM BuQELiOsfN1P7yjMVPnQhoCems7txyK/AHSi6BCO8BrQpa19mOAiQTv1snSYsGPB59Hf 1RMguaSXk2tLG9bIUcOP5c+53TRmUbUIicWVjl8f8TyoYoicbLhcR9UCXc90YxGqAYf1 2A0tN0GupRf4sAuCZuGDgvyeER6HXjCyr9GWdTctpsqcCqjxPFt1No/4miwIqgNdZIzO bJ0QHu5P71LKfLCttrsNk/aLMmGYVxfqEw+HsZ1O02xNtkWUDT5mZ1LKQSv21PDFR/07 TtDQ== X-Gm-Message-State: APjAAAVJNIQWBvKC6UtKHGT6NcCL98lu2pJnbiiJPGSYI3vu10JyBr0v J929opNXl5KSP3ta7IOjpPT4J3tbOZE= X-Google-Smtp-Source: APXvYqx03AXMou9AU1tg4JHLwJy/wNszNUqxKmPYcYWUlAFDE259ywtM6JOxtSfJYQnudOwFTVN4bw== X-Received: by 2002:a25:ba81:: with SMTP id s1mr6797361ybg.354.1565189583544; Wed, 07 Aug 2019 07:53:03 -0700 (PDT) Received: from rosewood.cam.corp.google.com ([2620:0:1013:11:89c6:2139:5435:371d]) by smtp.gmail.com with ESMTPSA id c123sm712935ywf.25.2019.08.07.07.53.02 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 07 Aug 2019 07:53:02 -0700 (PDT) From: Sean Paul To: dri-devel@lists.freedesktop.org, daniel@ffwll.ch, airlied@gmail.com, mripard@kernel.org, robh@kernel.org, emil.velikov@collabora.com Subject: [PATCH 2/2] Revert "drm/panfrost: Use drm_gem_map_offset()" Date: Wed, 7 Aug 2019 10:52:48 -0400 Message-Id: <20190807145253.2037-3-sean@poorly.run> X-Mailer: git-send-email 2.23.0.rc1.153.gdeed80330f-goog In-Reply-To: <20190807145253.2037-1-sean@poorly.run> References: <20190807145253.2037-1-sean@poorly.run> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=poorly.run; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Yzd13DG1rp+WsyyQG2U0e84Dj24v4+N318aTRdw7530=; b=UDEy+ckbATFh4PJW7sT+KN15TaTALyWXTadz9Q5XHvUUXfIvpt2dllu585zi5pSKd2 rl0VoHQlglfyH8hG8RZa4ZJmKIZqAceRE6gHNTKjDxwjHhhoY0aRjTHkWRurQXd3dN6n c70ZGiFEqHhoNY2s8fuB9UlaRN63r06a54tgpwTrhZIU/o2zcHF10E9wDdX233K+tQLe 0OSPFlCvaigPrbY7otybF3V+XEVT/vg1epnifGAY3ADZVOHWZ1Sl3BakTdmtYEN8X+ot eyJoNWJzTvASOsu1Nf6gbTgNFDZPOT8x9/QCDC9ztnacyZ3ZPfKrMfVYYSRF1hFk8fyU 3KYw== X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sean Paul Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Rob Herring This reverts commit 583bbf46133c726bae277e8f4e32bfba2a528c7f. Turns out we need mmap to work on imported BOs even if the current code is buggy. Signed-off-by: Rob Herring Signed-off-by: Sean Paul Reviewed-by: Emil Velikov --- drivers/gpu/drm/panfrost/panfrost_drv.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/panfrost/panfrost_drv.c b/drivers/gpu/drm/panfrost/panfrost_drv.c index b2e325e270b7..b187daa4da85 100644 --- a/drivers/gpu/drm/panfrost/panfrost_drv.c +++ b/drivers/gpu/drm/panfrost/panfrost_drv.c @@ -291,14 +291,26 @@ static int panfrost_ioctl_mmap_bo(struct drm_device *dev, void *data, struct drm_file *file_priv) { struct drm_panfrost_mmap_bo *args = data; + struct drm_gem_object *gem_obj; + int ret; if (args->flags != 0) { DRM_INFO("unknown mmap_bo flags: %d\n", args->flags); return -EINVAL; } - return drm_gem_map_offset(file_priv, dev, args->handle, - &args->offset); + gem_obj = drm_gem_object_lookup(file_priv, args->handle); + if (!gem_obj) { + DRM_DEBUG("Failed to look up GEM BO %d\n", args->handle); + return -ENOENT; + } + + ret = drm_gem_create_mmap_offset(gem_obj); + if (ret == 0) + args->offset = drm_vma_node_offset_addr(&gem_obj->vma_node); + drm_gem_object_put_unlocked(gem_obj); + + return ret; } static int panfrost_ioctl_get_bo_offset(struct drm_device *dev, void *data,