From patchwork Thu Nov 17 12:30:13 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tvrtko Ursulin X-Patchwork-Id: 9434207 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 1B4C86047D for ; Thu, 17 Nov 2016 12:30:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0DB7429407 for ; Thu, 17 Nov 2016 12:30:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 02B632947A; Thu, 17 Nov 2016 12:30:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B3E8B29407 for ; Thu, 17 Nov 2016 12:30:39 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2C7F489B8E; Thu, 17 Nov 2016 12:30:39 +0000 (UTC) X-Original-To: Intel-gfx@lists.freedesktop.org Delivered-To: Intel-gfx@lists.freedesktop.org Received: from mail-wm0-x241.google.com (mail-wm0-x241.google.com [IPv6:2a00:1450:400c:c09::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id DA43389AEB for ; Thu, 17 Nov 2016 12:30:31 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id u144so20779008wmu.0 for ; Thu, 17 Nov 2016 04:30:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ursulin-net.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=W3H9TCsiFA0TaJ+xc85nLgGFS92efvRzG98h/g5ELVo=; b=C1MNNGbDQSZMnfSjuRa22ykO/9x95BxNdb+iBycHS0mHgcVcUoqxp9WMSPppLiYLFA ZOmmRYd9vfHA80roLz9voN/sudJ3y4zBRdUohKSI/Jgh35qfN3Ebov1x2NbChvEUEDco wFJ0qX1ZJMjfTu5K8ex2Z2QA9Rv9cT+UigglljDgEJWH781u9sIOu3Jj+RCUb78lN0ci xFGwq+w56NS9e5rsJLzDayPnUldTzPTiawFedn7yeMj4zpM9H5SNP8JEs+nDMk4jRCtg iE3gJvcqXCcT9me0E48xuC2RbFDqaVdYsBqCFztShyUcScvhGS1gqUTQB3+qdAC8+t/L GFgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=W3H9TCsiFA0TaJ+xc85nLgGFS92efvRzG98h/g5ELVo=; b=UfhAk29vCoh7uhIrhbvzwKBoy2CUAIMgm/ed8z5tBLsZXm7YR5zCP5v4qnhjWNUAQg ggMfm7LvBqOO9ZZoDfx2A2SFnIEb5BCmqJSAAbv3qNxXMDzzAnjv2PyF8bQKZsO4vMll 53TzK9zmcrWeItIa5lEsUTz1S3dtoJrNKOxwLm0w8P4PsbGged/oxbg8El9reIAw/gT7 kSsfdDJMEJlEP29+m88yr3xkV3kQAFWcETYi3Af/lSkL7YPggBU49CGnDFnXnO1EQLNV E1wbfwrtCKKiMCkSV98NbU0G6oeJuF/AbmCwtLJvF9Fk8Rce3EMx3AH2BYbEyqrmuEYQ PkPw== X-Gm-Message-State: ABUngveeCEkh2Wy6mZqpy5zRauflaZsKnI3qLPYSiK73nHblXykoV5VymKZxNAp5ZLyoQg== X-Received: by 10.28.196.67 with SMTP id u64mr3672107wmf.45.1479385830248; Thu, 17 Nov 2016 04:30:30 -0800 (PST) Received: from t460p.Home ([2a02:c7d:9bd6:b000:f37e:1e07:a7d8:46cd]) by smtp.gmail.com with ESMTPSA id vr9sm3014995wjc.35.2016.11.17.04.30.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Nov 2016 04:30:29 -0800 (PST) From: Tvrtko Ursulin X-Google-Original-From: Tvrtko Ursulin To: Intel-gfx@lists.freedesktop.org Date: Thu, 17 Nov 2016 12:30:13 +0000 Message-Id: <1479385814-2358-7-git-send-email-tvrtko.ursulin@linux.intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1479385814-2358-1-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1479385814-2358-1-git-send-email-tvrtko.ursulin@linux.intel.com> Subject: [Intel-gfx] [PATCH 6/7] drm/i915: Only dump possible panel fitter config for the platform X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP From: Tvrtko Ursulin Signed-off-by: Tvrtko Ursulin --- drivers/gpu/drm/i915/intel_display.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 3cbf9fa98512..0e31d2c9edde 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -12791,14 +12791,18 @@ static void intel_dump_pipe_config(struct intel_crtc *crtc, crtc->num_scalers, pipe_config->scaler_state.scaler_users, pipe_config->scaler_state.scaler_id); - DRM_DEBUG_KMS("gmch pfit: control: 0x%08x, ratios: 0x%08x, lvds border: 0x%08x\n", - pipe_config->gmch_pfit.control, - pipe_config->gmch_pfit.pgm_ratios, - pipe_config->gmch_pfit.lvds_border_bits); - DRM_DEBUG_KMS("pch pfit: pos: 0x%08x, size: 0x%08x, %s\n", - pipe_config->pch_pfit.pos, - pipe_config->pch_pfit.size, - pipe_config->pch_pfit.enabled ? "enabled" : "disabled"); + + if (HAS_GMCH_DISPLAY(dev_priv)) + DRM_DEBUG_KMS("gmch pfit: control: 0x%08x, ratios: 0x%08x, lvds border: 0x%08x\n", + pipe_config->gmch_pfit.control, + pipe_config->gmch_pfit.pgm_ratios, + pipe_config->gmch_pfit.lvds_border_bits); + else + DRM_DEBUG_KMS("pch pfit: pos: 0x%08x, size: 0x%08x, %s\n", + pipe_config->pch_pfit.pos, + pipe_config->pch_pfit.size, + pipe_config->pch_pfit.enabled ? "enabled" : "disabled"); + DRM_DEBUG_KMS("ips: %i, double wide: %i\n", pipe_config->ips_enabled, pipe_config->double_wide);