From patchwork Thu Jan 23 19:19:19 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Rodrigo Vivi X-Patchwork-Id: 3530881 Return-Path: X-Original-To: patchwork-intel-gfx@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 D751EC02DC for ; Thu, 23 Jan 2014 19:19:41 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8A0BF2010E for ; Thu, 23 Jan 2014 19:19:37 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 21091200F4 for ; Thu, 23 Jan 2014 19:19:33 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DF6C2FA00D; Thu, 23 Jan 2014 11:19:31 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-yk0-f178.google.com (mail-yk0-f178.google.com [209.85.160.178]) by gabe.freedesktop.org (Postfix) with ESMTP id 8CEF2FA309 for ; Thu, 23 Jan 2014 11:19:26 -0800 (PST) Received: by mail-yk0-f178.google.com with SMTP id 79so3399332ykr.9 for ; Thu, 23 Jan 2014 11:19:26 -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 :mime-version:content-type:content-transfer-encoding; bh=izB/widWoq6j5JiWLXHErdXAP08blxQsXQIGqbxeqPo=; b=qWnx1lCbtgqdXTmRk0nb0rRuOWMEsv4WUU5Ba5ej48jE0aD7m2g1MAdOPAFICv+S9t yl+3ziXf4jI9iuDwrn8JoHYFgKgpnvriDiq0kjKItkJaCbPBL8SPi+oao5u7HcM4WY2V OW2gJGScd0iGocA3EaHU3Eupezl6qyAwyOG6ahYnFcQGIa/seCS7rpwxQn2owMdYBZmf Zs63zWKjgso3mUIlYf503KR958AYZxUUMpdD45wcMl21FxNY97XykkBE0t7ihUeCRisO MWHmGCUpzHFzcLxSeVbPpsypCya2goGIWH4no63FqZ79v8YqcPrgsREDl/5iBJwBv+gV D4Ug== X-Received: by 10.236.63.135 with SMTP id a7mr9010079yhd.84.1390504765993; Thu, 23 Jan 2014 11:19:25 -0800 (PST) Received: from localhost.localdomain ([177.167.48.221]) by mx.google.com with ESMTPSA id d7sm39358559yhd.24.2014.01.23.11.19.23 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 23 Jan 2014 11:19:25 -0800 (PST) From: Rodrigo Vivi To: intel-gfx@lists.freedesktop.org Date: Thu, 23 Jan 2014 17:19:19 -0200 Message-Id: <1390504759-6078-1-git-send-email-rodrigo.vivi@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1390501010-4641-1-git-send-email-rodrigo.vivi@gmail.com> References: <1390501010-4641-1-git-send-email-rodrigo.vivi@gmail.com> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH] drm/i915: Set primary plane enable at dpcntrl. X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org X-Spam-Status: No, score=-4.6 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=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 This patch allows system to safely recover after kms_psr_sink_crc check or any other similar case that might fail when PSR is enabled. Ville made and sent me this patch after noticing that primary plane enabled bit was set during test case and unset after failure. What was causing a hard and non-recoverable blank screen. After the failure when alternating from fbcon to x section it was possible to see and move mouse cursor, but nothing else. Everything else was fully black. A for dpms off/on also haleped to get screen back. But this patch seeting primary plane enabled bit propertly seemed more clean. v2: Fix identation issue. Cc: Ville Syrjälä Signed-off-by: Rodrigo Vivi --- drivers/gpu/drm/i915/intel_display.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index dde98020..ed5ffce 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -2095,6 +2095,9 @@ static int i9xx_update_plane(struct drm_crtc *crtc, struct drm_framebuffer *fb, if (IS_G4X(dev)) dspcntr |= DISPPLANE_TRICKLE_FEED_DISABLE; + if (intel_crtc->primary_enabled) + dspcntr |= DISPLAY_PLANE_ENABLE; + I915_WRITE(reg, dspcntr); linear_offset = y * fb->pitches[0] + x * (fb->bits_per_pixel / 8); @@ -2192,6 +2195,9 @@ static int ironlake_update_plane(struct drm_crtc *crtc, else dspcntr |= DISPPLANE_TRICKLE_FEED_DISABLE; + if (intel_crtc->primary_enabled) + dspcntr |= DISPLAY_PLANE_ENABLE; + I915_WRITE(reg, dspcntr); linear_offset = y * fb->pitches[0] + x * (fb->bits_per_pixel / 8); @@ -8586,6 +8592,11 @@ static int intel_gen7_queue_flip(struct drm_device *dev, intel_ring_emit(ring, i915_gem_obj_ggtt_offset(obj) + intel_crtc->dspaddr_offset); intel_ring_emit(ring, (MI_NOOP)); + if (IS_VALLEYVIEW(dev) && intel_crtc->primary_enabled) + I915_WRITE(DSPCNTR(intel_crtc->plane), + I915_READ(DSPCNTR(intel_crtc->plane)) + | DISPLAY_PLANE_ENABLE); + intel_mark_page_flip_active(intel_crtc); __intel_ring_advance(ring); return 0;