From patchwork Thu Sep 6 13:43:39 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 1415231 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork2.kernel.org (Postfix) with ESMTP id 29FDADFFCF for ; Thu, 6 Sep 2012 14:51:31 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 10820A0A89 for ; Thu, 6 Sep 2012 07:51:31 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-bk0-f49.google.com (mail-bk0-f49.google.com [209.85.214.49]) by gabe.freedesktop.org (Postfix) with ESMTP id 6B4659F6C4 for ; Thu, 6 Sep 2012 07:51:02 -0700 (PDT) Received: by bkcji2 with SMTP id ji2so874858bkc.36 for ; Thu, 06 Sep 2012 07:51:01 -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; bh=aurkKYK6wJnOZzHAbmccmQxR01W0xLvm0IFUNMhjaXk=; b=gYtWAc/ZxdXU1k+Xgshge0VZezWu9/OdweCWLHjHmjhjee2DlzHMLTFc5+akwWDoqZ cM0NHhDf7JuLLZhrS2VGDtqgcjdtnHe6n5bJRHBrRClkAPVxok7F/EAEqY64n0EVmouk XETj0EyJmJYwvSjoi/D2NJJOy0de9CFij0vSQ= 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:x-gm-message-state; bh=aurkKYK6wJnOZzHAbmccmQxR01W0xLvm0IFUNMhjaXk=; b=HY0LN9Ddgw3MK2s3iXL7wmLE2AVwhX5FDoVSSZL8f0+FHRRIEv8ezKIrQxqyX/HAML fL5LwVh8zXQbtkkIfZUUEJtr3NfKgLerqX01p5X0jkceVvXrZRVR2/2kOgGUAurzVoct AuRi6SMPGmYj/QmnmilBqQDDXaHIW7jG7lxvycAnWH6mIJx55GhhG6Y1ohxih3ID/H/t 0qwQqHt3SnruxBCTb5LKbDAodoZZwbbkLMtI4oOg+rohqhQIPShVQ6c1OEggJBFI8mTH 2DBPmMzRQGepEdOmbmJoue2YVnZZZDSi6bG3Cd+6JcLzvGtAaTFfuntx10rR6gjTlRsz MH7A== Received: by 10.204.145.90 with SMTP id c26mr1161916bkv.34.1346943061175; Thu, 06 Sep 2012 07:51:01 -0700 (PDT) Received: from wespe.ffwll.local (178-83-130-250.dynamic.hispeed.ch. [178.83.130.250]) by mx.google.com with ESMTPS id c18sm1503383bkv.8.2012.09.06.07.50.58 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 06 Sep 2012 07:50:59 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Thu, 6 Sep 2012 15:43:39 +0200 Message-Id: <1346939019-5866-1-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.7.11.2 X-Gm-Message-State: ALoCoQmF5vxPKamiYHucLw5tjvi9+zrj6UcSU2Qjq2YPEkTZ4aLHWUDNodGB6yyJLs74BpTMdBGq Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH] drm/i915: reorder setup sequence to have irqs for output setup 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 Otherwise the new&shiny irq-driven gmbus and dp aux code won't work that well. Noticed since the dp aux code doesn't have an automatic fallback with a timeout (since the hw provides for that already). Signed-off-by: Daniel Vetter --- drivers/gpu/drm/i915/i915_dma.c | 5 ++--- drivers/gpu/drm/i915/i915_drv.h | 2 +- drivers/gpu/drm/i915/intel_display.c | 15 +++++++++++++-- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index 2cba7b4..58320e0 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c @@ -1325,9 +1325,8 @@ static int i915_load_modeset_init(struct drm_device *dev) if (ret) goto cleanup_gem_stolen; - intel_modeset_gem_init(dev); - - ret = drm_irq_install(dev); + /* Note: This also enables irqs. */ + ret = intel_modeset_gem_init(dev); if (ret) goto cleanup_gem; diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 9fce782..5c8d5e3 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -1536,7 +1536,7 @@ static inline void intel_unregister_dsm_handler(void) { return; } /* modesetting */ extern void intel_modeset_init_hw(struct drm_device *dev); extern void intel_modeset_init(struct drm_device *dev); -extern void intel_modeset_gem_init(struct drm_device *dev); +extern int intel_modeset_gem_init(struct drm_device *dev); extern void intel_modeset_cleanup(struct drm_device *dev); extern int intel_modeset_vga_set_state(struct drm_device *dev, bool state); extern void intel_modeset_setup_hw_state(struct drm_device *dev); diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 6658367..01289eb 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -7948,7 +7948,6 @@ void intel_modeset_init(struct drm_device *dev) /* Just disable it once at startup */ i915_disable_vga(dev); - intel_setup_outputs(dev); } static void @@ -8206,13 +8205,25 @@ void intel_modeset_setup_hw_state(struct drm_device *dev) drm_mode_config_reset(dev); } -void intel_modeset_gem_init(struct drm_device *dev) +int intel_modeset_gem_init(struct drm_device *dev) { + int ret; + intel_modeset_init_hw(dev); intel_setup_overlay(dev); + ret = drm_irq_install(dev); + if (ret) + return ret; + + /* Importanat: Output setup needs working interrupts to use + * interrupt-driven gmbus and dp aux. */ + intel_setup_outputs(dev); + intel_modeset_setup_hw_state(dev); + + return 0; } void intel_modeset_cleanup(struct drm_device *dev)