From patchwork Tue Aug 6 06:57:35 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 2839215 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 98C69BF535 for ; Tue, 6 Aug 2013 06:57:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D9AC42018D for ; Tue, 6 Aug 2013 06:57:43 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 081942017E for ; Tue, 6 Aug 2013 06:57:43 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CA724E688F for ; Mon, 5 Aug 2013 23:57:42 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-we0-f180.google.com (mail-we0-f180.google.com [74.125.82.180]) by gabe.freedesktop.org (Postfix) with ESMTP id 511A1E5EA2 for ; Mon, 5 Aug 2013 23:57:33 -0700 (PDT) Received: by mail-we0-f180.google.com with SMTP id p61so10243wes.39 for ; Mon, 05 Aug 2013 23:57:32 -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=VYPYT96uEcBHhj03tuVPiH5JNYje1FvZ0sk3aqLQtfk=; b=K83QuxQKMKaiNjkPaboQyC9nfr+MU5S3kJDjD9fZ+YuUb6qE3iDvB10w3nGQgglppd 1WWFV7mQf2g74G+GZtP68UADjGzT9K5E/Kje72gHIzvOQi9tN9BwGdznqESa/JJtc7kb K2p1wNlJFiL8gNgsQudjpnulMjzrf/xU56jZg= 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=VYPYT96uEcBHhj03tuVPiH5JNYje1FvZ0sk3aqLQtfk=; b=MjaZeaKYsnHrof833WyGHv/QvmjKNxqxwvYMDJ36eDDjNKzy14ucokXFgOgz90Hmw8 Nn4t8AgpPqxLolNBca5B7mHgt7IFNUCw2xDTd9g6MwlinHy7COX6JnLHx3rvpP56Yz7Q qaI7HF3AB8buO+1MT+6s1gjgufe59cfc2nbiV5lydCocy/v07tSJ2LBfcwkcGzV8pp+x dMxVNBs+Tqu+72k/taCf4uw2k61eNT4xOCFbZqX9h5RFUZjX2qX/m71xCoh2Fe0jkNsK WmsQsp5FLmJd5pwjIRh0VQzssjyDUNyXwprxWJnXNzhagjSRjW2sVIXSrAvS+b4NpGDR WINg== X-Received: by 10.180.9.235 with SMTP id d11mr859160wib.35.1375772252403; Mon, 05 Aug 2013 23:57:32 -0700 (PDT) Received: from phenom.ffwll.local (178-83-130-250.dynamic.hispeed.ch. [178.83.130.250]) by mx.google.com with ESMTPSA id jf9sm3402136wic.5.2013.08.05.23.57.30 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 05 Aug 2013 23:57:31 -0700 (PDT) From: Daniel Vetter To: stable@vger.kernel.org Date: Tue, 6 Aug 2013 08:57:35 +0200 Message-Id: <1375772255-10639-1-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1375772118-10513-1-git-send-email-daniel.vetter@ffwll.ch> References: <1375772118-10513-1-git-send-email-daniel.vetter@ffwll.ch> X-Gm-Message-State: ALoCoQnCOF7ql3ym5eQt2cu/znenW/LXJaQt2wheLztcEUgPoFugmfWA6dZ9mitaF4+qbub/RVqs Cc: Daniel Vetter , Intel Graphics Development , Pierre Assal Subject: [Intel-gfx] [PATCH] drm/i915: make SDVO TV-out work for multifunction devices v2 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 X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This is the functional backport of upstream commit 09ede5414f0215461c933032630bf9c3a61a8ba3 Original commit message below. Backport has been tested by the bug reporter, please consider applying to all stable kernels. We need to track this correctly. While at it shovel the boolean to track whether the sdvo is in tv mode or not into pipe_config. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=36997 Tested-by: Pierre Assal Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=63609 Tested-by: cancan,feng Reviewed-by: Jani Nikula Signed-off-by: Daniel Vetter --- backport v2: Fix up the git fail from v1 and actually add the right changes. I suck. -Daniel --- drivers/gpu/drm/i915/intel_display.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index e1f4e6e..eea5982 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -4333,7 +4333,8 @@ static void vlv_update_pll(struct intel_crtc *crtc) static void i9xx_update_pll(struct intel_crtc *crtc, intel_clock_t *reduced_clock, - int num_connectors) + int num_connectors, + bool needs_tv_clock) { struct drm_device *dev = crtc->base.dev; struct drm_i915_private *dev_priv = dev->dev_private; @@ -4391,7 +4392,7 @@ static void i9xx_update_pll(struct intel_crtc *crtc, if (INTEL_INFO(dev)->gen >= 4) dpll |= (6 << PLL_LOAD_PULSE_PHASE_SHIFT); - if (is_sdvo && intel_pipe_has_type(&crtc->base, INTEL_OUTPUT_TVOUT)) + if (is_sdvo && needs_tv_clock) dpll |= PLL_REF_INPUT_TVCLKINBC; else if (intel_pipe_has_type(&crtc->base, INTEL_OUTPUT_TVOUT)) /* XXX: just matching BIOS for now */ @@ -4716,7 +4717,8 @@ static int i9xx_crtc_mode_set(struct drm_crtc *crtc, else i9xx_update_pll(intel_crtc, has_reduced_clock ? &reduced_clock : NULL, - num_connectors); + num_connectors, + is_sdvo && is_tv); /* Set up the display plane register */ dspcntr = DISPPLANE_GAMMA_ENABLE;