From patchwork Tue Mar 5 13:24:48 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrik Jakobsson X-Patchwork-Id: 2219191 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork1.kernel.org (Postfix) with ESMTP id F1D813FCF2 for ; Tue, 5 Mar 2013 13:26:21 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id EE2E3E6503 for ; Tue, 5 Mar 2013 05:26:21 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-la0-f51.google.com (mail-la0-f51.google.com [209.85.215.51]) by gabe.freedesktop.org (Postfix) with ESMTP id 50943E65C8 for ; Tue, 5 Mar 2013 05:25:42 -0800 (PST) Received: by mail-la0-f51.google.com with SMTP id fo13so6184487lab.10 for ; Tue, 05 Mar 2013 05:25:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer; bh=zIs8nxNDIy7HLyOQjb+osQAnFR4qwmv8+HKcsUsJ8Io=; b=O9wygfHq650DEe9S4zaTCBIyVwcMhhvq0prTExaBcGeqetg/JZMQ4rxnchq0v/WGlr tCoxeMnMOUuhY78fIaWm1HHtNDfB/CYgTSA9K7B2gQenQASpgxEZUtoq9mhmP8i7nEDz XCLSnjEZc5bGKFdConNBQshgBxj2AxCvJEyYdW2uLkrQfMY5EYDidqVIpCGnjKuLJm+3 3VJGTFgXE/WQTUlgTIn0WMcY1dgWYiXESDDL/FT0XhdByDlJdaqW0jcfeYTGYhxbK2lF 4H7WqINeM/6SRvg+MFbLfe7fx89coim/9dqtHNxh8uzgOhP5V5XzT7H5m5u3jO6sTk7B P1FQ== X-Received: by 10.152.133.52 with SMTP id oz20mr21445838lab.30.1362489940873; Tue, 05 Mar 2013 05:25:40 -0800 (PST) Received: from patrik-macbook.lan (h138n8-oer-a32.ias.bredband.telia.com. [2.248.103.138]) by mx.google.com with ESMTPS id oy10sm13974696lab.8.2013.03.05.05.25.39 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 05 Mar 2013 05:25:39 -0800 (PST) From: Patrik Jakobsson To: intel-gfx@lists.freedesktop.org Date: Tue, 5 Mar 2013 14:24:48 +0100 Message-Id: <1362489888-32651-1-git-send-email-patrik.r.jakobsson@gmail.com> X-Mailer: git-send-email 1.7.10.4 Subject: [Intel-gfx] [PATCH] drm/i915: Turn off hsync and vsync on ADPA when disabling crt 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: , MIME-Version: 1.0 Sender: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org According to PRM we need to disable hsync and vsync even though ADPA is disabled. The previous code did infact do the opposite so we fix it. Signed-off-by: Patrik Jakobsson --- drivers/gpu/drm/i915/intel_crt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c index 969d08c..32a3693 100644 --- a/drivers/gpu/drm/i915/intel_crt.c +++ b/drivers/gpu/drm/i915/intel_crt.c @@ -88,7 +88,7 @@ static void intel_disable_crt(struct intel_encoder *encoder) u32 temp; temp = I915_READ(crt->adpa_reg); - temp &= ~(ADPA_HSYNC_CNTL_DISABLE | ADPA_VSYNC_CNTL_DISABLE); + temp |= ADPA_HSYNC_CNTL_DISABLE | ADPA_VSYNC_CNTL_DISABLE; temp &= ~ADPA_DAC_ENABLE; I915_WRITE(crt->adpa_reg, temp); }