From patchwork Mon Nov 24 19:52:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 5369571 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 4DFF99F2F5 for ; Mon, 24 Nov 2014 19:51:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8587D20377 for ; Mon, 24 Nov 2014 19:51:48 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 6D644202FF for ; Mon, 24 Nov 2014 19:51:47 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 008316EF7F; Mon, 24 Nov 2014 11:51:46 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wi0-f177.google.com (mail-wi0-f177.google.com [209.85.212.177]) by gabe.freedesktop.org (Postfix) with ESMTP id 076666EF7F for ; Mon, 24 Nov 2014 11:51:44 -0800 (PST) Received: by mail-wi0-f177.google.com with SMTP id l15so7061372wiw.4 for ; Mon, 24 Nov 2014 11:51:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id; bh=2tnoir/JdxxUL/b/r1LplCsolqw4A47dMxx+9diaNrU=; b=MrQ8sied7SyM6v58g59sftlJazD1Nlmt56MVMDHZuOtbKZzv6hcWedTjvHPIHdrxs9 ULypwPSsXo15cx+rEjekeRYlI0OqM3H3WZhCMi7wUccfGeoV3qM8W9NdhPcf1U/XItDR n6WX0jRIK5NXxr1advsyN7UFiVyI3PYT1lBSQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=2tnoir/JdxxUL/b/r1LplCsolqw4A47dMxx+9diaNrU=; b=bgmi77v121Tr5ywy0MxVstNqpsO34oOtE0ZUYw9MV0QSrcp5+SfYRzkEINE+w0xre1 Uk5dG1ch/YNj2WBEwq3I2HogyRCt1xuxIU1pOqOCwjqvOtk+N3oWCpFfO/jHqsDF68xR YWavUPnW0YIeDg3bTBp5hJO5X7X7FjmnE2k3OaUDL94/Tw07+QCHR4hK2W+8DneZqS0h a/wSq2ICKKJTK3O0f+3L+8ndXm/juMeygiEB981mkfFKGdDpeeeAzrR5oXWAwq7oeq4B m9W8Klm4WK6MYZ/E/twzPmDixxLiJl9bxX/SkJYNXRK7boytHLjfCSKf6uPYBPmwrkrj Sfxw== X-Gm-Message-State: ALoCoQmu1ZzYlLYaWDsQYsGdz3dEKPDuENkSG2zMU1Yq9WJDN5RNwFHsxGqM+7qAEJDApWgR64Tj X-Received: by 10.194.248.195 with SMTP id yo3mr36777036wjc.60.1416858703249; Mon, 24 Nov 2014 11:51:43 -0800 (PST) Received: from phenom.ffwll.local (84-73-67-144.dclient.hispeed.ch. [84.73.67.144]) by mx.google.com with ESMTPSA id mc10sm13357998wic.24.2014.11.24.11.51.41 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 24 Nov 2014 11:51:42 -0800 (PST) From: Daniel Vetter To: DRI Development Subject: [PATCH] drm/atomic: Drop per-plane locking TODO Date: Mon, 24 Nov 2014 20:52:04 +0100 Message-Id: <1416858724-22801-1-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.1.1 Cc: Daniel Vetter , 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-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP I've forgotten to remove that in my per-plane locking patch. Reported-by: Rob Clark Signed-off-by: Daniel Vetter --- drivers/gpu/drm/drm_atomic.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c index d3b46746b611..ba49b5ca822f 100644 --- a/drivers/gpu/drm/drm_atomic.c +++ b/drivers/gpu/drm/drm_atomic.c @@ -243,12 +243,6 @@ drm_atomic_get_plane_state(struct drm_atomic_state *state, if (state->plane_states[index]) return state->plane_states[index]; - /* - * TODO: We currently don't have per-plane mutexes. So instead of trying - * crazy tricks with deferring plane->crtc and hoping for the best just - * grab all crtc locks. Once we have per-plane locks we must update this - * to only take the plane mutex. - */ ret = drm_modeset_lock(&plane->mutex, state->acquire_ctx); if (ret) return ERR_PTR(ret);