From ed55aa87973387c80d7efd00387f561df499e8dd Mon Sep 17 00:00:00 2001 From: Daniel Vetter Date: Tue, 25 Jun 2013 14:32:18 +0200 Subject: [PATCH] HACK: setup interrupts only after the crtcs are registered properly v2: Actually git add everything. v3: _Really_ git add everything. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=65880 --- drivers/gpu/drm/i915/i915_dma.c | 4 ---- drivers/gpu/drm/i915/intel_display.c | 2 ++ 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index d874dab..e8d8d28 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c @@ -1304,10 +1304,6 @@ static int i915_load_modeset_init(struct drm_device *dev) if (ret) goto cleanup_vga_switcheroo; - ret = drm_irq_install(dev); - if (ret) - goto cleanup_gem_stolen; - /* Important: The output setup functions called by modeset_init need * working irqs for e.g. gmbus and dp aux transfers. */ intel_modeset_init(dev); diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index a45bb92..d9ed609 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -9707,6 +9707,8 @@ void intel_modeset_init(struct drm_device *dev) } } + drm_irq_install(dev); + intel_cpu_pll_init(dev); intel_shared_dpll_init(dev); -- 1.8.1.4