From patchwork Thu Apr 18 08:46:13 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 2457991 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 3203F3FD8C for ; Thu, 18 Apr 2013 08:46:59 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4225BE6330 for ; Thu, 18 Apr 2013 01:46:59 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-ea0-f171.google.com (mail-ea0-f171.google.com [209.85.215.171]) by gabe.freedesktop.org (Postfix) with ESMTP id D0FDDE632F for ; Thu, 18 Apr 2013 01:43:27 -0700 (PDT) Received: by mail-ea0-f171.google.com with SMTP id b15so1154055eae.16 for ; Thu, 18 Apr 2013 01:43:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=CD0sGoGykK8bM/XhcIFd83RStRE+/g/61zn7Db/aT44=; b=MQfMxc4Re8aR6YMv1nYMIRR5rJlBXYihsURunAouoXx8XAzyhwmw9dDHZRQOULJsxe EJagEQnCe0G7HmGJcqbzRzcDJLOXMEjBqWW/ZI4uYy6a4hnxo6Qr0uLmWWJZV7l2eXwo sLWuEWVjhRJ+HuJbEcNxtfFqxphASSKKr0QCo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=CD0sGoGykK8bM/XhcIFd83RStRE+/g/61zn7Db/aT44=; b=iGBDKvRHu13OdD+RT6ypsoLePyKrezZWazR7Kg9LE31d+JrQwceKYpeCP/DXeHL9sL SLqim0VS3/NDzoDlcDoL5NAhqpGD8YX06mGeKbMUCT4y9nM+uikYFOZHLI9D9H0QjCOy tr7v1uC19zQtXGWDwKiMFTnXhZUpc03rFYdBMKs2KSBMsW59ZkvV7lGC3Y33wIFkLThx 5nej4ruNTF4zoDKWim5S6Fthgg0bLag6Q33PINLuk5iT8Vjs3xLa+u/X2vUX2Dkuk6ZB TGNrVqbtN61Jg8skrLSKalkuMdo0n88vBQ68uPHFf2Ovi9JsJ3nSrg4K27SxGN2PSkH5 gmLQ== X-Received: by 10.15.48.4 with SMTP id g4mr27739820eew.28.1366274606650; Thu, 18 Apr 2013 01:43:26 -0700 (PDT) Received: from phenom.ffwll.local (178-83-130-250.dynamic.hispeed.ch. [178.83.130.250]) by mx.google.com with ESMTPS id u44sm14093490eel.7.2013.04.18.01.43.25 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 18 Apr 2013 01:43:25 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Thu, 18 Apr 2013 10:46:13 +0200 Message-Id: <1366274775-10733-6-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1366274775-10733-1-git-send-email-daniel.vetter@ffwll.ch> References: <20130418081740.GE6169@phenom.ffwll.local> <1366274775-10733-1-git-send-email-daniel.vetter@ffwll.ch> X-Gm-Message-State: ALoCoQmHsdJ05MZsuVCkM24/3nYlGY3qsOkUtLjP/ElNiDrugYcisJ+Xx7A1K4fFol31HkKUMnhq Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH 6/8] Move vlv_init_dpio around 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 I somewhat suspect that we should also do this on resume. So maybe move this to the clock gating functions where we tend to do all such setup stuff? Also I still think s/vlv_init_dpio/vlv_reset_dpio/ --- drivers/gpu/drm/i915/intel_display.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 15bdbd0..df3132c 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -8805,6 +8805,7 @@ static void intel_setup_outputs(struct drm_device *dev) if (I915_READ(VLV_DISPLAY_BASE + DP_B) & DP_DETECTED) intel_dp_init(dev, VLV_DISPLAY_BASE + DP_B, PORT_B); } + vlv_init_dpio(dev); } else if (SUPPORTS_DIGITAL_OUTPUTS(dev)) { bool found = false; @@ -9679,9 +9680,6 @@ void intel_modeset_cleanup(struct drm_device *dev) ironlake_teardown_rc6(dev); - if (IS_VALLEYVIEW(dev)) - vlv_init_dpio(dev); - mutex_unlock(&dev->struct_mutex); /* Disable the irq before mode object teardown, for the irq might