From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH 26/37] drm/i915: reuse Ivybridge interrupts code for Haswell Date: Thu, 22 Mar 2012 11:22:39 +0100 Message-ID: <20120322102239.GG6195@phenom.ffwll.local> References: <1332378612-3814-1-git-send-email-eugeni.dodonov@intel.com> <1332378612-3814-27-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-wi0-f171.google.com (mail-wi0-f171.google.com [209.85.212.171]) by gabe.freedesktop.org (Postfix) with ESMTP id 1A002A0D87 for ; Thu, 22 Mar 2012 03:21:55 -0700 (PDT) Received: by wibhj13 with SMTP id hj13so362014wib.12 for ; Thu, 22 Mar 2012 03:21:55 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1332378612-3814-27-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 Wed, Mar 21, 2012 at 10:10:01PM -0300, Eugeni Dodonov wrote: > Signed-off-by: Eugeni Dodonov Hm, I have a feeling that some of these s/IS_IVB/IS_GEN7/ checks will collide with the vlv code. I guess neither Jesse nor you have tried to merge in each another's branch yet. This will be fun to sort out ;-) -Daniel > --- > 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 afd4e03..ede51f0 100644 > --- a/drivers/gpu/drm/i915/i915_irq.c > +++ b/drivers/gpu/drm/i915/i915_irq.c > @@ -1810,7 +1810,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_GEN7(dev)) > INIT_WORK(&dev_priv->rps_work, gen6_pm_rps_work); > > I915_WRITE(HWSTAM, 0xeffe); > @@ -2136,7 +2136,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)) { > + if (IS_G4X(dev) || IS_GEN5(dev) || IS_GEN6(dev) || IS_GEN7(dev)) { > dev->max_vblank_count = 0xffffffff; /* full 32 bit counter */ > dev->driver->get_vblank_counter = gm45_get_vblank_counter; > } > @@ -2147,7 +2147,7 @@ void intel_irq_init(struct drm_device *dev) > dev->driver->get_vblank_timestamp = NULL; > dev->driver->get_scanout_position = i915_get_crtc_scanoutpos; > > - if (IS_IVYBRIDGE(dev)) { > + if (IS_GEN7(dev)) { > /* Share pre & uninstall handlers with ILK/SNB */ > dev->driver->irq_handler = ivybridge_irq_handler; > dev->driver->irq_preinstall = ironlake_irq_preinstall; > -- > 1.7.9.2 > > _______________________________________________ > 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