From patchwork Thu Nov 17 12:30:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tvrtko Ursulin X-Patchwork-Id: 9434203 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 C0ABB6047D for ; Thu, 17 Nov 2016 12:30:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B2CC129448 for ; Thu, 17 Nov 2016 12:30:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A545029407; Thu, 17 Nov 2016 12:30:33 +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 5E20929407 for ; Thu, 17 Nov 2016 12:30:33 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8E90889AEB; Thu, 17 Nov 2016 12:30:32 +0000 (UTC) X-Original-To: Intel-gfx@lists.freedesktop.org Delivered-To: Intel-gfx@lists.freedesktop.org Received: from mail-wm0-x242.google.com (mail-wm0-x242.google.com [IPv6:2a00:1450:400c:c09::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id DA9736E7D9 for ; Thu, 17 Nov 2016 12:30:30 +0000 (UTC) Received: by mail-wm0-x242.google.com with SMTP id m203so20760913wma.3 for ; Thu, 17 Nov 2016 04:30:30 -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=10/Ocf901sNKLpWR3gBYgxrdGoOrgUDJOXuCVDDZT/k=; b=n8t8IIXTmNZSdxO8XH0BxLGJ40bTLfDHORwg7/wjBDGr20vjyLPZ9Ki6MLocEUyO5m qoTLkbMkzS4xU8q5R1Y8EZ7L/vkl3PFc+tEg5XW4p1S4+Qbj7cLX1PpGPzn39fDHmYBH PZ5CY8/uIbqnirWSlTrrthyCUWqWPavX43j/UMdpNCpvFSKM0eC1KiVg9To6C3pUKzxP TDCxYKy5UV3Qauhz7n2VufV6r1bShvyZHWRmr0bNnmJMGuC8crDF7iTvpXCfeNvospqZ vynXsZ2VbAMMhDc2yzYdsI475V9DPpc1x3FBUUf1rIGxfGcSNwv/pG7VGQVIikXhqx/p RetA== 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=10/Ocf901sNKLpWR3gBYgxrdGoOrgUDJOXuCVDDZT/k=; b=LZFaE931zPvrsevsrDiWlQLQxvPveMib0lK38GfKVQUESkEu4k8Gc6NkD8OodBdlPu M78ON04GbFAJSIxOHlVgzvunfZL4/frTAe0Ghk9G5vwwY5HMizcP8xKvnVjB23B/ViMr tg75blULv5QphodIQr0mJJg+DW1NCLk3sjKx6BHX8Yu51nNUVOndH3+gvxOu/+ZTEA4J ghaEAg0y1HrVqvFnPHKQYBCbIwseNR51grJUSoTL2hkzvjC4iE96ZWsPeLo7NxecY0zQ udICLys8zSgEgjGkkQk4ea+HBiQqa2gBA+4zOHhBYWW+/vlOWnyrOlNroAohBbn3VRfQ H9Yw== X-Gm-Message-State: AKaTC02dUE+QDnh0DeeDDZFq6nWChnqEIT7MldAvL6cmyFtSXdfXZBf73KEQfzlJEUc28g== X-Received: by 10.194.238.163 with SMTP id vl3mr1863374wjc.169.1479385829444; Thu, 17 Nov 2016 04:30:29 -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.28 (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:12 +0000 Message-Id: <1479385814-2358-6-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 5/7] drm/i915: Only dump scaler config where supported 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 | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 3c03c0172a2d..3cbf9fa98512 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -12785,10 +12785,12 @@ static void intel_dump_pipe_config(struct intel_crtc *crtc, DRM_DEBUG_KMS("port clock: %d, pipe src size: %dx%d\n", pipe_config->port_clock, pipe_config->pipe_src_w, pipe_config->pipe_src_h); - DRM_DEBUG_KMS("num_scalers: %d, scaler_users: 0x%x, scaler_id: %d\n", - crtc->num_scalers, - pipe_config->scaler_state.scaler_users, - pipe_config->scaler_state.scaler_id); + + if (INTEL_GEN(dev_priv) >= 9) + DRM_DEBUG_KMS("num_scalers: %d, scaler_users: 0x%x, scaler_id: %d\n", + 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, @@ -12849,20 +12851,20 @@ static void intel_dump_pipe_config(struct intel_crtc *crtc, continue; } - DRM_DEBUG_KMS("[PLANE:%d:%s] enabled", - plane->base.id, plane->name); - DRM_DEBUG_KMS("\tFB:%d, fb = %ux%u format = %s", + DRM_DEBUG_KMS("[PLANE:%d:%s] FB:%d, fb = %ux%u format = %s\n", + plane->base.id, plane->name, fb->base.id, fb->width, fb->height, drm_get_format_name(fb->pixel_format, &format_name)); - DRM_DEBUG_KMS("\tscaler:%d src %dx%d+%d+%d dst %dx%d+%d+%d\n", - state->scaler_id, - state->base.src.x1 >> 16, - state->base.src.y1 >> 16, - drm_rect_width(&state->base.src) >> 16, - drm_rect_height(&state->base.src) >> 16, - state->base.dst.x1, state->base.dst.y1, - drm_rect_width(&state->base.dst), - drm_rect_height(&state->base.dst)); + if (INTEL_GEN(dev_priv) >= 9) + DRM_DEBUG_KMS("\tscaler:%d src %dx%d+%d+%d dst %dx%d+%d+%d\n", + state->scaler_id, + state->base.src.x1 >> 16, + state->base.src.y1 >> 16, + drm_rect_width(&state->base.src) >> 16, + drm_rect_height(&state->base.src) >> 16, + state->base.dst.x1, state->base.dst.y1, + drm_rect_width(&state->base.dst), + drm_rect_height(&state->base.dst)); } }