From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-887406-1521799149-2-8912797812552910299 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.25, ME_NOAUTH 0.01, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES en, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='CN', FromHeader='org', MailFrom='org' X-Spam-charsets: plain='UTF-8' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=arctest; t=1521799149; b=wQuZvbRuKCmGdn2SGu1UQUeKgf9gpwU3whg2BZcaoEaVxJY dgpPHridA6QCdRiTFR/Ic5GgjGH70+xpij4vbMvKpRT9IxfOR0FO6QFeJY3pvcGT 3/k1rCCOHq2vDJHNVcLsnXe65q5jJI7ROCsvOmirlfH24WhCOYKTbUHPkfG2WRQM OJ2DulIp0adkmGj1zHPByuQ2LOT2ArI6RyPDrZEZxmS5DByiQF4ZGyjaI1+UxTYh jGjVFxxA8RutBvJUKDX/ms1PyoKZ5YBbdDss7K2kUoO6gp0VZ8SmxS0I+p7Li0+9 CvKTp0reMHZOaFsilzgH6ks2T3M8NM7vovn9Fxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-type:sender :list-id; s=arctest; t=1521799149; bh=uyKlkzGnDiPNKj23+uZBgbM1Zm WdVQY6kXq+076qclI=; b=C2ak6dwo2u0ClfzRo+1X24EwhMoL/StdeOrgp3sqp9 nZgrnuvpVzviamtaTI+3yPQoE+ms80GL5pVKQnqwHbWwUTC23umpw/PVZ8KS/77l nVaEA+MJWZjnyAcwINP9NZIxlkIgOYviGnwFKKkX4s8EVZ52BD15bPTWjp9oa8Cq SDmMcKZLztpINJvQWjO5JMQA2J6eLmFlTkrxc/u89pHfNI9QD7I/eNYBNXQO5DSv 4fSx2ugbeHwtMIFBBwzCUmRCOoodKzd2yXeLLbEetNVrIqSvGm+DDSV+aNUiH5lz EJ4JfkCYGFXNH9jGpLHPIGvWc+1LaVGSbsdV7eQ2ke8w== ARC-Authentication-Results: i=1; mx3.messagingengine.com; arc=none (no signatures found); dkim=none (no signatures found); dmarc=none (p=none,has-list-id=yes,d=none) header.from=linuxfoundation.org; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=linuxfoundation.org header.result=pass header_is_org_domain=yes; x-vs=clean score=-100 state=0 Authentication-Results: mx3.messagingengine.com; arc=none (no signatures found); dkim=none (no signatures found); dmarc=none (p=none,has-list-id=yes,d=none) header.from=linuxfoundation.org; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=linuxfoundation.org header.result=pass header_is_org_domain=yes; x-vs=clean score=-100 state=0 X-ME-VSCategory: clean Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752759AbeCWJ7G (ORCPT ); Fri, 23 Mar 2018 05:59:06 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:35962 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753242AbeCWJ7E (ORCPT ); Fri, 23 Mar 2018 05:59:04 -0400 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Peter Ujfalusi , Tomi Valkeinen , Sasha Levin Subject: [PATCH 4.15 48/84] drm/omap: DMM: Check for DMM readiness after successful transaction commit Date: Fri, 23 Mar 2018 10:54:02 +0100 Message-Id: <20180323095419.273283513@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180323095411.913234798@linuxfoundation.org> References: <20180323095411.913234798@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Peter Ujfalusi [ Upstream commit b7ea6b286c4051e043f691781785e3c4672f014a ] Check the status of the DMM engine after it is reported that the transaction was completed as in rare cases the engine might not reached a working state. The wait_status() will print information in case the DMM is not reached the expected state and the dmm_txn_commit() will return with an error code to make sure that we are not continuing with a broken setup. Signed-off-by: Peter Ujfalusi Signed-off-by: Tomi Valkeinen Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/omapdrm/omap_dmm_tiler.c | 5 +++++ 1 file changed, 5 insertions(+) --- a/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c +++ b/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c @@ -298,7 +298,12 @@ static int dmm_txn_commit(struct dmm_txn msecs_to_jiffies(100))) { dev_err(dmm->dev, "timed out waiting for done\n"); ret = -ETIMEDOUT; + goto cleanup; } + + /* Check the engine status before continue */ + ret = wait_status(engine, DMM_PATSTATUS_READY | + DMM_PATSTATUS_VALID | DMM_PATSTATUS_DONE); } cleanup: