From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A20E8C43381 for ; Fri, 22 Mar 2019 13:20:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 70F6E2075E for ; Fri, 22 Mar 2019 13:20:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553260828; bh=LD1IhDGEnOubhUA8t2aT3Xv5nnN6s9j2pdSKaQvip60=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Pj9mdc/LdP7RKQ1hyO89wxgRENzwwP5FApjd6jR+hwWuf90ecGATdRJXDByvM75dA qkCtAtUNMcvdGVyXCZLZpa6cfrS5kl/O9BvA9SslGFrdYAcGFANrnEXc7QZQlyKC0D 1wSA9Sc7XyHhJSphDSqWb+HK9kzoOUDDWSFnTGTM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728268AbfCVLVn (ORCPT ); Fri, 22 Mar 2019 07:21:43 -0400 Received: from mail.kernel.org ([198.145.29.99]:48216 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728645AbfCVLVm (ORCPT ); Fri, 22 Mar 2019 07:21:42 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6BF8E218A2; Fri, 22 Mar 2019 11:21:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553253701; bh=LD1IhDGEnOubhUA8t2aT3Xv5nnN6s9j2pdSKaQvip60=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=a/FkwhtxM+bbR4MTTSWFqndO7UiiHR5SAlXWFK1rAlqQfifzRhXw4l70raUJoaU/P 0JhT9xK1idETwVuxG/JngfcU95/RKajS5YUuidtVIZ5CKZgxQ4rW5bBp8NysMMsczX Co2benC3D6tsf8EINBnG9TCjg6D0PhA7u0ehGswE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, "Kristian H. Kristensen" , Rob Clark , Sasha Levin Subject: [PATCH 3.18 027/134] drm/msm: Unblock writer if reader closes file Date: Fri, 22 Mar 2019 12:14:00 +0100 Message-Id: <20190322111211.752019502@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190322111210.465931067@linuxfoundation.org> References: <20190322111210.465931067@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 3.18-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit 99c66bc051e7407fe0bf0607b142ec0be1a1d1dd ] Prevents deadlock when fifo is full and reader closes file. Signed-off-by: Kristian H. Kristensen Signed-off-by: Rob Clark Signed-off-by: Sasha Levin --- drivers/gpu/drm/msm/msm_rd.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/msm/msm_rd.c b/drivers/gpu/drm/msm/msm_rd.c index 9a78c48817c6a..909a52b21ebe7 100644 --- a/drivers/gpu/drm/msm/msm_rd.c +++ b/drivers/gpu/drm/msm/msm_rd.c @@ -103,7 +103,9 @@ static void rd_write(struct msm_rd_state *rd, const void *buf, int sz) char *fptr = &fifo->buf[fifo->head]; int n; - wait_event(rd->fifo_event, circ_space(&rd->fifo) > 0); + wait_event(rd->fifo_event, circ_space(&rd->fifo) > 0 || !rd->open); + if (!rd->open) + return; n = min(sz, circ_space_to_end(&rd->fifo)); memcpy(fptr, ptr, n); @@ -192,7 +194,10 @@ static int rd_open(struct inode *inode, struct file *file) static int rd_release(struct inode *inode, struct file *file) { struct msm_rd_state *rd = inode->i_private; + rd->open = false; + wake_up_all(&rd->fifo_event); + return 0; } -- 2.19.1