From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH 10/29] drm/i915: reuse Ivybridge interrupts code for Haswell Date: Mon, 16 Apr 2012 01:29:25 +0200 Message-ID: <20120415232925.GC3982@phenom.ffwll.local> References: <1334347745-11743-1-git-send-email-eugeni.dodonov@intel.com> <1334347745-11743-11-git-send-email-eugeni.dodonov@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-wg0-f41.google.com (mail-wg0-f41.google.com [74.125.82.41]) by gabe.freedesktop.org (Postfix) with ESMTP id EF08B9E738 for ; Sun, 15 Apr 2012 16:28:30 -0700 (PDT) Received: by wgbds1 with SMTP id ds1so6823548wgb.0 for ; Sun, 15 Apr 2012 16:28:30 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1334347745-11743-11-git-send-email-eugeni.dodonov@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: Eugeni Dodonov Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Fri, Apr 13, 2012 at 05:08:46PM -0300, Eugeni Dodonov wrote: > v2: prevent possible conflicts with VLV. > > v1 Reviewed-by: Rodrigo Vivi > Signed-off-by: Eugeni Dodonov > --- > drivers/gpu/drm/i915/i915_irq.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c > index febddc2..1ed18db 100644 > --- a/drivers/gpu/drm/i915/i915_irq.c > +++ b/drivers/gpu/drm/i915/i915_irq.c > @@ -1969,7 +1969,7 @@ static void ironlake_irq_preinstall(struct drm_device *dev) > > INIT_WORK(&dev_priv->hotplug_work, i915_hotplug_work_func); > INIT_WORK(&dev_priv->error_work, i915_error_work_func); > - if (IS_GEN6(dev) || IS_IVYBRIDGE(dev)) > + if (IS_GEN6(dev) || IS_IVYBRIDGE(dev) || IS_HASWELL(dev)) > INIT_WORK(&dev_priv->rps_work, gen6_pm_rps_work); > > I915_WRITE(HWSTAM, 0xeffe); > @@ -2445,7 +2445,7 @@ void intel_irq_init(struct drm_device *dev) > dev->driver->get_vblank_counter = i915_get_vblank_counter; > dev->max_vblank_count = 0xffffff; /* only 24 bits of frame count */ > if (IS_G4X(dev) || IS_GEN5(dev) || IS_GEN6(dev) || IS_IVYBRIDGE(dev) || > - IS_VALLEYVIEW(dev)) { > + IS_VALLEYVIEW(dev) || IS_HASWELL(dev)) { This one here is growing out of hands. Can you replace it with is_g4x || gen >= 5 please? We can throw in stupid exceptions when they actually arrise. -Daniel > dev->max_vblank_count = 0xffffffff; /* full 32 bit counter */ > dev->driver->get_vblank_counter = gm45_get_vblank_counter; > } > @@ -2463,7 +2463,7 @@ void intel_irq_init(struct drm_device *dev) > dev->driver->irq_uninstall = valleyview_irq_uninstall; > dev->driver->enable_vblank = valleyview_enable_vblank; > dev->driver->disable_vblank = valleyview_disable_vblank; > - } else if (IS_IVYBRIDGE(dev)) { > + } else if (IS_IVYBRIDGE(dev) || IS_HASWELL(dev)) { > /* Share pre & uninstall handlers with ILK/SNB */ > dev->driver->irq_handler = ivybridge_irq_handler; > dev->driver->irq_preinstall = ironlake_irq_preinstall; > -- > 1.7.10 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Daniel Vetter Mail: daniel@ffwll.ch Mobile: +41 (0)79 365 57 48