From patchwork Thu Jul 26 18:49:22 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 1245291 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 5C2093FC33 for ; Thu, 26 Jul 2012 20:45:23 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 155AF9E9FE for ; Thu, 26 Jul 2012 13:45:23 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wi0-f177.google.com (mail-wi0-f177.google.com [209.85.212.177]) by gabe.freedesktop.org (Postfix) with ESMTP id BEC769E9FE for ; Thu, 26 Jul 2012 12:57:25 -0700 (PDT) Received: by mail-wi0-f177.google.com with SMTP id hm11so1801934wib.12 for ; Thu, 26 Jul 2012 12:57:25 -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=xIerw0E+9Nix6lRl3CXZ1qsczv/zXxILW4u6qKiWsZs=; b=GbJrqDA1jGbaMWoANnt5fRGDiM5IgYtOwsb2KXP2N4AqL2f8yQSigQBiQ3tYo0zfRY ukgKgMa83nBjDpbWitc+qEij7efKh6zvu9pWAViY/cbEmeoXmNlCcBoVGGrh5IFfUhYf lJG3D7F+OGzCVgP52h0rAuqY8ieuD0axntqo4= 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=xIerw0E+9Nix6lRl3CXZ1qsczv/zXxILW4u6qKiWsZs=; b=EI0RSF8AzJrlkwvekkRYv8fTfUX1ujdPvW+aEh7qmIke5H2+K4jwMb70CD4MmjIAE8 GmUw+CkBJlNZ0zTNnsJgrKmWlQQiHsl2YC1rAfpxvFU2723OnGMcoP9WcUTmfwhM9VXa D29WBR5f72mWd7d/7yYfT6Xw5M4XEW8O9GPiKBSN3Odk97AnQ9nvWCU4qJ2aYt6jmM+d h0fs59BXr4Fu6jxu/Ho2tlSk3Njthkr+l/jL/l/OwxnTWPvzPlBm6xS+u2zp30PRXxFJ AWBarm1bB72Tk98sw7yQKXP1NDL0azU3ep5lcI8UE1TdbeVehvLTHc7+HWFfBE4nd7bg KExg== Received: by 10.180.94.164 with SMTP id dd4mr16154532wib.1.1343332645550; Thu, 26 Jul 2012 12:57:25 -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 fr4sm391403wib.8.2012.07.26.12.57.24 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 26 Jul 2012 12:57:24 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Thu, 26 Jul 2012 20:49:22 +0200 Message-Id: <1343328581-2324-58-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1343328581-2324-1-git-send-email-daniel.vetter@ffwll.ch> References: <1343328581-2324-1-git-send-email-daniel.vetter@ffwll.ch> X-Gm-Message-State: ALoCoQmHfMjdgSB9YGTYwK6lKm342W4+ayq3p6pHBCtHHBHcB2oYCB4LTXTiDPry6uGhfusiWliq Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH 57/76] 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 file changed, 3 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c index 52f9e7f..7f730af 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