From patchwork Fri May 2 17:21:59 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 4104801 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 7DBA2BFF02 for ; Fri, 2 May 2014 17:22:04 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 98C1820377 for ; Fri, 2 May 2014 17:22:03 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id C41BF20373 for ; Fri, 2 May 2014 17:22:02 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2F4AB6EFC1; Fri, 2 May 2014 10:22:01 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qg0-f42.google.com (mail-qg0-f42.google.com [209.85.192.42]) by gabe.freedesktop.org (Postfix) with ESMTP id D97436EFCD for ; Fri, 2 May 2014 10:21:59 -0700 (PDT) Received: by mail-qg0-f42.google.com with SMTP id q107so615737qgd.29 for ; Fri, 02 May 2014 10:21:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=IOwe/gnoJ2nydWQnIZ5/QM4lPF9KCyw6Q4oJ72GEiiQ=; b=OnqCBGQR+FpJGSnRx/ORpWZg43Qv/Z2N+h9jnd2L3yxK8EdjnmZJ28sxXLcFePZb95 N3ygkYO5Fcshas23vBzREJk+q8i8C/PWgDeHYb5t0kDw6xu1vrz5Py7PUOVZtnfu0qms p2tpxGgF/Z/DbhW9DjflF8QU9IChK2ROfzB75lqm1E4Vy5C/L/qcCNjc7sY5GMkYMofH SDGFLI5C4mvXsR4mpnYd1DgLEck4SKBXn6W0Vn0w4J6xCS5HmIspfBr1ErzKyvgonU4t iObp5y+fZM6+n20xZNw/wB1gwhjlgbBLe/fv3w/Mjq9YIx+TpDVX8aiqY8zPA08KwGNR H9Rw== MIME-Version: 1.0 X-Received: by 10.224.41.75 with SMTP id n11mr24113911qae.21.1399051319348; Fri, 02 May 2014 10:21:59 -0700 (PDT) Received: by 10.140.96.5 with HTTP; Fri, 2 May 2014 10:21:59 -0700 (PDT) In-Reply-To: <5363CA91.7070203@canonical.com> References: <5363CA91.7070203@canonical.com> Date: Fri, 2 May 2014 13:21:59 -0400 Message-ID: Subject: Re: Lenovo x120e resume regression in 3.15-rc1 bisected to 'drm/crtc-helpers: fix dpms on logic' From: Alex Deucher To: Tim Gardner Cc: Daniel Vetter , LKML , Maling list - DRI developers , kernel-team , Dave Airlie , Dan Carpenter X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-4.7 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham 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 On Fri, May 2, 2014 at 12:40 PM, Tim Gardner wrote: > I've bisected a resume regression on a Lenovo x120e to > 177cf92de4aa97ec1435987e91696ed8b5023130 (drm/crtc-helpers: fix dpms on > logic). Everything works fine with this patch reverted on top of > 3.15-rc3. I realize it is correcting a coding error that has been in > place since 3.11, but it is also causing this laptop to resume to a > black screen wherein the platform appears to be locked up (no console, > no network). See attached bisect log and lspci. The BIOS version is 1.15. > Does the attached patch help? I haven't had a chance to unwind all the logic in the crtc helper code. Alex From dc318b2c8583d3726c64177024d777c9408d3538 Mon Sep 17 00:00:00 2001 From: Alex Deucher Date: Fri, 2 May 2014 13:18:23 -0400 Subject: [PATCH] drm/radeon: force connector dpm state to ON on modeset We turn the display on as part of the modeset, so mark it as such. Signed-off-by: Alex Deucher --- drivers/gpu/drm/radeon/atombios_encoders.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/gpu/drm/radeon/atombios_encoders.c b/drivers/gpu/drm/radeon/atombios_encoders.c index e6eb509..0ba025c 100644 --- a/drivers/gpu/drm/radeon/atombios_encoders.c +++ b/drivers/gpu/drm/radeon/atombios_encoders.c @@ -2397,9 +2397,13 @@ static void radeon_atom_encoder_prepare(struct drm_encoder *encoder) static void radeon_atom_encoder_commit(struct drm_encoder *encoder) { + struct drm_connector *connector = radeon_get_connector_for_encoder(encoder); + /* need to call this here as we need the crtc set up */ radeon_atom_encoder_dpms(encoder, DRM_MODE_DPMS_ON); radeon_atom_output_lock(encoder, false); + if (connector) + connector->dpms = DRM_MODE_DPMS_ON; } static void radeon_atom_encoder_disable(struct drm_encoder *encoder) -- 1.8.3.1