From patchwork Thu Nov 20 22:18:38 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Clark X-Patchwork-Id: 5351111 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 A527A9F2F1 for ; Thu, 20 Nov 2014 22:18:47 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D995520160 for ; Thu, 20 Nov 2014 22:18:46 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id D553020131 for ; Thu, 20 Nov 2014 22:18:45 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A71976FB8F; Thu, 20 Nov 2014 14:18:44 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qc0-f172.google.com (mail-qc0-f172.google.com [209.85.216.172]) by gabe.freedesktop.org (Postfix) with ESMTP id 29E786FB8F for ; Thu, 20 Nov 2014 14:18:43 -0800 (PST) Received: by mail-qc0-f172.google.com with SMTP id m20so2880555qcx.17 for ; Thu, 20 Nov 2014 14:18:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=6BltC4Zo3NXIU39Ukixr2VOJhrYa0nXCFB1Qqn4VpbI=; b=03YNkgVZwK3h+jllJCIFZap4ORLSYeZA++4T9G6C1R/gzEJZ8YXrJhNRnGaKLa3jkL mrh3yywpk054tXOcYr8E3+yJMICVtVHr4ZcBIrMELj1+eSDlKmlEGgAMPRCJl+PeS/F6 lMMIbovEr3absVBXiTB4H2CpOYoNJQvZlgfynKtOAQZGBm8D0GtHDBTW+2hYWR7IdePd AOWsheWfA2i8E5ejlyeWYXKE+5Q+h475tZJbZRoPS/j/z5RSS3rEjzAD0QTBNHHyQ/K0 aEIdjXfjuVHsjxhc52rvIIEQQgmCJep0W0QyXTYtJ2QBy+3zVBNO0w5TWE8t5l+/nkjs UEvQ== X-Received: by 10.224.37.133 with SMTP id x5mr1011868qad.59.1416521922663; Thu, 20 Nov 2014 14:18:42 -0800 (PST) Received: from localhost (nat-pool-bos-t.redhat.com. [66.187.233.206]) by mx.google.com with ESMTPSA id n8sm3082700qaz.40.2014.11.20.14.18.41 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 20 Nov 2014 14:18:41 -0800 (PST) From: Rob Clark To: dri-devel@lists.freedesktop.org Subject: [PATCH] drm/atomic: shutdown *current* encoder Date: Thu, 20 Nov 2014 17:18:38 -0500 Message-Id: <1416521918-15537-1-git-send-email-robdclark@gmail.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1416516907-29440-2-git-send-email-robdclark@gmail.com> References: <1416516907-29440-2-git-send-email-robdclark@gmail.com> 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_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, 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 In disable_outputs() we need to shut down the outgoing encoder, not the incoming one (we have already swapped-state at this point). Without this, we end up telling the driver to crtc->dpms(OFF) without first encoder->dpms(OFF), and that makes some hw quite unhappy. v2: missing WARN_ON() hunk and comment Reviewed-by: Daniel Vetter Signed-off-by: Rob Clark --- drivers/gpu/drm/drm_atomic_helper.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index 5ae5b25..61bec0b 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -502,9 +502,12 @@ disable_outputs(struct drm_device *dev, struct drm_atomic_state *old_state) if (!old_conn_state || !old_conn_state->crtc) continue; - encoder = connector->state->best_encoder; + encoder = old_conn_state->best_encoder; - if (!encoder) + /* We shouldn't get this far if we didn't previously have + * an encoder.. but WARN_ON() rather than explode. + */ + if (WARN_ON(!encoder)) continue; funcs = encoder->helper_private;