From patchwork Fri Oct 7 13:34:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tvrtko Ursulin X-Patchwork-Id: 9366109 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 1A7CF60487 for ; Fri, 7 Oct 2016 13:34:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0C241295AA for ; Fri, 7 Oct 2016 13:34:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 00EC3295F7; Fri, 7 Oct 2016 13:34:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9B73A295AA for ; Fri, 7 Oct 2016 13:34:36 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id EDB586EB9F; Fri, 7 Oct 2016 13:34:31 +0000 (UTC) X-Original-To: Intel-gfx@lists.freedesktop.org Delivered-To: Intel-gfx@lists.freedesktop.org Received: from mail-wm0-x243.google.com (mail-wm0-x243.google.com [IPv6:2a00:1450:400c:c09::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id CC3556EB9B for ; Fri, 7 Oct 2016 13:34:29 +0000 (UTC) Received: by mail-wm0-x243.google.com with SMTP id i130so3028923wmg.0 for ; Fri, 07 Oct 2016 06:34:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ursulin-net.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=hUCXgXoGATPfCGtLQ3TZX3eKBdnmLKjwZcW8jFItYdM=; b=SkL/ZYM5Qe3D6yFLe06XLSYxubkxRwhNmquhmyt2Vo5+7U1HRFE3RiBtiJCsRDYNQ2 f4OJow95SqBhb3kMCQTRMLKvoivS+u95hJsg+LIGZaIOAO8yO0/aSMUitp9H8OyQDnk6 zeB/Y4F5d+wbfWySXsmgcsEjIzUc0ivFO/FyuGmH3Ve41G5JdisD5TifaYuYvnFjTk2a oB1HRbULBvjf9cjTpiQdwTuuXfmM5h79dX2PPwuQezRRMxs71HgazmF4CyFtG7S8dr1j TnNj8HSnaWwsD2jd8ACTV1gY5hlFGfsedzRQhvvlz2v29Xy7HV/PGeZD1iPcapXNgP5o wSxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=hUCXgXoGATPfCGtLQ3TZX3eKBdnmLKjwZcW8jFItYdM=; b=PbOz5ersjDCJXxcXmN8H1wLhFvB/blticcW510dBJJ3Ug5sDZVtXeMeJgYNpAbskGD gmSYmYlHYCrC94/kCi63RK+AD0GFNs3q2MhlBCH1Mc6u9Uy5vyf5ZuWk2iGUSpLbmZ9U vpezLUEHb5bmuYvbEy10tVdLo29bjN842HWJEuS8Lzwb1yWz22g8vV8YnFSZq62TvJJy UDsWvDkcy5hDro/V+ZGKFSMTKhvA1zMF8KZzXoXsOv3b2AEuapqJReprhV3avgnVHw/R 5yrux1lovP3PASaEId5iPRBY07ZRGw6Tk2Xh34YjfENbUCZnaUWCAStt13SqyornAXgv +pdQ== X-Gm-Message-State: AA6/9RmfAaEY++PVHt/uHo6hRHda04swHrBS0w3IVAHBrFN65fVfLhNnvstJJsM1Wp7HBw== X-Received: by 10.194.113.35 with SMTP id iv3mr16332239wjb.169.1475847268274; Fri, 07 Oct 2016 06:34:28 -0700 (PDT) Received: from localhost.localdomain ([2a02:c7d:9b6d:e300:916a:6cab:ac67:71c2]) by smtp.gmail.com with ESMTPSA id pj2sm19795081wjb.8.2016.10.07.06.34.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 07 Oct 2016 06:34:27 -0700 (PDT) From: Tvrtko Ursulin X-Google-Original-From: Tvrtko Ursulin To: Intel-gfx@lists.freedesktop.org Date: Fri, 7 Oct 2016 14:34:11 +0100 Message-Id: <1475847252-31580-9-git-send-email-tvrtko.ursulin@linux.intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1475847252-31580-1-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1475847252-31580-1-git-send-email-tvrtko.ursulin@linux.intel.com> Subject: [Intel-gfx] [PATCH 8/9] drm/i915: Make intel_calculate_wm return unsigned int X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP From: Tvrtko Ursulin Either unsigned int is enough or it isn't. There is no point in using an unsigned long here. Also replace local long variables with integers. No need to have a difference between 32- and 64-bit build in any case. Signed-off-by: Tvrtko Ursulin Reviewed-by: Joonas Lahtinen --- drivers/gpu/drm/i915/intel_pm.c | 36 +++++++++++++++++------------------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index faa379e54322..308edc4378fa 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -582,12 +582,12 @@ static const struct intel_watermark_params i845_wm_info = { * past the watermark point. If the FIFO drains completely, a FIFO underrun * will occur, and a display engine hang could result. */ -static unsigned long intel_calculate_wm(unsigned int clock_in_khz, - const struct intel_watermark_params *wm, - unsigned int fifo_size, int cpp, - unsigned int latency_ns) +static unsigned int intel_calculate_wm(unsigned int clock_in_khz, + const struct intel_watermark_params *wm, + unsigned int fifo_size, int cpp, + unsigned int latency_ns) { - long entries_required, wm_size; + int entries_required, wm_size; /* * Note: we need to make sure we don't overflow for various clock & @@ -595,18 +595,17 @@ static unsigned long intel_calculate_wm(unsigned int clock_in_khz, * clocks go from a few thousand to several hundred thousand. * latency is usually a few thousand */ - entries_required = ((clock_in_khz / 1000) * cpp * latency_ns) / - 1000; + entries_required = ((clock_in_khz / 1000) * cpp * latency_ns) / 1000; entries_required = DIV_ROUND_UP(entries_required, wm->cacheline_size); - DRM_DEBUG_KMS("FIFO entries required for mode: %ld\n", entries_required); + DRM_DEBUG_KMS("FIFO entries required for mode: %d\n", entries_required); wm_size = fifo_size - (entries_required + wm->guard_size); - DRM_DEBUG_KMS("FIFO watermark level: %ld\n", wm_size); + DRM_DEBUG_KMS("FIFO watermark level: %d\n", wm_size); /* Don't promote wm_size to unsigned... */ - if (wm_size > (long)wm->max_wm) + if (wm_size > (int)wm->max_wm) wm_size = wm->max_wm; if (wm_size <= 0) wm_size = wm->default_wm; @@ -646,7 +645,7 @@ static void pineview_update_wm(struct drm_crtc *unused_crtc) struct drm_crtc *crtc; const struct cxsr_latency *latency; u32 reg; - unsigned long wm; + unsigned int wm; latency = intel_get_cxsr_latency(IS_PINEVIEW_G(dev), dev_priv->is_ddr3, dev_priv->fsb_freq, dev_priv->mem_freq); @@ -1522,8 +1521,7 @@ static void i9xx_update_wm(struct drm_crtc *unused_crtc) uint32_t fwater_lo; uint32_t fwater_hi; int cwm, srwm = 1; - unsigned int fifo_size; - int planea_wm, planeb_wm; + unsigned int fifo_size, planea_wm, planeb_wm; struct drm_crtc *crtc, *enabled = NULL; if (IS_I945GM(dev)) @@ -1548,7 +1546,7 @@ static void i9xx_update_wm(struct drm_crtc *unused_crtc) enabled = crtc; } else { planea_wm = fifo_size - wm_info->guard_size; - if (planea_wm > (long)wm_info->max_wm) + if (planea_wm > wm_info->max_wm) planea_wm = wm_info->max_wm; } @@ -1573,11 +1571,11 @@ static void i9xx_update_wm(struct drm_crtc *unused_crtc) enabled = NULL; } else { planeb_wm = fifo_size - wm_info->guard_size; - if (planeb_wm > (long)wm_info->max_wm) + if (planeb_wm > wm_info->max_wm) planeb_wm = wm_info->max_wm; } - DRM_DEBUG_KMS("FIFO watermarks - A: %d, B: %d\n", planea_wm, planeb_wm); + DRM_DEBUG_KMS("FIFO watermarks - A: %u, B: %u\n", planea_wm, planeb_wm); if (IS_I915GM(dev) && enabled) { struct drm_i915_gem_object *obj; @@ -1653,8 +1651,8 @@ static void i845_update_wm(struct drm_crtc *unused_crtc) struct drm_i915_private *dev_priv = to_i915(dev); struct drm_crtc *crtc; const struct drm_display_mode *adjusted_mode; - uint32_t fwater_lo; - int planea_wm; + u32 fwater_lo; + unsigned int planea_wm; crtc = single_enabled_crtc(dev); if (crtc == NULL) @@ -1668,7 +1666,7 @@ static void i845_update_wm(struct drm_crtc *unused_crtc) fwater_lo = I915_READ(FW_BLC) & ~0xfff; fwater_lo |= (3<<8) | planea_wm; - DRM_DEBUG_KMS("Setting FIFO watermarks - A: %d\n", planea_wm); + DRM_DEBUG_KMS("Setting FIFO watermarks - A: %u\n", planea_wm); I915_WRITE(FW_BLC, fwater_lo); }