From patchwork Tue Jul 25 08:01:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 9861413 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 C0F6D6038C for ; Tue, 25 Jul 2017 08:02:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B318C28429 for ; Tue, 25 Jul 2017 08:02:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A80AC28608; Tue, 25 Jul 2017 08:02:35 +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=unavailable 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 70C6B28429 for ; Tue, 25 Jul 2017 08:02:35 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0B2C16E3B0; Tue, 25 Jul 2017 08:01:47 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-x241.google.com (mail-wm0-x241.google.com [IPv6:2a00:1450:400c:c09::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2585F6E3B7 for ; Tue, 25 Jul 2017 08:01:44 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id 184so15264903wmo.3 for ; Tue, 25 Jul 2017 01:01:44 -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=feWkfLZNPXakxPxRkOqLaYrMI4vra/bwzzpD/k5uFu0=; b=RwJaF5DzDud1+ElIcd39cCsgIjbHyGS9AbRpjo7KHVf9HQXoXuKY+1KqtMyvZALQbl IQX6B8DzN2jw/madNlaMIKqI1sjTuA8PFX1EXvJofrvpZN5BQiHZ1CZ28r4eioHMlYLO WjzCPiaJIVTcA8xmJrhNGIRHxVWBmVE4P5Ktg= 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=feWkfLZNPXakxPxRkOqLaYrMI4vra/bwzzpD/k5uFu0=; b=F369GOqV5zeeZRq/gS+XPiHUQhVe8dVXHcaJ0g3cKD+k1BU4dkZrJG3qbjbvwQa2Xr 4P7PipeLSZWvmoDzTWUIW1VDtriLLGryyhtwEJCnIG2UsENcR+A2aCN+JSoTHJtHKKzw GIBe6e7ApRiyGLrLC2A5cUPDiPBNmqvX/jqyFsXDGUYHReR7boeNgrgbE2Qs7z7ubnaA SmTCOdOyrr+YsEd+uYBJrS7urliSzMEH3IHUxiZJxZRYa5z767sPMCNV3FxEzajPeaFd CGQhtKssfy2hAAkADIv8TaYlOGhZnGN3jm0uTCEiG4trrXvta3cu3dRAd2MADleg1GyJ WkwQ== X-Gm-Message-State: AIVw111dwlha3mqZSBelosqUG9MOYxbqO/QQriF2ro2ufJQ0kz2HvTo+ xIdI0lu1qQZ+Nqteh9I= X-Received: by 10.28.232.24 with SMTP id f24mr6886059wmh.4.1500969702550; Tue, 25 Jul 2017 01:01:42 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:5640:0:960b:2678:e223:c1c6]) by smtp.gmail.com with ESMTPSA id j8sm14228384wrj.10.2017.07.25.01.01.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 25 Jul 2017 01:01:41 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Tue, 25 Jul 2017 10:01:22 +0200 Message-Id: <20170725080122.20548-9-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170725080122.20548-1-daniel.vetter@ffwll.ch> References: <20170725080122.20548-1-daniel.vetter@ffwll.ch> Cc: Daniel Vetter , DRI Development Subject: [Intel-gfx] [PATCH 8/8] drm: Nuke drm_atomic_legacy_backoff 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-Virus-Scanned: ClamAV using ClamSMTP Finally all users are gone! Signed-off-by: Daniel Vetter Reviewed-by: Maarten Lankhorst --- drivers/gpu/drm/drm_atomic.c | 32 -------------------------------- include/drm/drm_atomic.h | 2 -- 2 files changed, 34 deletions(-) diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c index 306fdca92abf..1b755439f591 100644 --- a/drivers/gpu/drm/drm_atomic.c +++ b/drivers/gpu/drm/drm_atomic.c @@ -1588,38 +1588,6 @@ drm_atomic_add_affected_planes(struct drm_atomic_state *state, EXPORT_SYMBOL(drm_atomic_add_affected_planes); /** - * drm_atomic_legacy_backoff - locking backoff for legacy ioctls - * @state: atomic state - * - * This function should be used by legacy entry points which don't understand - * -EDEADLK semantics. For simplicity this one will grab all modeset locks after - * the slowpath completed. - */ -void drm_atomic_legacy_backoff(struct drm_atomic_state *state) -{ - struct drm_device *dev = state->dev; - int ret; - bool global = false; - - if (WARN_ON(dev->mode_config.acquire_ctx == state->acquire_ctx)) { - global = true; - - dev->mode_config.acquire_ctx = NULL; - } - -retry: - drm_modeset_backoff(state->acquire_ctx); - - ret = drm_modeset_lock_all_ctx(dev, state->acquire_ctx); - if (ret) - goto retry; - - if (global) - dev->mode_config.acquire_ctx = state->acquire_ctx; -} -EXPORT_SYMBOL(drm_atomic_legacy_backoff); - -/** * drm_atomic_check_only - check whether a given config would work * @state: atomic configuration to check * diff --git a/include/drm/drm_atomic.h b/include/drm/drm_atomic.h index fccc09d5f2b3..066b8dac3978 100644 --- a/include/drm/drm_atomic.h +++ b/include/drm/drm_atomic.h @@ -545,8 +545,6 @@ int __must_check drm_atomic_add_affected_planes(struct drm_atomic_state *state, struct drm_crtc *crtc); -void drm_atomic_legacy_backoff(struct drm_atomic_state *state); - void drm_atomic_clean_old_fb(struct drm_device *dev, unsigned plane_mask, int ret);