From patchwork Tue Jul 24 21:33:47 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 1233431 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork1.kernel.org (Postfix) with ESMTP id 594213FD4F for ; Tue, 24 Jul 2012 21:22:37 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CC11C9F042 for ; Tue, 24 Jul 2012 14:22:36 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wi0-f177.google.com (mail-wi0-f177.google.com [209.85.212.177]) by gabe.freedesktop.org (Postfix) with ESMTP id 35CDD9E860 for ; Tue, 24 Jul 2012 14:17:29 -0700 (PDT) Received: by mail-wi0-f177.google.com with SMTP id hm11so17324wib.12 for ; Tue, 24 Jul 2012 14:17:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=u+MMIsHmEFWtiJcBP1ePrxfANXPldPODoOmh8+W3NGo=; b=PRXla2zPdR1oZXUQ4L2AZiTCRDSazz4SBh6hYD+2FoRXX+d9AEi6+FnqEV1K3sfkzj r35D1HiyzqX+uZA1ygUXZbxGchwf+fYWdc4Hx2KSvceuljIQjRUqOm0opUBAZ3F3tBQl XY1q/H8sRXiQ0n6WNIEMuO8X72p3a/JKJswvk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=u+MMIsHmEFWtiJcBP1ePrxfANXPldPODoOmh8+W3NGo=; b=K6Rvv7jncGEf5P/I5lDiGn2kSalURj8Fp/7xAPoWr4IMXi3QAA6tfl+rPhcA9jHkR4 ScUvknM9N3jgy3VxOOXMMYpqOXuqlStMKVP3hZGPtoYqdhkoeFeRGwZxhY3ftp0+HC7B Z2zDHMoVIAANnmQi7JU0a8LTqbXso7GpSx19XB0ewrFHWfxb2OYANbOEJLwsK8uYzPfG wtAR4RwkKPIOAriGjki0HEiq93KKyOnv3Q8eqpU7rcPd3zxHiHnIjUuwB2NU4lDvM5pg DhJ4mHIxCxPO3uo7wN5weNMeq2xH9+Z3hpMFtEyU9y5PmFwuX8bOPC2L/kaA3jgRcHPo XXsA== Received: by 10.180.80.134 with SMTP id r6mr10492245wix.1.1343164648853; Tue, 24 Jul 2012 14:17:28 -0700 (PDT) Received: from hummel.ffwll.local (178-83-130-250.dynamic.hispeed.ch. [178.83.130.250]) by mx.google.com with ESMTPS id cl8sm6258845wib.10.2012.07.24.14.17.27 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 24 Jul 2012 14:17:27 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Tue, 24 Jul 2012 23:33:47 +0200 Message-Id: <1343165630-21604-7-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1343165630-21604-1-git-send-email-daniel.vetter@ffwll.ch> References: <1343165630-21604-1-git-send-email-daniel.vetter@ffwll.ch> X-Gm-Message-State: ALoCoQlzQWkNzmMd8lCmA3QixcZjqY9MuBWU46bLQWNnDBZGcSq1lwIHdbZw6GP7gzrPdxxHkxWo Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH 6/9] drm/i915: DE_PCU_EVENT irq is ilk-only 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 Like all the other drps/ips stuff. Hence add the corresponding check, give the function a preciser prefix and move the single reg clearing into the rps handling function, too. Signed-off-by: Daniel Vetter Reviewed-by: Ben Widawsky --- drivers/gpu/drm/i915/i915_irq.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index 6e3f43c..f46fa6c 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -296,12 +296,14 @@ static void i915_hotplug_work_func(struct work_struct *work) drm_helper_hpd_irq_event(dev); } -static void i915_handle_rps_change(struct drm_device *dev) +static void ironlake_handle_rps_change(struct drm_device *dev) { drm_i915_private_t *dev_priv = dev->dev_private; u32 busy_up, busy_down, max_avg, min_avg; u8 new_delay = dev_priv->cur_delay; + I915_WRITE16(MEMINTRSTS, I915_READ(MEMINTRSTS)); + I915_WRITE16(MEMINTRSTS, MEMINT_EVAL_CHG); busy_up = I915_READ(RCPREVBSYTUPAVG); busy_down = I915_READ(RCPREVBSYTDNAVG); @@ -794,10 +796,8 @@ static irqreturn_t ironlake_irq_handler(DRM_IRQ_ARGS) ibx_irq_handler(dev, pch_iir); } - if (de_iir & DE_PCU_EVENT) { - I915_WRITE16(MEMINTRSTS, I915_READ(MEMINTRSTS)); - i915_handle_rps_change(dev); - } + if (IS_GEN5(dev) && de_iir & DE_PCU_EVENT) + ironlake_handle_rps_change(dev); if (IS_GEN6(dev) && pm_iir & GEN6_PM_DEFERRED_EVENTS) gen6_queue_rps_work(dev_priv, pm_iir);