From patchwork Tue May 28 14:00:19 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 2625071 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 36CBC40077 for ; Tue, 28 May 2013 14:01:18 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 09958E5C41 for ; Tue, 28 May 2013 07:01:18 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-ea0-f173.google.com (mail-ea0-f173.google.com [209.85.215.173]) by gabe.freedesktop.org (Postfix) with ESMTP id 1A45CE5C5B for ; Tue, 28 May 2013 07:00:32 -0700 (PDT) Received: by mail-ea0-f173.google.com with SMTP id n15so4479621ead.18 for ; Tue, 28 May 2013 07:00: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=bHNXezjN787JOl1Pepxp5BbsAupOV3FZthMPlNJt3CQ=; b=JnUMD92mOHpHThB33zKrn7SrcAMYfraNkQStjbGXqYA2ON1ekVbG/T9py2bYabwhyB 28PKYfYRTAhgXfK3teJKWunuriLhLWjjHG5IMor8FxUpUvsZpjvPZNYs0fMKsr0d+nBK 2W3pUFJTP27FLpobxCt+FplTIOS699tHJsygw= 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=bHNXezjN787JOl1Pepxp5BbsAupOV3FZthMPlNJt3CQ=; b=mP40B5pJ7LhEwskyd4tFHkHBXj3Cvrla9Sz46fN21nsfKuzCoW7oJbX0BIxaBt1KPp /bDxcfMX+7V0z86yChCmeFMP2YaCjhNqR6Fxj97gyxUO9jMSH5h23tpVEl+it+9SL0j3 Q6oYOs6/cwJP0tYYGyhjwf0UXePiaeuAB977nousG8j4Al3d3EZ1lF7NK0oVm0PebZ6T odAt5c5GPU+xuJO3055XACFk9RpCTIYF2WUMMDrwzwwKLcbzBmoBHKfv6sY9abGk//i2 AfZD9XPJB5f1PLXR6HyyGlaafLqmymX0lFuHlCu+Ee4mYATugnTRksHxaQu3dANv09PK JvVw== X-Received: by 10.14.172.70 with SMTP id s46mr6721130eel.133.1369749632246; Tue, 28 May 2013 07:00:32 -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 w43sm18748743eel.0.2013.05.28.07.00.30 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 28 May 2013 07:00:31 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Tue, 28 May 2013 16:00:19 +0200 Message-Id: <1369749619-15890-2-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1369749619-15890-1-git-send-email-daniel.vetter@ffwll.ch> References: <1369749619-15890-1-git-send-email-daniel.vetter@ffwll.ch> X-Gm-Message-State: ALoCoQlyNAKVPJ8vwM37Uf6arrXRhLBbhz6jH701C9esbGOgKuil7ZHEdnWT0sn40ErYoZAdAwUf Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH 2/2] drm/i915: drop a few really redundant WARNs in hsw mode_set 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 - Correct cpu->pch display matching is already check when we detect the PCH type at driver load. - Plane/pipe state is already checked both when a) enabling, b) disabling and in c) the modeset state checker. No need to go overboard and also check it in in between a) and b). Cc: Paulo Zanoni Signed-off-by: Daniel Vetter --- drivers/gpu/drm/i915/intel_display.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index e9aa2a5..1216fdf 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -5861,15 +5861,6 @@ static int haswell_crtc_mode_set(struct drm_crtc *crtc, int plane = intel_crtc->plane; int ret; - /* We are not sure yet this won't happen. */ - WARN(!HAS_PCH_LPT(dev), "Unexpected PCH type %d\n", - INTEL_PCH_TYPE(dev)); - - WARN_ON(I915_READ(PIPECONF(intel_crtc->config.cpu_transcoder)) & - (PIPECONF_ENABLE | I965_PIPECONF_ACTIVE)); - - WARN_ON(I915_READ(DSPCNTR(plane)) & DISPLAY_PLANE_ENABLE); - if (!intel_ddi_pll_mode_set(crtc)) return -EINVAL;