From patchwork Thu Oct 11 18:08:24 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 1583851 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork1.kernel.org (Postfix) with ESMTP id 826B23FD9C for ; Thu, 11 Oct 2012 19:17:42 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0900FA089D for ; Thu, 11 Oct 2012 12:17:42 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wi0-f177.google.com (mail-wi0-f177.google.com [209.85.212.177]) by gabe.freedesktop.org (Postfix) with ESMTP id 4F39FA02DA for ; Thu, 11 Oct 2012 12:16:34 -0700 (PDT) Received: by mail-wi0-f177.google.com with SMTP id hj13so2205527wib.12 for ; Thu, 11 Oct 2012 12:16:33 -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:in-reply-to:references; bh=VELTg7Ds6olfO2+ZJ+7WsxU2JlT7rrIOi/0Io/HvFGA=; b=IQm92soEbtQ8hACLiWDdSk1R73eJP2Ok68qxtDBk6HY4gnB4wvzF0HOff4nQJisF8t vm1Wp3fXSOjv4Do56BC5Q/BbD0WdxT08Ul463FAYUwlJrWY9uZUZgyLrbL8o2+zvrjuO kUhPxaylTFKgblCGsUxwRMlZE01eBNOkoyn8c= 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:in-reply-to:references :x-gm-message-state; bh=VELTg7Ds6olfO2+ZJ+7WsxU2JlT7rrIOi/0Io/HvFGA=; b=Qnv/+t/SEp1M1FNJDHTmK9xRUt52RzpEm1fpZRQoKWHtglU41qlisFhSPsKTTj/8bs b9Irh3I874BMr/DW/4UP91Hyh/gd41FgabY+vqlkGoDRssLnLxlNj8ruhr4qB15zvDqp nK/ybn/Jp02fTAFWsIVSLMUjoo6+eabLtq6CA68nvdAqYw94bIaoZ6aCamKh5jOyUqIT BoOOkt/gV0z0FODOpTuoPxDxtR2eJQnsKMXSpBJy4kakoHFNBg8o3ySK4sNEJ1fv/Go0 BRYtLCeUcR1cHH5eGIELfJJt4s1FSJadNAZuKbbJHt5GtKgduobYAHWpBuvzl/gfgwn9 KjUQ== Received: by 10.216.140.131 with SMTP id e3mr993984wej.134.1349982993245; Thu, 11 Oct 2012 12:16:33 -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 ei1sm87266wid.7.2012.10.11.12.16.31 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 11 Oct 2012 12:16:32 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Thu, 11 Oct 2012 20:08:24 +0200 Message-Id: <1349978908-7687-3-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.7.11.2 In-Reply-To: <1349978908-7687-1-git-send-email-daniel.vetter@ffwll.ch> References: <1349978908-7687-1-git-send-email-daniel.vetter@ffwll.ch> X-Gm-Message-State: ALoCoQn9Lio7z+Y8TGgyru4BxtFhycKrW6G8hF8BHkCNZRQy0jflxRiQ/qWUEhE32vktuGJT8pIz Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH 2/6] drm/i915/crt: explicitly set up HOTPLUG_BITS on resume 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 ... instead of relying on the register save/restore madness to do this. To extract a bit of code call drm_mode_config_reset both on resume and boot-up and move the hw state frobbing from the crt_init to the ->reset callback. The crt connector is the only one with a ->reset callback, hence we can easily do this. Signed-off-by: Daniel Vetter Reviewed-by: Paulo Zanoni --- drivers/gpu/drm/i915/i915_drv.c | 1 - drivers/gpu/drm/i915/intel_crt.c | 26 +++++++++++++------------- drivers/gpu/drm/i915/intel_display.c | 2 ++ 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index a7837e5..2aabce7 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -547,7 +547,6 @@ static int i915_drm_thaw(struct drm_device *dev) intel_modeset_init_hw(dev); intel_modeset_setup_hw_state(dev); - drm_mode_config_reset(dev); drm_irq_install(dev); } diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c index 46c90f5..53f3e87 100644 --- a/drivers/gpu/drm/i915/intel_crt.c +++ b/drivers/gpu/drm/i915/intel_crt.c @@ -662,10 +662,22 @@ static int intel_crt_set_property(struct drm_connector *connector, static void intel_crt_reset(struct drm_connector *connector) { struct drm_device *dev = connector->dev; + struct drm_i915_private *dev_priv = dev->dev_private; struct intel_crt *crt = intel_attached_crt(connector); - if (HAS_PCH_SPLIT(dev)) + if (HAS_PCH_SPLIT(dev)) { + u32 adpa; + + adpa = I915_READ(PCH_ADPA); + adpa &= ~ADPA_CRT_HOTPLUG_MASK; + adpa |= ADPA_HOTPLUG_BITS; + I915_WRITE(PCH_ADPA, adpa); + POSTING_READ(PCH_ADPA); + + DRM_DEBUG_KMS("pch crt adpa set to 0x%x\n", adpa); crt->force_hotplug_required = 1; + } + } /* @@ -784,18 +796,6 @@ void intel_crt_init(struct drm_device *dev) * Configure the automatic hotplug detection stuff */ crt->force_hotplug_required = 0; - if (HAS_PCH_SPLIT(dev)) { - u32 adpa; - - adpa = I915_READ(PCH_ADPA); - adpa &= ~ADPA_CRT_HOTPLUG_MASK; - adpa |= ADPA_HOTPLUG_BITS; - I915_WRITE(PCH_ADPA, adpa); - POSTING_READ(PCH_ADPA); - - DRM_DEBUG_KMS("pch crt adpa set to 0x%x\n", adpa); - crt->force_hotplug_required = 1; - } dev_priv->hotplug_supported_mask |= CRT_HOTPLUG_INT_STATUS; } diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index d469b42..ffc3758 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -8334,6 +8334,8 @@ void intel_modeset_setup_hw_state(struct drm_device *dev) intel_modeset_update_staged_output_state(dev); intel_modeset_check_state(dev); + + drm_mode_config_reset(dev); } void intel_modeset_gem_init(struct drm_device *dev)