From patchwork Wed Jan 8 19:26:31 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paulo Zanoni X-Patchwork-Id: 3455691 Return-Path: X-Original-To: patchwork-intel-gfx@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 6579A9F1C4 for ; Wed, 8 Jan 2014 19:26:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 504332012E for ; Wed, 8 Jan 2014 19:26:47 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 85B4D20123 for ; Wed, 8 Jan 2014 19:26:46 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 424B7FA8CA; Wed, 8 Jan 2014 11:26:45 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-qc0-f169.google.com (mail-qc0-f169.google.com [209.85.216.169]) by gabe.freedesktop.org (Postfix) with ESMTP id E27D4FA8CA for ; Wed, 8 Jan 2014 11:26:43 -0800 (PST) Received: by mail-qc0-f169.google.com with SMTP id r5so1838914qcx.28 for ; Wed, 08 Jan 2014 11:26:43 -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; bh=++yf9Eg4hVBiwiQwKh5Arn4pOwaVZLunmV2holkg9NU=; b=r4WS34ZjttWVvE7xxY46aWAO8EwiPmu2IO/jlEvh2VCx71nLYQy69y12Rx2xC/JzhV vBx/UOtNpfp6NDIhLCAA7Q26jbqzSUelgvOidYgu7AfynY5sijqNmuPMv7pjrp6is04V c86R5vdp1wKcUH6/LGYp8epRbMQ/KrlO0p1n0CXfyo7pT9gmAC6J1TSUbGjfMJxRsi8V jSGGZ5pdbIZ8xHAejVnfRpZybjm+FaLZ4JHOdh4+qUpON+ESJw71MOb83Aau10DEmmMx 2Z/i47YAMCuxRcpEQwyFNSZBJerVypduId8I7V7ms5BttjYBHUV+gdOWq58tKHG2EJqT SC9w== X-Received: by 10.229.179.69 with SMTP id bp5mr203218788qcb.17.1389209203620; Wed, 08 Jan 2014 11:26:43 -0800 (PST) Received: from localhost.localdomain ([177.16.32.203]) by mx.google.com with ESMTPSA id a5sm2487142qae.2.2014.01.08.11.26.41 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Jan 2014 11:26:43 -0800 (PST) From: Paulo Zanoni To: intel-gfx@lists.freedesktop.org Date: Wed, 8 Jan 2014 17:26:31 -0200 Message-Id: <1389209191-7808-1-git-send-email-przanoni@gmail.com> X-Mailer: git-send-email 1.8.4.2 Cc: Paulo Zanoni Subject: [Intel-gfx] [PATCH] drm/i915: only apply GAMMA_MODE IPS WA on HSW 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@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org X-Spam-Status: No, score=-4.2 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 From: Paulo Zanoni The WA is mentioned in HSW's GAMMA_MODE register documentation, but not on on BDW's documentation, so let's assume it is not needed there. Signed-off-by: Paulo Zanoni Reviewed-by: Damien Lespiau --- drivers/gpu/drm/i915/intel_display.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Not tested. diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index bf4c6b5..3d98bcd 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -3496,7 +3496,7 @@ static void intel_crtc_load_lut(struct drm_crtc *crtc) /* Workaround : Do not read or write the pipe palette/gamma data while * GAMMA_MODE is configured for split gamma and IPS_CTL has IPS enabled. */ - if (intel_crtc->config.ips_enabled && + if (IS_HASWELL(dev) && intel_crtc->config.ips_enabled && ((I915_READ(GAMMA_MODE(pipe)) & GAMMA_MODE_MODE_MASK) == GAMMA_MODE_MODE_SPLIT)) { hsw_disable_ips(intel_crtc);