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=-7.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 autolearn=ham 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 701D7C282C2 for ; Wed, 13 Feb 2019 14:05:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3D1042075D for ; Wed, 13 Feb 2019 14:05:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550066737; bh=aav6jLdSrZUdF9j4JBTXti2Y4n5GUgAp3sWq1D6rOTo=; h=Subject:To:Cc:From:Date:List-ID:From; b=Mep8mVjfzShEPfFYyyJTmvNX866rNTliPApTlEV1ffTb9pyskhETK6IC0r1RR+h3H VN51gaROZFS/oVqN15E3R1mvkrsOQSCWQ5Ap2oJ3ORj1Y0zwiUsvcfs3T6m5RtJuLR MqbCWfTSUw8qRK/DQUpvm4rPxVaV0wsE69A7d0O8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729024AbfBMOFg (ORCPT ); Wed, 13 Feb 2019 09:05:36 -0500 Received: from wout2-smtp.messagingengine.com ([64.147.123.25]:38801 "EHLO wout2-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726372AbfBMOFg (ORCPT ); Wed, 13 Feb 2019 09:05:36 -0500 Received: from compute6.internal (compute6.nyi.internal [10.202.2.46]) by mailout.west.internal (Postfix) with ESMTP id 64A7B356B; Wed, 13 Feb 2019 09:05:35 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Wed, 13 Feb 2019 09:05:35 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:message-id:mime-version:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=EVWxC3 W5k+ymcYbZsCzRFz1RSN3+z41gU3v0ilvBxQ4=; b=3FtE8Zq6MVvfOOImIUgd8s fwZ3lc5fHUYB6b6zStdhP1PohbS1YQKutoowjyeIQmHBFwmpGIvffowiXWxSCP+n VAPcU+X/Fd88+ray7fmYHagCCGLBypK84HxvpbCxbxB9IuOfWs/0nJMd0vKRr6mz JJVQmF8WvomPXe5cG47qvtYgrAPJNvm+jcA41JaEVHpKThg41TfrkX3MXOIn6QSp gCIOsYGT3TXWqHuU1VdTP/ylWWkbwIp/cyxUD6qY+xyHEy8OaH5yb6pRLLVPIMlM IedxT3Xs8sSneHvMUJoDyzkYvqHjSteZMstBAuyjnD26DuX1v5/tzhDxGYtZyUOQ == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedtledruddtfedgiedtucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfquhhtnecuuegrihhlohhuthemucef tddtnecunecujfgurhepuffvhfffkfggtgfgsehtkeertddttdflnecuhfhrohhmpeeogh hrvghgkhhhsehlihhnuhigfhhouhhnuggrthhiohhnrdhorhhgqeenucfkphepkeefrdek iedrkeelrddutdejnecurfgrrhgrmhepmhgrihhlfhhrohhmpehgrhgvgheskhhrohgrhh drtghomhenucevlhhushhtvghrufhiiigvpedt X-ME-Proxy: Received: from localhost (5356596b.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) by mail.messagingengine.com (Postfix) with ESMTPA id 32EF8E4438; Wed, 13 Feb 2019 09:05:34 -0500 (EST) Subject: FAILED: patch "[PATCH] drm/vmwgfx: Also check for crtc status while checking for DU" failed to apply to 4.20-stable tree To: drawat@vmware.com, stable@vger.kernel.org, thellstrom@vmware.com Cc: From: Date: Wed, 13 Feb 2019 15:05:32 +0100 Message-ID: <15500667321255@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The patch below does not apply to the 4.20-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 479d59026fe44f89fa67efa01a4d47e00808e688 Mon Sep 17 00:00:00 2001 From: Deepak Rawat Date: Fri, 21 Dec 2018 14:38:35 -0800 Subject: [PATCH] drm/vmwgfx: Also check for crtc status while checking for DU active During modeset check it is possible to have all crtc_state's in atomic state. Check for crtc enable status while checking for display unit active status. Only error if enabling a crtc while display unit is not active. Cc: Fixes: 9da6e26c0aae: ("drm/vmwgfx: Fix a layout race condition") Signed-off-by: Deepak Rawat Reviewed-by: Thomas Hellstrom Signed-off-by: Thomas Hellstrom diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c index 5e257a600cea..ed2f67822f45 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c @@ -1646,7 +1646,7 @@ static int vmw_kms_check_topology(struct drm_device *dev, struct drm_connector_state *conn_state; struct vmw_connector_state *vmw_conn_state; - if (!du->pref_active) { + if (!du->pref_active && new_crtc_state->enable) { ret = -EINVAL; goto clean; }