From patchwork Wed Jul 11 14:28:44 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 1184151 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 25C623FC5A for ; Wed, 11 Jul 2012 16:22:35 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E4022A0EDF for ; Wed, 11 Jul 2012 09:22:34 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-we0-f177.google.com (mail-we0-f177.google.com [74.125.82.177]) by gabe.freedesktop.org (Postfix) with ESMTP id B83E49E7D3 for ; Wed, 11 Jul 2012 08:36:32 -0700 (PDT) Received: by mail-we0-f177.google.com with SMTP id r3so960506wey.36 for ; Wed, 11 Jul 2012 08:36: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=A6x52bynHRzgrQOvcNtFHgNymt+Zi9ywUsiKQrAk/zo=; b=WDq51KGFHA2/YSSK7gMZqzwgVRpzfsVsqDGq4eWD7GslmWeXetlsqTRuf4WiA1OvkJ sVXz7GB4klHHxBoWKzB1E892x1CqgD2pdP09JOHzZCZkS5VU10cmzsMDBnkfwJN+Yw7V ErFvGU4dWwh0H6EVCJ3UMZCdFLEx+7RTW1EK0= 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=A6x52bynHRzgrQOvcNtFHgNymt+Zi9ywUsiKQrAk/zo=; b=NrfXpL2gVO5rI0tfY51f9w8/DM2kPQq1l7d68rBmx6WFEAuHTcGAdl+wp+cAeCKXmn NvNPazIqi/kfXCOK7DQL01QpAip2vg/SGol/JA88A4UI89woeFJIEqBa+0k6Li6dI47i tmih+E95V5pG+Lzi3lRjxqoxUtnZaX/oVcenWFTtsuL2dKXShMV+5penw02y7NntAkE5 1jEW9DnZLmZEPkC8rTGFbCEP8W4pTFhQf3WK05RXPaAxH/f0PE3fQq+dgAk3ro2vpL31 KKN4kj/H1g5YajKpmdFrMnpbLUfkHQzIpZyCPvANX2r49IGpf6sxHEzxVP5ktv+iOmMQ 2MVQ== Received: by 10.180.81.165 with SMTP id b5mr48048645wiy.17.1342020992421; Wed, 11 Jul 2012 08:36:32 -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 bc2sm5777080wib.0.2012.07.11.08.36.31 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 11 Jul 2012 08:36:31 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Wed, 11 Jul 2012 16:28:44 +0200 Message-Id: <1342016944-23395-62-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <1342016944-23395-1-git-send-email-daniel.vetter@ffwll.ch> References: <1342016944-23395-1-git-send-email-daniel.vetter@ffwll.ch> X-Gm-Message-State: ALoCoQmIqgP/DyQKv1wEOMijG3gZASE1TmhmXCcw668aIyBkL71H/O14HfHGZPCMlxvcoO07yNhP Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH 61/81] drm/i915: use staged outuput config in lvds->mode_fixup 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 - Use the check_cloned helper from the previous patch. - Use encoder->new_crtc to check crtc properties. Signed-Off-by: Daniel Vetter --- drivers/gpu/drm/i915/intel_lvds.c | 13 +++---------- 1 files changed, 3 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c index af78502..37c7ab1 100644 --- a/drivers/gpu/drm/i915/intel_lvds.c +++ b/drivers/gpu/drm/i915/intel_lvds.c @@ -250,9 +250,8 @@ static bool intel_lvds_mode_fixup(struct drm_encoder *encoder, { struct drm_device *dev = encoder->dev; struct drm_i915_private *dev_priv = dev->dev_private; - struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc); struct intel_lvds *intel_lvds = to_intel_lvds(encoder); - struct intel_encoder *tmp_encoder; + struct intel_crtc *intel_crtc = intel_lvds->base.new_crtc; u32 pfit_control = 0, pfit_pgm_ratios = 0, border = 0; int pipe; @@ -262,14 +261,8 @@ static bool intel_lvds_mode_fixup(struct drm_encoder *encoder, return false; } - /* Should never happen!! */ - for_each_encoder_on_crtc(dev, encoder->crtc, tmp_encoder) { - if (&tmp_encoder->base != encoder) { - DRM_ERROR("Can't enable LVDS and another " - "encoder on the same pipe\n"); - return false; - } - } + if (!intel_encoder_check_non_cloned(&intel_lvds->base)) + return false; /* * We have timings from the BIOS for the panel, put them in