From patchwork Fri Oct 7 13:34:06 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tvrtko Ursulin X-Patchwork-Id: 9366097 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 6786460487 for ; Fri, 7 Oct 2016 13:34:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 59C80295AA for ; Fri, 7 Oct 2016 13:34:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4E829295F6; Fri, 7 Oct 2016 13:34:29 +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 08855295AA for ; Fri, 7 Oct 2016 13:34:29 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 998456EB98; Fri, 7 Oct 2016 13:34:27 +0000 (UTC) X-Original-To: Intel-gfx@lists.freedesktop.org Delivered-To: Intel-gfx@lists.freedesktop.org Received: from mail-wm0-x242.google.com (mail-wm0-x242.google.com [IPv6:2a00:1450:400c:c09::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 318AF6E3DC for ; Fri, 7 Oct 2016 13:34:26 +0000 (UTC) Received: by mail-wm0-x242.google.com with SMTP id b201so3031671wmb.1 for ; Fri, 07 Oct 2016 06:34:26 -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 :mime-version:content-transfer-encoding; bh=oieHKnV6Pwzgyhz+QsM9YD9reUqQWwhqSQlJ9sEQ7Xs=; b=zqfd2QwS5JDbbO6dQS8+K/gCZEE4dT6zXahwlTWLKLYhVvU+iODvEdC3fwmdszn5xd IIhlvu/E684w7X1PDD+Wf7DZFc6DQfttOQ5dbGF7aV9sEnMCipA8c5rg8f+vjUoc+jYZ vcyWf4h/xsnCpdpEgQIRZKz0mOuv9GsWNjKyYG7dXcl+50U/X+Hm/1uIA3PwoYBMnmCY /2D3CVSvDaLtxoFYm4iLvipNhiirXbmrUpCy6AyWD+nYCaaZpZmSFKaIpGfa3uJgh4ln 3qhCYrdJX9/3ES489wtofhX+WKsKw6c7/nmfSxrdAteleLqA0V7qMqPtJb0KnFHQwqrH MuDQ== 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:mime-version:content-transfer-encoding; bh=oieHKnV6Pwzgyhz+QsM9YD9reUqQWwhqSQlJ9sEQ7Xs=; b=Bj3s8zvq/XkhpfcwWM+s0ViDmhKZpplrmrjMgZ3N0J/T2hinxR0hazdaj5fnBvn3qu 7Z6vN2EFbjQsABKJy92SLw/33HToyHX1t8CQbdbAs+TIYimlbpopVvpowrgxrMBFSA26 ndjgBa70a8/+Xk2PRWd5XaFRyjyDYOQY6hA5kkP5/3MCSGEx5UiWRZ9IJe783P3pBfqm FBkcBOIhRYyGKBDBX0qgH71rBSR4Y0eo38f43TWPvyMVLcq0fm0Uj00alhOTpXe0z9xu Ar11MoJ4UpoGlAFXehzR4T3xM7Hn2mlmNY43+6gt9/ZvM/p3hWalSRuk7Lgru1OHSkDs dJRQ== X-Gm-Message-State: AA6/9RnxsQGvcXmEllSZmx5f0ZfQFMOt7AILDDFbd8m8OFlG7NhGDwum2ngqL0II5SP0lw== X-Received: by 10.28.170.197 with SMTP id t188mr20507486wme.42.1475847264381; Fri, 07 Oct 2016 06:34:24 -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.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 07 Oct 2016 06:34:24 -0700 (PDT) From: Tvrtko Ursulin X-Google-Original-From: Tvrtko Ursulin To: Intel-gfx@lists.freedesktop.org Date: Fri, 7 Oct 2016 14:34:06 +0100 Message-Id: <1475847252-31580-4-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> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH 3/9] drm/i915: Shrink per-platform watermark configuration 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: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP From: Tvrtko Ursulin Use types of more appropriate size in struct intel_watermark_params to save 512 bytes of .rodata. Signed-off-by: Tvrtko Ursulin Acked-by: Ville Syrjälä Reviewed-by: Joonas Lahtinen --- drivers/gpu/drm/i915/intel_drv.h | 10 +++++----- drivers/gpu/drm/i915/intel_pm.c | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index f618a1c4b9a3..2ab417c73ad8 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -799,11 +799,11 @@ struct intel_plane { }; struct intel_watermark_params { - unsigned long fifo_size; - unsigned long max_wm; - unsigned long default_wm; - unsigned long guard_size; - unsigned long cacheline_size; + u16 fifo_size; + u16 max_wm; + u8 default_wm; + u8 guard_size; + u8 cacheline_size; }; struct cxsr_latency { diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index 3b1f0b40ccb9..96d0c57c816c 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -775,13 +775,13 @@ static bool g4x_check_srwm(struct drm_device *dev, display_wm, cursor_wm); if (display_wm > display->max_wm) { - DRM_DEBUG_KMS("display watermark is too large(%d/%ld), disabling\n", + DRM_DEBUG_KMS("display watermark is too large(%d/%u), disabling\n", display_wm, display->max_wm); return false; } if (cursor_wm > cursor->max_wm) { - DRM_DEBUG_KMS("cursor watermark is too large(%d/%ld), disabling\n", + DRM_DEBUG_KMS("cursor watermark is too large(%d/%u), disabling\n", cursor_wm, cursor->max_wm); return false; }