From patchwork Mon Apr 3 08:32:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 9658947 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 490C660352 for ; Mon, 3 Apr 2017 08:33:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3BC0828450 for ; Mon, 3 Apr 2017 08:33:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 30BF02845B; Mon, 3 Apr 2017 08:33:20 +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]) (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 A2AA528450 for ; Mon, 3 Apr 2017 08:33:19 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id AD6EA6E2E2; Mon, 3 Apr 2017 08:33:15 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wr0-x244.google.com (mail-wr0-x244.google.com [IPv6:2a00:1450:400c:c0c::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4EFDB6E2D5 for ; Mon, 3 Apr 2017 08:33:14 +0000 (UTC) Received: by mail-wr0-x244.google.com with SMTP id u18so31342348wrc.0 for ; Mon, 03 Apr 2017 01:33:14 -0700 (PDT) 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=SikPysTP/V4zq0EDKaFdByoQrLlV1StkFsHxbGgr1No=; b=j4R6X1PYNR0KNcTYrrqAr4IhDvuTFkmisuSv+2C5/g0uFX56APU+/SNRt8jSk6h5dN IxA1RdswW/8RFeyS4y7ILnbeuHw9WBPjoYfRO7IN1Y22nE3i7vt7o1ik76GCoN1g1z73 SKTQhCjk3Rf2Oj+DrmmOOvyMoJ1LWPpLkzSvI= 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=SikPysTP/V4zq0EDKaFdByoQrLlV1StkFsHxbGgr1No=; b=NbRJbgHVAbhXK9dlC0drQh4v3VEBkA5ETL5+mh63cDXcplulKl/hUM26OG7LAlfB5Y DoXVxgTxHn+BvEpTrPb00zGC0K6/5V4L5eivnfVbDsHMMxqC8HFmutKtXy2xYqjtbwO9 11VnJKePd/6zph0hH5Va0dRRz46vg1z0z0mNSsM1QVvCeU4BTpWk/xyMXipOQmNACGSv lxxSvVMgfVrg2bWJeQGvH/fvLkyHOYWgdBryrCzpRYFIwTb5Sjdey3ZV0f3jCAZnG5FA NOVoyMdeytc8piDDNSeAzzEvUBtDrQNOrJKwByeFF1m6PdRhZM0dlCMnVhvtJR1UZOvH PhCQ== X-Gm-Message-State: AFeK/H2yEVxpdMwJVX8AdcBk0EGLq31yhy1GZ7jxiJpjIMXLWd0fIW7dBkdb6nkogU1CFA== X-Received: by 10.223.170.216 with SMTP id i24mr14387427wrc.153.1491208392885; Mon, 03 Apr 2017 01:33:12 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:56b5:0:3dcb:681a:5b6e:8025]) by smtp.gmail.com with ESMTPSA id w10sm13326590wmw.14.2017.04.03.01.33.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 03 Apr 2017 01:33:12 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 01/15] drm: Make drm_modeset_lock_crtc internal Date: Mon, 3 Apr 2017 10:32:50 +0200 Message-Id: <20170403083304.9083-2-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170403083304.9083-1-daniel.vetter@ffwll.ch> References: <20170403083304.9083-1-daniel.vetter@ffwll.ch> Cc: Daniel Vetter , Intel Graphics Development , Daniel Vetter 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 This is only for legacy paths that need to grab the crtc/plane lock combo. If you want to lock a crtc, just use drm_modeset_lock(). Reviewed-by: Harry Wentland Signed-off-by: Daniel Vetter --- drivers/gpu/drm/drm_crtc_internal.h | 3 +++ drivers/gpu/drm/drm_modeset_lock.c | 14 -------------- include/drm/drm_modeset_lock.h | 2 -- 3 files changed, 3 insertions(+), 16 deletions(-) diff --git a/drivers/gpu/drm/drm_crtc_internal.h b/drivers/gpu/drm/drm_crtc_internal.h index 8c04275cf226..de1047530e07 100644 --- a/drivers/gpu/drm/drm_crtc_internal.h +++ b/drivers/gpu/drm/drm_crtc_internal.h @@ -61,6 +61,9 @@ int drm_mode_getresources(struct drm_device *dev, void *data, struct drm_file *file_priv); +/* drm_modeset_lock.c */ +void drm_modeset_lock_crtc(struct drm_crtc *crtc, + struct drm_plane *plane); /* drm_dumb_buffers.c */ /* IOCTLs */ int drm_mode_create_dumb_ioctl(struct drm_device *dev, diff --git a/drivers/gpu/drm/drm_modeset_lock.c b/drivers/gpu/drm/drm_modeset_lock.c index bf60f2645e55..c94eff9d7544 100644 --- a/drivers/gpu/drm/drm_modeset_lock.c +++ b/drivers/gpu/drm/drm_modeset_lock.c @@ -148,19 +148,6 @@ void drm_modeset_unlock_all(struct drm_device *dev) } EXPORT_SYMBOL(drm_modeset_unlock_all); -/** - * drm_modeset_lock_crtc - lock crtc with hidden acquire ctx for a plane update - * @crtc: DRM CRTC - * @plane: DRM plane to be updated on @crtc - * - * This function locks the given crtc and plane (which should be either the - * primary or cursor plane) using a hidden acquire context. This is necessary so - * that drivers internally using the atomic interfaces can grab further locks - * with the lock acquire context. - * - * Note that @plane can be NULL, e.g. when the cursor support hasn't yet been - * converted to universal planes yet. - */ void drm_modeset_lock_crtc(struct drm_crtc *crtc, struct drm_plane *plane) { @@ -205,7 +192,6 @@ void drm_modeset_lock_crtc(struct drm_crtc *crtc, goto retry; } } -EXPORT_SYMBOL(drm_modeset_lock_crtc); /** * drm_modeset_legacy_acquire_ctx - find acquire ctx for legacy ioctls diff --git a/include/drm/drm_modeset_lock.h b/include/drm/drm_modeset_lock.h index 96d39fbd12ca..88d35bfc9cd8 100644 --- a/include/drm/drm_modeset_lock.h +++ b/include/drm/drm_modeset_lock.h @@ -121,8 +121,6 @@ struct drm_plane; void drm_modeset_lock_all(struct drm_device *dev); void drm_modeset_unlock_all(struct drm_device *dev); -void drm_modeset_lock_crtc(struct drm_crtc *crtc, - struct drm_plane *plane); void drm_modeset_unlock_crtc(struct drm_crtc *crtc); void drm_warn_on_modeset_not_all_locked(struct drm_device *dev); struct drm_modeset_acquire_ctx *