From patchwork Wed Oct 31 20:12:49 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paulo Zanoni X-Patchwork-Id: 1681571 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 BB8F94005F for ; Wed, 31 Oct 2012 20:31:11 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A5678A0B6E for ; Wed, 31 Oct 2012 13:31:11 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-ye0-f177.google.com (mail-ye0-f177.google.com [209.85.213.177]) by gabe.freedesktop.org (Postfix) with ESMTP id 5E585A0C0B for ; Wed, 31 Oct 2012 13:14:00 -0700 (PDT) Received: by mail-ye0-f177.google.com with SMTP id r1so354698yen.36 for ; Wed, 31 Oct 2012 13:13:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=5jTmJAIwL+oW8xiMF5cppHEuh4+PLzNi87eSERAw+y8=; b=wbu0sH+zu9A0VnWhYS+UuAth/RqHT7WtVTmiyIbLGohJsBZyQmKAPT3Z47I26e5dOZ Rake3OircGGeaCVBy2YZEDvCuHrUBpqCScu9dG+Sq/vVlzoerkW0sqalx82KIV5STP0a kBiJCZ5aBup1iScBBxMAJhxjZxThdy4QCfpH0W6Lx2g5sSNbKZDDn/3iJUH45EiBMuuA jIvkuohwrsNe7KqhlVxSzdeuFfMpAcjDG2P8w8J6y2BO3G68MSo1yitk9Zav5VfIryIX M+X4vfiWWR2vdTzP97EaNLuq6RUUeHh5ZKuCC4zBxCi2ibknEzSaVtPB46Xv33If+qEP 95dg== Received: by 10.101.151.4 with SMTP id d4mr5618765ano.21.1351714439906; Wed, 31 Oct 2012 13:13:59 -0700 (PDT) Received: from vicky.domain.invalid ([177.42.7.91]) by mx.google.com with ESMTPS id h16sm4354130ani.0.2012.10.31.13.13.58 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 31 Oct 2012 13:13:59 -0700 (PDT) From: Paulo Zanoni To: intel-gfx@lists.freedesktop.org Date: Wed, 31 Oct 2012 18:12:49 -0200 Message-Id: <1351714375-15284-31-git-send-email-przanoni@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1351714375-15284-1-git-send-email-przanoni@gmail.com> References: <1351714375-15284-1-git-send-email-przanoni@gmail.com> Cc: Paulo Zanoni Subject: [Intel-gfx] [PATCH 30/36] drm/i915: don't rely on previous values when setting LPT TRANSCONF 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 From: Paulo Zanoni Because we already set all the bits we can set. Signed-off-by: Paulo Zanoni --- drivers/gpu/drm/i915/intel_display.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 4fbb296..10ea4f5 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -1729,17 +1729,16 @@ static void lpt_enable_pch_transcoder(struct drm_i915_private *dev_priv, assert_fdi_tx_enabled(dev_priv, cpu_transcoder); assert_fdi_rx_enabled(dev_priv, TRANSCODER_A); - val = I915_READ(_TRANSACONF); + val = TRANS_ENABLE; pipeconf_val = I915_READ(PIPECONF(cpu_transcoder)); - val &= ~TRANS_INTERLACE_MASK; if ((pipeconf_val & PIPECONF_INTERLACE_MASK_HSW) == PIPECONF_INTERLACED_ILK) val |= TRANS_INTERLACED; else val |= TRANS_PROGRESSIVE; - I915_WRITE(_TRANSACONF, val | TRANS_ENABLE); + I915_WRITE(_TRANSACONF, val); if (wait_for(I915_READ(_TRANSACONF) & TRANS_STATE_ENABLE, 100)) DRM_ERROR("Failed to enable PCH transcoder\n"); }