From mboxrd@z Thu Jan 1 00:00:00 1970 From: deepak.s@linux.intel.com Subject: [PATCH 10/10] drm/i915/chv: Freq(opcode) request value for CHV. Date: Mon, 21 Apr 2014 13:34:14 +0530 Message-ID: <1398067454-7581-11-git-send-email-deepak.s@linux.intel.com> References: <1398067454-7581-2-git-send-email-deepak.s@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id A13F96E2DE for ; Mon, 21 Apr 2014 01:04:51 -0700 (PDT) In-Reply-To: <1398067454-7581-2-git-send-email-deepak.s@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org From: Deepak S On CHV, All the freq request should be even. S0, we need to make sure we request the opcode accordingly. Signed-off-by: Deepak S --- drivers/gpu/drm/i915/i915_drv.h | 9 +++++++++ drivers/gpu/drm/i915/i915_irq.c | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index ead2714..5435d87 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -2641,6 +2641,15 @@ timespec_to_jiffies_timeout(const struct timespec *value) return min_t(unsigned long, MAX_JIFFY_OFFSET, j + 1); } +/* rps/turbo related */ +static inline int i915_rps_freq_change(struct drm_device *dev) +{ + if (IS_CHERRYVIEW(dev)) + return 2; + + return 1; +} + /* * If you need to wait X milliseconds between events A and B, but event B * doesn't happen exactly after event A, you record the timestamp (jiffies) of diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index cf29668..11538fe 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -1190,7 +1190,7 @@ static void gen6_pm_rps_work(struct work_struct *work) if (adj > 0) adj *= 2; else - adj = 1; + adj = i915_rps_freq_change(dev_priv->dev); new_delay = dev_priv->rps.cur_freq + adj; /* @@ -1209,7 +1209,7 @@ static void gen6_pm_rps_work(struct work_struct *work) if (adj < 0) adj *= 2; else - adj = -1; + adj = -1 * i915_rps_freq_change(dev_priv->dev); new_delay = dev_priv->rps.cur_freq + adj; } else { /* unknown event */ new_delay = dev_priv->rps.cur_freq; -- 1.9.1