From patchwork Thu Mar 31 08:08:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomeu Vizoso X-Patchwork-Id: 8708111 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id CFA64C0553 for ; Thu, 31 Mar 2016 08:08:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1589F2028D for ; Thu, 31 Mar 2016 08:08:29 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 2BFCD20160 for ; Thu, 31 Mar 2016 08:08:28 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3898B6E9C6; Thu, 31 Mar 2016 08:08:24 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-x22a.google.com (mail-wm0-x22a.google.com [IPv6:2a00:1450:400c:c09::22a]) by gabe.freedesktop.org (Postfix) with ESMTPS id E09A46E9C6 for ; Thu, 31 Mar 2016 08:08:21 +0000 (UTC) Received: by mail-wm0-x22a.google.com with SMTP id p65so103376046wmp.0 for ; Thu, 31 Mar 2016 01:08:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id; bh=cbqBNqxtoogn4AMGMUCf447m+qFxwcYjgrVlPXBTvC4=; b=NEEHL6wQ24Inw/IloIF/gY5WqXqs+QwG5la+bNoQksppysd75MaxUla9s9PJettk7+ p0H2ZdF5zA/S2YiagvjARd55f2F/c31zmduh61LBYkxSK8AyhTCQ2qZwMRJJkGkGKjqp O9IEssl9rlfByZxG1V1VUYL243eEh4LD94OKEgbeWuKg5tRAQWaVqnQW7v7eIghIg4dl 2J+7iPZvP+DAWkCOWCOkCg8sEG5ACMMF/WJowXL+Frza/w0SFQsaMmWBBae3HzjbkwXB bgMAdAxlXUkAmb5LbWdgOx6u8CweTsdBn9EJps8LunzH1sUIIGze/WRPFiI0RfVZ1DzH yOXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=cbqBNqxtoogn4AMGMUCf447m+qFxwcYjgrVlPXBTvC4=; b=hwTFGZTNdKdd4FcMkLTizMWnj9DCWjU8A0SvnGHxJ4wI4LG2aQANMOfbXBYHTW3fLf 0M5ARCeg82PfP4xUjAPAbPfjCx5vyVMd8g/B8pGJS3uTHU14l2dKS+4k1lXLSJN29W4r DOSLsfeo2/E3d6MpNZkOwiKEcBkCW7sh4uv6i2g0vx2lzh/S1zqjdpGdRGZUNgpkMuXq rpEKp4H/BIkbftwKrM6mLPf2Oxu4RWE1YuNvsnM4dUDhQIMnbJpX9nw3UhUhiuP2jgVN CRKQwNY23kYKD4H7q+Jj6Kn4CaLcDcfMmtvMKMYDJhNlG8j0LWTBe+IxDv+F0LkS3tCR 1a/g== X-Gm-Message-State: AD7BkJKhtR6TZugZCZcXHH/FQzYHo1wU0S1fFLGMbh2U32OqNpXu3cdOce6ZD/2O5ow9JA== X-Received: by 10.194.21.197 with SMTP id x5mr1604011wje.90.1459411699990; Thu, 31 Mar 2016 01:08:19 -0700 (PDT) Received: from cizrna.lan ([109.72.12.79]) by smtp.gmail.com with ESMTPSA id j10sm7692705wjb.46.2016.03.31.01.08.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 Mar 2016 01:08:18 -0700 (PDT) From: Tomeu Vizoso To: linux-kernel@vger.kernel.org Subject: [PATCH] drm/rockchip: Return -EBUSY if there's already a pending flip event v2 Date: Thu, 31 Mar 2016 10:08:00 +0200 Message-Id: <1459411680-6176-1-git-send-email-tomeu.vizoso@collabora.com> X-Mailer: git-send-email 2.5.5 Cc: Tomeu Vizoso , dri-devel@lists.freedesktop.org, linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org 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=-5.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,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 As per the docs, atomic_commit should return -EBUSY "if an asycnhronous updated is requested and there is an earlier updated pending". v2: Use the status of the workqueue instead of vop->event, and don't add a superfluous wait on the workqueue. Signed-off-by: Tomeu Vizoso --- drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_fb.c b/drivers/gpu/drm/rockchip/rockchip_drm_fb.c index 3b8f652698f8..285f8cd5afe1 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_fb.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_fb.c @@ -282,6 +282,9 @@ int rockchip_drm_atomic_commit(struct drm_device *dev, struct rockchip_atomic_commit *commit = &private->commit; int ret; + if (async && work_busy(&commit->work)) + return -EBUSY; + ret = drm_atomic_helper_prepare_planes(dev, state); if (ret) return ret;