From patchwork Wed Aug 7 14:20:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Paul X-Patchwork-Id: 11082259 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 DA71E13A4 for ; Wed, 7 Aug 2019 14:21:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C9188285B6 for ; Wed, 7 Aug 2019 14:21:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BD41E289FC; Wed, 7 Aug 2019 14:21:24 +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 2FBD81FE8D for ; Wed, 7 Aug 2019 14:21:24 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3B9386E70F; Wed, 7 Aug 2019 14:21:23 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-yb1-xb41.google.com (mail-yb1-xb41.google.com [IPv6:2607:f8b0:4864:20::b41]) by gabe.freedesktop.org (Postfix) with ESMTPS id D74AA6E710 for ; Wed, 7 Aug 2019 14:21:21 +0000 (UTC) Received: by mail-yb1-xb41.google.com with SMTP id q5so20228610ybp.1 for ; Wed, 07 Aug 2019 07:21:21 -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=zAihxkfX9EywdeIr6db6fRkWBSNpTnefl57FhpwciLs=; b=QlO5NMq9xOwQeDYQitX8p+ZL0I8buMUiizZ5AtDu0MMtKwS5VRuRoFDZ7qxBF4hYJR F2Avv/ek0dCNIMfMx1k+D35D+1xPMRf0u1zWbMnRHAwVTKNzIMtH5XW2lMjYxiUxGPDG SEur28CUxhkDwVhdJqNyvY6JSWBRio7Jxx43eLc81RCAUuLkJPttxf0GwvFdyby5E7qh IKSsHDUz5Fnpy+qECEHH1RreRUhUNVW8arSwv9EwTOY7U4+K6nSc905RsKmHM125XmzT TPGnjC4r7piV/bBvwrQlqGBuCcEe/9X4qyyFSQwXbheL1o3JfvcYAb/8vWGm7o7w+vAu AJCA== X-Gm-Message-State: APjAAAUMx1K56XqpA/A2OtJIs0tZGA1AWx35NYgoM4SGrm2QPDzM0BKo vo+sJVl6vOm9ieu0dmWldIjbBF2W9OQ= X-Google-Smtp-Source: APXvYqztd/aFQeKsYeu8VeoPo7FAU5KUAL61J+4RFkygDdeG+R6cikuwGXewOwom6dzdq37mEv9Vxw== X-Received: by 2002:a25:3b56:: with SMTP id i83mr6536439yba.39.1565187680857; Wed, 07 Aug 2019 07:21:20 -0700 (PDT) Received: from rosewood.cam.corp.google.com ([2620:0:1013:11:89c6:2139:5435:371d]) by smtp.gmail.com with ESMTPSA id d204sm20419451ywe.33.2019.08.07.07.21.20 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 07 Aug 2019 07:21:20 -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/5] Revert "Revert "drm/panfrost: Use drm_gem_map_offset()"" Date: Wed, 7 Aug 2019 10:20:55 -0400 Message-Id: <20190807142101.251400-3-sean@poorly.run> X-Mailer: git-send-email 2.23.0.rc1.153.gdeed80330f-goog In-Reply-To: <20190807142101.251400-1-sean@poorly.run> References: <20190807142101.251400-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=zAihxkfX9EywdeIr6db6fRkWBSNpTnefl57FhpwciLs=; b=BJfAGBUCOSWv1TPP1GouABQNDNNQr2dTG+rWAauDI+tcX5aeqQ3zoXDZMzAliPRw/U 0ruw++CCecpHSRWl4cn6F35oahceqIAcnGBW/PJ6VFi62EhT1iR+ftTfKX3IGGYV4c39 mjiQ0fWA3nT6JlIG3hmm+EU40ElwMnFm3mogo448hcoSKCvycWwZCsghZ9ReHwowVzHr yR6YAb08lLNe7Bw5pUvxvuCeX/YejiQcRYrsCXarZGxbDP2Z4z88IsX1XxVKDaAcnmXK 4twZkcdTb+ZnhNNw+tKaYSBwm2YslLtQrYfIx17B2LTHX3d8CRwKRip0Zydq21X0/VYz HF9A== 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: Sean Paul This reverts commit be855382bacb5ccfd24f9be6098d87acf4cfbb15. Mandatory review was missing from this patch. Signed-off-by: Sean Paul --- drivers/gpu/drm/panfrost/panfrost_drv.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/drivers/gpu/drm/panfrost/panfrost_drv.c b/drivers/gpu/drm/panfrost/panfrost_drv.c index b187daa4da85..b2e325e270b7 100644 --- a/drivers/gpu/drm/panfrost/panfrost_drv.c +++ b/drivers/gpu/drm/panfrost/panfrost_drv.c @@ -291,26 +291,14 @@ 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; } - 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; + return drm_gem_map_offset(file_priv, dev, args->handle, + &args->offset); } static int panfrost_ioctl_get_bo_offset(struct drm_device *dev, void *data,