From patchwork Wed Jan 13 14:10:55 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhao, Yakui" X-Patchwork-Id: 72646 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id o0DEDEoM019261 for ; Wed, 13 Jan 2010 14:13:14 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A22889ECCE; Wed, 13 Jan 2010 06:13:14 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 2AA329E9FC for ; Wed, 13 Jan 2010 06:13:06 -0800 (PST) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP; 13 Jan 2010 06:12:53 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.49,268,1262592000"; d="scan'208";a="530913077" Received: from yakui_zhao.sh.intel.com (HELO localhost.localdomain) ([10.239.13.83]) by fmsmga002.fm.intel.com with ESMTP; 13 Jan 2010 06:13:02 -0800 From: yakui.zhao@intel.com To: eric@anholt.net Date: Wed, 13 Jan 2010 22:10:55 +0800 Message-Id: <1263391855-9607-7-git-send-email-yakui.zhao@intel.com> X-Mailer: git-send-email 1.5.4.5 In-Reply-To: <1263391855-9607-6-git-send-email-yakui.zhao@intel.com> References: <1263391855-9607-1-git-send-email-yakui.zhao@intel.com> <1263391855-9607-2-git-send-email-yakui.zhao@intel.com> <1263391855-9607-3-git-send-email-yakui.zhao@intel.com> <1263391855-9607-4-git-send-email-yakui.zhao@intel.com> <1263391855-9607-5-git-send-email-yakui.zhao@intel.com> <1263391855-9607-6-git-send-email-yakui.zhao@intel.com> Cc: intel-gfx@lists.freedesktop.org Subject: [Intel-gfx] [PATCH 6/6] drm/i915: Don't use too small watermark X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.9 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 diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index af3df7c..630d70a 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -2181,7 +2181,7 @@ static struct intel_watermark_params pineview_cursor_hplloff_wm = { static struct intel_watermark_params g4x_wm_info = { G4X_FIFO_SIZE, G4X_MAX_WM, - G4X_MAX_WM, + 8, 2, G4X_FIFO_LINE_SIZE, 1 @@ -2224,28 +2224,28 @@ static struct intel_watermark_params gm965_self_cursor_info = { static struct intel_watermark_params i945_wm_info = { I945_FIFO_SIZE, I915_MAX_WM, - 1, + 8, 2, I915_FIFO_LINE_SIZE }; static struct intel_watermark_params i915_wm_info = { I915_FIFO_SIZE, I915_MAX_WM, - 1, + 8, 2, I915_FIFO_LINE_SIZE }; static struct intel_watermark_params i855_wm_info = { I855GM_FIFO_SIZE, I915_MAX_WM, - 1, + 8, 2, I830_FIFO_LINE_SIZE }; static struct intel_watermark_params i830_wm_info = { I830_FIFO_SIZE, I915_MAX_WM, - 1, + 8, 2, I830_FIFO_LINE_SIZE }; @@ -2363,7 +2363,7 @@ static unsigned long intel_calculate_wm(struct intel_watermark_params *wm, /* Don't promote wm_size to unsigned... */ if (wm_size > (long)wm->max_wm) wm_size = wm->max_wm; - if (wm_size <= 0) + if (wm_size < (int)wm->default_wm) wm_size = wm->default_wm; return wm_size; }