From patchwork Sat Feb 2 12:56:20 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesse Barnes X-Patchwork-Id: 2083901 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 6DB183FD2B for ; Sat, 2 Feb 2013 13:29:59 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 63871E6335 for ; Sat, 2 Feb 2013 05:29:59 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from oproxy5-pub.bluehost.com (oproxy5-pub.bluehost.com [67.222.38.55]) by gabe.freedesktop.org (Postfix) with SMTP id 767BDE6102 for ; Sat, 2 Feb 2013 05:26:18 -0800 (PST) Received: (qmail 12254 invoked by uid 0); 2 Feb 2013 13:26:18 -0000 Received: from unknown (HELO box514.bluehost.com) (74.220.219.114) by cpoproxy2.bluehost.com with SMTP; 2 Feb 2013 13:26:18 -0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=virtuousgeek.org; s=default; h=References:In-Reply-To:Message-Id:Date:Subject:To:From; bh=xfhlI8jdiWgjaa3MGAR62u0RBKsnQZwgLCseyS/M1gk=; b=S8FDTRWLDDcN3BsGBIcbO03308JhzxUTKcf4J5GV2ic4vrkB8l1YKUSJLzlgq+TgrwUG5Z4hBMEt8L9OulFu2GRARDArMsoww+d5waHG/GiGBhrw+bIfM/f4n5ZDOC+R; Received: from [151.216.70.136] (port=59537 helo=jbarnes-t420.intel.com) by box514.bluehost.com with esmtpsa (TLSv1:CAMELLIA256-SHA:256) (Exim 4.80) (envelope-from ) id 1U1ceL-0006Th-Ji for intel-gfx@lists.freedesktop.org; Sat, 02 Feb 2013 05:56:53 -0700 From: Jesse Barnes To: intel-gfx@lists.freedesktop.org Date: Sat, 2 Feb 2013 13:56:20 +0100 Message-Id: <1359809786-26434-17-git-send-email-jbarnes@virtuousgeek.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1359809786-26434-1-git-send-email-jbarnes@virtuousgeek.org> References: <1359809786-26434-1-git-send-email-jbarnes@virtuousgeek.org> X-Identified-User: {10642:box514.bluehost.com:virtuous:virtuousgeek.org} {sentby:smtp auth 151.216.70.136 authed with jbarnes@virtuousgeek.org} Subject: [Intel-gfx] [PATCH 16/22] drm/i915: VLV hack: Disable wm for VLV 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: Vijay Purushothaman Pondicherry should take care in most cases. Watermark update is causing driver crash with divide error. Look again. For current usage, not needed. Signed-off-by: Vijay Purushothaman --- drivers/gpu/drm/i915/intel_pm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index 2820707..7d812ba 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -4050,7 +4050,8 @@ void intel_init_pm(struct drm_device *dev) } else dev_priv->display.update_wm = NULL; } else if (IS_VALLEYVIEW(dev)) { - dev_priv->display.update_wm = valleyview_update_wm; +// dev_priv->display.update_wm = valleyview_update_wm; + dev_priv->display.update_wm = NULL; dev_priv->display.update_sprite_wm = valleyview_update_sprite_wm, dev_priv->display.init_clock_gating = valleyview_init_clock_gating;