From patchwork Wed Jun 12 09:47:24 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 2709031 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id D39159F1E2 for ; Wed, 12 Jun 2013 09:47:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B7BC22021C for ; Wed, 12 Jun 2013 09:47:43 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 70FA32021B for ; Wed, 12 Jun 2013 09:47:42 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4841EE6094 for ; Wed, 12 Jun 2013 02:47:42 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-ea0-f180.google.com (mail-ea0-f180.google.com [209.85.215.180]) by gabe.freedesktop.org (Postfix) with ESMTP id 6141FE5C94 for ; Wed, 12 Jun 2013 02:47:32 -0700 (PDT) Received: by mail-ea0-f180.google.com with SMTP id k10so6959400eaj.11 for ; Wed, 12 Jun 2013 02:47:31 -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 :mime-version:content-type:content-transfer-encoding; bh=kqTXXT76JniyyBQNeNBOZrLyZZ15zp9wWG1x77asHlQ=; b=Tsx9TrwGl/blDobuvq7Idm0QdmgTfsg+RLTe99Glju79FTJxn5aVwY+2CG9cpS3Ctu gRjm0gVpS+aL3kvNXlTLWc5rW8SpiH5325880ppavpUju+LO9nbudCLqI1b3sQtP1mSb b3FnMBARiV1wevnOqESoY4QR85a70c8rm5Rjo= 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 :mime-version:content-type:content-transfer-encoding :x-gm-message-state; bh=kqTXXT76JniyyBQNeNBOZrLyZZ15zp9wWG1x77asHlQ=; b=a4RpE6mghKPu28IjXJ9YY8t08EjUubIc9g/7yjaaNQei9Tq409rOSrlMs5ge75HX8s 8RYL8h0BFa/FwgPDpz1DJokx0P1/AgiNrPR0ArItS1kzv4QcHms7bnnKJOyB5LZeyF6V 24LPDlpHTbl6l5IXMT9ZsIbZbbE1SzxlFdnev6kgqMRHgRVZjtWtZJVeSBxqwICvytle Jl8Gw1bWfAcIu4UQLGD3LA86fV6niAAnDaRa13NDosVzZ3kbem3ljXqruSobzRJ/gays AYWY1v3exFFPOymd/EAxRE1EUkGTiTV1zD0BU6YILeR2lUlr4J7pA2sqKto5vkxgIRi3 1U1A== X-Received: by 10.14.203.194 with SMTP id f42mr20879941eeo.53.1371030451370; Wed, 12 Jun 2013 02:47:31 -0700 (PDT) Received: from bremse.ffwll.local (178-83-130-250.dynamic.hispeed.ch. [178.83.130.250]) by mx.google.com with ESMTPSA id bk1sm35719441eeb.5.2013.06.12.02.47.29 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 12 Jun 2013 02:47:30 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Wed, 12 Jun 2013 11:47:24 +0200 Message-Id: <1371030444-7205-1-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1370878000-18041-1-git-send-email-daniel.vetter@ffwll.ch> References: <1370878000-18041-1-git-send-email-daniel.vetter@ffwll.ch> MIME-Version: 1.0 X-Gm-Message-State: ALoCoQmXyAOg07K3S036Ute0Qios1rxi98u9UcnvcUIFHqkXCEZAyWWUQU3geZzeLEeCpvBjQcTq Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH] drm/i915: disable sdvo pixel multiplier cross-check for HAS_PCH_SPLIT 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: , 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.3 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 We don't (yet) have proper pixel multiplier readout support on pch split platforms, so the cross check will naturally fail. v2: Fix spelling in the comment, spotted by Ville. v3: Since the ordering constraint is pretty tricky between the crtc get_pipe_config callback and the encoder->get_config callback add a few comments about it. Prompted by a discussion with Chris Wilson on irc about why this does work anywhere else than on i915g/gm. Reported-by: Chris Wilson Cc: Chris Wilson Cc: Ville Syrjälä Signed-off-by: Daniel Vetter --- drivers/gpu/drm/i915/intel_drv.h | 3 ++- drivers/gpu/drm/i915/intel_sdvo.c | 11 +++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index 3363358..cf26fa8 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -140,7 +140,8 @@ struct intel_encoder { * it is connected to in the pipe parameter. */ bool (*get_hw_state)(struct intel_encoder *, enum pipe *pipe); /* Reconstructs the equivalent mode flags for the current hardware - * state. */ + * state. This must be called _after_ display->get_pipe_config has + * pre-filled the pipe config. */ void (*get_config)(struct intel_encoder *, struct intel_crtc_config *pipe_config); int crtc_mask; diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c index a6c53b6..1327fa9 100644 --- a/drivers/gpu/drm/i915/intel_sdvo.c +++ b/drivers/gpu/drm/i915/intel_sdvo.c @@ -1342,6 +1342,13 @@ static void intel_sdvo_get_config(struct intel_encoder *encoder, pipe_config->adjusted_mode.flags |= flags; + /* + * pixel multiplier readout is tricky: Only on i915g/gm it is stored in + * the sdvo port register, on all other platforms it is part of the dpll + * state. Since the general pipe state readout happens before the + * encoder->get_config we so already have a valid pixel multplier on all + * other platfroms. + */ if (IS_I915G(dev) || IS_I915GM(dev)) { sdvox = I915_READ(intel_sdvo->sdvo_reg); pipe_config->pixel_multiplier = @@ -1362,6 +1369,10 @@ static void intel_sdvo_get_config(struct intel_encoder *encoder, encoder_pixel_multiplier = 4; break; } + + if(HAS_PCH_SPLIT(dev)) + return; /* no pixel multiplier readout support yet */ + WARN(encoder_pixel_multiplier != pipe_config->pixel_multiplier, "SDVO pixel multiplier mismatch, port: %i, encoder: %i\n", pipe_config->pixel_multiplier, encoder_pixel_multiplier);