From patchwork Thu Nov 20 20:55:07 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Clark X-Patchwork-Id: 5350771 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 AF9AA9F1E1 for ; Thu, 20 Nov 2014 20:55:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EC98E200E1 for ; Thu, 20 Nov 2014 20:55:18 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 12D11201ED for ; Thu, 20 Nov 2014 20:55:18 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1D4176F708; Thu, 20 Nov 2014 12:55:17 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qa0-f54.google.com (mail-qa0-f54.google.com [209.85.216.54]) by gabe.freedesktop.org (Postfix) with ESMTP id 026536F708 for ; Thu, 20 Nov 2014 12:55:16 -0800 (PST) Received: by mail-qa0-f54.google.com with SMTP id i13so2572333qae.27 for ; Thu, 20 Nov 2014 12:55:15 -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=g0yQEfZbZLJL6CFJw2XNc16KFPmDIeYWDg1P1IfOvIM=; b=CLeBoV0DzH73Zzu5LTIBWGRxhR8K3RBWZqWmkblIKcPUIvUfRB3qO6jLIQ4cr+D4X8 eYCmwI2oXYspwG9qvbrnpf/OoSPO0Wgz800Pp/3CmNkNafXXg6/0qo9Q2DJvInAMZM2r 3LxfJ3FVGxWedH498vt1SFqUvteLZpKIlWhrlqv7RUqrUI0MzsAzPKmk3uKGOTeG/D+6 /0ngx3BEjHi9U9D430yPUBeROOMXN5PNu20y702P+2fgEWGdRYKVFKL20LCDfQoB3U4L Mimce/NU5mFX/5u2K8ieSHpcGCBYWF9TNDHkb94G5tKfTu58fWtZ7Mp+pAHXngfKorsS 56KA== X-Received: by 10.224.46.5 with SMTP id h5mr704213qaf.26.1416516915573; Thu, 20 Nov 2014 12:55:15 -0800 (PST) Received: from localhost (nat-pool-bos-t.redhat.com. [66.187.233.206]) by mx.google.com with ESMTPSA id z9sm2931684qai.19.2014.11.20.12.55.14 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 20 Nov 2014 12:55:14 -0800 (PST) From: Rob Clark To: dri-devel@lists.freedesktop.org Subject: [PATCH 2/2] drm/atomic: shutdown *current* encoder Date: Thu, 20 Nov 2014 15:55:07 -0500 Message-Id: <1416516907-29440-2-git-send-email-robdclark@gmail.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1416516907-29440-1-git-send-email-robdclark@gmail.com> References: <1416516907-29440-1-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. Reviewed-by: Daniel Vetter Signed-off-by: Rob Clark --- drivers/gpu/drm/drm_atomic_helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index 5ae5b25..8e4f3fc 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -502,7 +502,7 @@ 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) continue;