From patchwork Sun Jun 9 21:49:08 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 2695271 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 45C2D3FD4F for ; Sun, 9 Jun 2013 21:50:23 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 27891E5EC2 for ; Sun, 9 Jun 2013 14:50:23 -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 CA1F5E5C0E for ; Sun, 9 Jun 2013 14:49:28 -0700 (PDT) Received: by mail-ea0-f171.google.com with SMTP id m14so4916322eaj.16 for ; Sun, 09 Jun 2013 14:49:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=date:from:sender:to:subject:message-id:references:mime-version :content-type:content-disposition:content-transfer-encoding :in-reply-to:x-originating-ip:user-agent; bh=Is9A9+MBMoIpQMK0lr4BHqpePODh0vveD/WuCvqr55Y=; b=M7XZkEAHT7tyhpJOr4SkhyLpk+LfCQp3DVlESrt/uINDw7r2J3/77vT2+IM+xyL4ET LI7omGjKxdH64QxiJt/mH0A983Ej1i4w++XSIky7W1jEJmPpTUemDvHks0rf7hhO+GRc vJb2wAS9MiczxdDznk4Yv2k8qaq6vFxpqU308= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=date:from:sender:to:subject:message-id:references:mime-version :content-type:content-disposition:content-transfer-encoding :in-reply-to:x-originating-ip:user-agent:x-gm-message-state; bh=Is9A9+MBMoIpQMK0lr4BHqpePODh0vveD/WuCvqr55Y=; b=jrzhdUyGCtIl+e9awxlXiEuJ8uT4GZ4zPUjHMcjWA3HMJZyg9J3Z0raDh5C2V3Ksdv jn3Ix04GWOaNLZIdE+CbxR5VaUerIFeRDP7H7XDOqf08IFQAIHoeVsGZbHhS9d7o82tK LrriO24XBi6TnpErIbuEnhcMsicrdt5lrj3woPk9dDpabMbElTf4cVsiEUisiogrnjuY YP59Q8lsszIqb8xCsL4230PdyBY07GrDjdLNEGQqbZLGCh/0tctyc7ltdY7JFYrno6kL AhFQP9MBlL2vbR+KIUnxc22jfaHEIe7VdXb0DuKe3NpKh5uMv7GP9ThVcYQljbIgWfRz pcKQ== X-Received: by 10.14.115.1 with SMTP id d1mr8134934eeh.27.1370814567741; Sun, 09 Jun 2013 14:49:27 -0700 (PDT) Received: from biers.ffwll.ch (178-83-130-250.dynamic.hispeed.ch. [178.83.130.250]) by mx.google.com with ESMTPSA id c5sm18244414eeu.8.2013.06.09.14.49.26 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sun, 09 Jun 2013 14:49:26 -0700 (PDT) Date: Sun, 9 Jun 2013 23:49:08 +0200 From: Daniel Vetter To: Chris Wilson , Daniel Vetter , intel-gfx Message-ID: <20130609214908.GA26800@biers.ffwll.ch> References: <1370798584-27153-1-git-send-email-chris@chris-wilson.co.uk> <1370798584-27153-3-git-send-email-chris@chris-wilson.co.uk> <20130609210118.GB8934@cantiga.alporthouse.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Received: by 10.42.28.9 with HTTP; Sun, 9 Jun 2013 14:46:43 -0700 (PDT) X-Originating-IP: [178.83.130.250] User-Agent: Mutt/1.5.21 (2010-09-15) X-Gm-Message-State: ALoCoQkTx3mhgtxIuwHAfHa1SOs52jCKEFL+79u4IOznkSbAcgG5cffgK9oSkeuXMvTV/W/1PMvX Subject: Re: [Intel-gfx] [PATCH 3/3] drm/i915: Fix checking of pixel multiplier on SDVOX 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 On Sun, Jun 9, 2013 at 11:18 PM, Daniel Vetter wrote: > On Sun, Jun 9, 2013 at 11:01 PM, Chris Wilson wrote: >> On Sun, Jun 09, 2013 at 09:48:11PM +0200, Daniel Vetter wrote: >>> On Sun, Jun 9, 2013 at 7:23 PM, Chris Wilson wrote: >>> > The pixel multiplier is only stored in SDVOX on i915g/i915gm, so we need >>> > to use the value retreived from the card for pipe_config and restrict >>> > the cross check to i915g/i915gm. >>> > >>> > Signed-off-by: Chris Wilson >>> >>> Failing this cross check was a fallout from the incosistent ordering >>> of the get_pipe_config vs. encoder->get_config calls in setup_hw_state >>> vs. modeset_check_state. It should be fixed in latest dinq, at least >>> it seemed to on my g33 and i915g. >> >> It is not fixed as of: >> >> commit 22e407d749a418b4bb4cc93ef76e0429a9f83c82 >> Author: Ville Syrjälä >> Date: Fri Jun 7 18:52:24 2013 +0300 >> >> drm/i915: Make g4x_fixup_plane() operational again > > Hm, indeed something seems to be amiss. I'll check this out, since > it's supposed to work ... dunno what I've missed in testing :( Ok, I seem to be especially dense today. So the failure I've seen beforehand on my g33 was just a stale version of my private branch. I've retested both my private stuff branch and latest -nightly, and they both seem to work. But since you're on a pch_split platform the pixel_mutliplier for the crtc get_pipe_config function is wrong, so you'll hit the WARN. Either grab my stuff branch (which has real pixel mutliplier readout support for pch-split platform as the patch on the top), or just disable the WARN for now with the below patch. Unfortunately the tip patch on stuff needs quite a bit of the shared dpll infrastructure, so I think we should shut up the WARN for now. I'll submit a real patch tomorrow ... Cheers, Daniel --- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c index 67710e1..cf9dc6d 100644 --- a/drivers/gpu/drm/i915/intel_sdvo.c +++ b/drivers/gpu/drm/i915/intel_sdvo.c @@ -1362,6 +1362,10 @@ static void intel_sdvo_get_config(struct intel_encoder *encoder, encoder_pixel_multiplier = 4; break; } + + if(HAS_PCH_SPLIT(dev)) + return; /* no pixel mutlierplier 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);