[Intel-gfx] [PATCH 3/4] drm/i915: Nuke drm_driver irq vfuncs

[Ville Syrjälä]

On Wed, Jun 19, 2019 at 07:44:42PM +0100, Chris Wilson wrote:
> Quoting Ville Syrjala (2019-06-19 18:08:41)
> > From: Ville Syrjälä <ville.syrjala at linux.intel.com>
> > 
> > Stop using the irq vfuncs under drm_driver. That's not going to fly
> > in a mixed gen environment since the structure is shared between all
> > the devices.
> > 
> > Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
> > Reviewed-by: Chris Wilson <chris at chris-wilson.co.uk>
> > ---
> >  drivers/gpu/drm/i915/i915_drv.c |   2 +-
> >  drivers/gpu/drm/i915/i915_irq.c | 280 ++++++++++++++++----------------
> >  2 files changed, 140 insertions(+), 142 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
> > index f62e3397d936..ea6b06109d5a 100644
> > --- a/drivers/gpu/drm/i915/i915_drv.c
> > +++ b/drivers/gpu/drm/i915/i915_drv.c
> > @@ -754,7 +754,7 @@ static int i915_load_modeset_init(struct drm_device *dev)
> >  cleanup_modeset:
> >         intel_modeset_cleanup(dev);
> 
> Ahah! intel_modeset_cleanup() also calls intel_irq_uninstall()

Oh dear. This could be a deep gopher hole...

> 
> >  cleanup_irq:
> > -       drm_irq_uninstall(dev);
> > +       intel_irq_uninstall(dev_priv);
> >         intel_gmbus_teardown(dev_priv);
> >  cleanup_csr:
> >         intel_csr_ucode_fini(dev_priv);

-- 
Ville Syrjälä
Intel