Message ID | 20190228170034.27660-3-daniel.vetter@ffwll.ch (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <dri-devel-bounces@lists.freedesktop.org> 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 B746A17E9 for <patchwork-dri-devel@patchwork.kernel.org>; Thu, 28 Feb 2019 17:00:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A6FE12F4D7 for <patchwork-dri-devel@patchwork.kernel.org>; Thu, 28 Feb 2019 17:00:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9B20B2F4EC; Thu, 28 Feb 2019 17:00:51 +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 5FF662F4D7 for <patchwork-dri-devel@patchwork.kernel.org>; Thu, 28 Feb 2019 17:00:51 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5C1CF6E21D; Thu, 28 Feb 2019 17:00:46 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-ed1-x544.google.com (mail-ed1-x544.google.com [IPv6:2a00:1450:4864:20::544]) by gabe.freedesktop.org (Postfix) with ESMTPS id A7D0D6E21F for <dri-devel@lists.freedesktop.org>; Thu, 28 Feb 2019 17:00:44 +0000 (UTC) Received: by mail-ed1-x544.google.com with SMTP id b20so17568683edw.11 for <dri-devel@lists.freedesktop.org>; Thu, 28 Feb 2019 09:00:44 -0800 (PST) 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; bh=u2kuzuTmVwFS3YgGS5BLtD8OuKTxaEtt4xF4WCwWxUY=; b=Psd68peQ6ivoafc7heqSObRgEeItfjsgHNmqmIqH3Ab3aOaf3TBlCPBM6s39v4HxnR BIiGFvH0QmXX/wWWQmn2KaZB14zFrOs+F49Z1kyr7/pBunwoEdwBO1OVhsvGjWS5Mbfa MCj12XQsedNLcHcJD3v3JOBCShYe0HPQdAws9GXXD0Zr4znNbJfWdYle+rKEIyXA8fkb B2WVVFqUBjXtA84qbha22KcNBKOHqqacKx98YGpXNQ17axgJH28/iMdwYLpUUSDAsX57 i0JzRXZFAaAhLDDMolMg1xsDiWXAYZ0zUYZ8SdHPmevCprSEOXr1gcE6dSL1fSm+fOGj A4Bw== X-Gm-Message-State: APjAAAUXJACuO+Rbv5fr5v4aeYAXO2Cha0iRUu2H+aITPoKfaK/8ffJ7 HJsxChcpYnh05lQmllWW0vSDvf6cfyDakQ== X-Google-Smtp-Source: APXvYqz4lgLkln0FfU0qPUuk3kCjeFnQxnLBBQ1fnQb97GXseQD2k3nMDrAh3ywzeQHhPvSEGhAcMw== X-Received: by 2002:a50:d2d2:: with SMTP id q18mr484701edg.35.1551373242959; Thu, 28 Feb 2019 09:00:42 -0800 (PST) Received: from wespe.ffwll.local ([2a02:168:569e:0:7e01:304d:1991:69d]) by smtp.gmail.com with ESMTPSA id k26sm2070910edd.16.2019.02.28.09.00.41 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 28 Feb 2019 09:00:42 -0800 (PST) From: Daniel Vetter <daniel.vetter@ffwll.ch> To: DRI Development <dri-devel@lists.freedesktop.org> Subject: [PATCH 2/7] drm/lease: Drop recursive leads checks Date: Thu, 28 Feb 2019 18:00:29 +0100 Message-Id: <20190228170034.27660-3-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.14.4 In-Reply-To: <20190228170034.27660-1-daniel.vetter@ffwll.ch> References: <20190228170034.27660-1-daniel.vetter@ffwll.ch> X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=u2kuzuTmVwFS3YgGS5BLtD8OuKTxaEtt4xF4WCwWxUY=; b=hUJ5C/Yuq4yRNGtzkR0/NGXn3tQ0Lv2A2xGFvC2euey3otDdmQCZl0fJQ04r3+6iKT d7X1jBILasv72qmcGd+ia+gwyq+JSNaeGCtLrIbyDrVFMPPKFKVwXBh3vJNvH5NlC0ze fQF/1Ahfkcdwo66ZMGyE2bCAKeIOUPTyjtqbE= X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development <dri-devel.lists.freedesktop.org> List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/dri-devel>, <mailto:dri-devel-request@lists.freedesktop.org?subject=unsubscribe> List-Archive: <https://lists.freedesktop.org/archives/dri-devel> List-Post: <mailto:dri-devel@lists.freedesktop.org> List-Help: <mailto:dri-devel-request@lists.freedesktop.org?subject=help> List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/dri-devel>, <mailto:dri-devel-request@lists.freedesktop.org?subject=subscribe> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>, Intel Graphics Development <intel-gfx@lists.freedesktop.org>, Keith Packard <keithp@keithp.com>, Daniel Vetter <daniel.vetter@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" <dri-devel-bounces@lists.freedesktop.org> X-Virus-Scanned: ClamAV using ClamSMTP |
Series |
some cleanups and uapi clarification for leases
|
expand
|
diff --git a/drivers/gpu/drm/drm_lease.c b/drivers/gpu/drm/drm_lease.c index 1176d814cf7f..cce5d9dd52ff 100644 --- a/drivers/gpu/drm/drm_lease.c +++ b/drivers/gpu/drm/drm_lease.c @@ -220,8 +220,6 @@ static struct drm_master *drm_lease_create(struct drm_master *lessor, struct idr error = 0; if (!idr_find(&dev->mode_config.object_idr, object)) error = -ENOENT; - else if (!_drm_lease_held_master(lessor, object)) - error = -EACCES; else if (_drm_has_leased(lessor, object)) error = -EBUSY;
We disallow subleasing, so no point checking whether the master holds all the leases - it will. Spotted while typing exhaustive igt coverage for all these corner cases. Cc: Keith Packard <keithp@keithp.com> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> --- drivers/gpu/drm/drm_lease.c | 2 -- 1 file changed, 2 deletions(-)