From patchwork Fri Sep 27 19:57:24 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesse Barnes X-Patchwork-Id: 2956781 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 C44719F244 for ; Fri, 27 Sep 2013 19:58:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EFD2120304 for ; Fri, 27 Sep 2013 19:58:56 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 08584202DD for ; Fri, 27 Sep 2013 19:58:56 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 00A8DE8299 for ; Fri, 27 Sep 2013 12:58:56 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from oproxy1-pub.mail.unifiedlayer.com (oproxy1-pub.mail.unifiedlayer.com [66.147.249.253]) by gabe.freedesktop.org (Postfix) with SMTP id 5168FE6D7B for ; Fri, 27 Sep 2013 12:57:29 -0700 (PDT) Received: (qmail 32054 invoked by uid 0); 27 Sep 2013 19:57:27 -0000 Received: from unknown (HELO box514.bluehost.com) (74.220.219.114) by oproxy1.mail.unifiedlayer.com with SMTP; 27 Sep 2013 19:57:27 -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=UkhNZNbkAhpBk7eBpqMeOjV65PJ7SSTKlSrYgEH4Cr8=; b=oDNbWvYaXRkycE2wVqnmLJDSqn74f+wU6xGG7IjJFHzkS3e/ClcRCK4OydQdgLIxABJaaeQPBYyPE77yDCy7bUSEAyrcQcvSgWVOoAwLR14hGxQJHwBr1t1QK0fV1PuO; Received: from [67.161.37.189] (port=34187 helo=localhost.localdomain) by box514.bluehost.com with esmtpsa (TLSv1:CAMELLIA256-SHA:256) (Exim 4.80) (envelope-from ) id 1VPeAJ-0007bs-Lo for intel-gfx@lists.freedesktop.org; Fri, 27 Sep 2013 13:57:27 -0600 From: Jesse Barnes To: intel-gfx@lists.freedesktop.org Date: Fri, 27 Sep 2013 12:57:24 -0700 Message-Id: <1380311846-1581-3-git-send-email-jbarnes@virtuousgeek.org> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1380311846-1581-1-git-send-email-jbarnes@virtuousgeek.org> References: <1380311846-1581-1-git-send-email-jbarnes@virtuousgeek.org> X-Identified-User: {10642:box514.bluehost.com:virtuous:virtuousgeek.org} {sentby:smtp auth 67.161.37.189 authed with jbarnes@virtuousgeek.org} Subject: [Intel-gfx] [PATCH 3/5] drm/i915/vlv: warn on bad VLV PLL divider values 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 X-Spam-Status: No, score=-5.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_BL_SPAMCOP_NET, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham 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 avoids a divide by zero and warns appropriately on this serious bug. Signed-off-by: Jesse Barnes --- drivers/gpu/drm/i915/intel_display.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 8da1c96..9a83236 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -5109,6 +5109,11 @@ static void vlv_crtc_clock_get(struct intel_crtc *crtc, clock.p1 = (mdiv >> DPIO_P1_SHIFT) & 7; clock.p2 = (mdiv >> DPIO_P2_SHIFT) & 0x1f; + if (!clock.n || !(clock.p1 * clock.p2)) { + WARN(1, "bad divider values on pipe %d\n", crtc->pipe); + return; + } + clock.vco = refclk * clock.m1 * clock.m2 / clock.n; clock.dot = 2 * clock.vco / (clock.p1 * clock.p2);