From patchwork Mon Nov 21 11:49:29 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tvrtko Ursulin X-Patchwork-Id: 9439251 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 F2F8A60469 for ; Mon, 21 Nov 2016 11:49:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DAC7E28763 for ; Mon, 21 Nov 2016 11:49:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CAB182878C; Mon, 21 Nov 2016 11:49:44 +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 4AD3C28763 for ; Mon, 21 Nov 2016 11:49:43 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 563DD6E06E; Mon, 21 Nov 2016 11:49:43 +0000 (UTC) X-Original-To: Intel-gfx@lists.freedesktop.org Delivered-To: Intel-gfx@lists.freedesktop.org Received: from mail-wm0-x244.google.com (mail-wm0-x244.google.com [IPv6:2a00:1450:400c:c09::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id C77AE892B2 for ; Mon, 21 Nov 2016 11:49:41 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id m203so1200103wma.3 for ; Mon, 21 Nov 2016 03:49:41 -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:mime-version :content-transfer-encoding; bh=6n4eT4d2xr49gsA6vA1SfSGteK1a3KbJ7sv8L2g+0Rg=; b=yJZ2WuOD810Y0mThmSVB2nt/u35JrHdM4sv5kJtQ66zJxt23aqLfYhi/rwSptGOGm8 TI+fqVHCi+dJuBUzcdJVdc+2CUWcEg9Nv+lC2iHKcYuFpCxgwd7GJthPbrkhRGOx9hsk aGqVfSn4eiqL1UDVMD55arqN807H0IOqLtnpWGeF2QxpnsBLbsvG+XOrGgOPXJAY0S4i QpqWCkjv/0AUIiJsmltSpaQwLFtf8CeTZBtd812n84x/ma+/du2k5/8ab2Se/e3M8ivc piViPJ57h07m7bjZkMo8JHP1/dwvQhZWOAc9aY1ZMLkXBf6GCDYi4ZdFX2Y8uRDdEMOB jbmw== 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:mime-version :content-transfer-encoding; bh=6n4eT4d2xr49gsA6vA1SfSGteK1a3KbJ7sv8L2g+0Rg=; b=P+/niXqOJenKOcyvU/tNev2oWQFabrB6rgEnwTj/e9KpT7YUlOopm2WxN2utf4qPUE JFKqIAZ9flMPnXnynX775P+68y5RQeH2IQsug2lB3iVY/MdQip1KjWZS0i08KFJgGnyH YZPdtDG/LjgXsGPRH9+zI6mZDLRofbXZfpDGlxB80jNKdNw31Byqao5ov+cFoII3Cv/Q WbIeEUwbBQfZswVQGoV9PXNraUxMHTyhZLoLv6ywo0RzGHrDruVmk2m0FPmcGy9Dck3n MV13r1TZy2lyFY4F+3G0SLkw8VRm14zTu1sqEH0ytLBhcAZbnDJhU9qT+Hk9eAypsCM/ 1G5g== X-Gm-Message-State: AKaTC016h2m7R4ESrD9i/nfo8CPva1hVmYAefnjQNj71HBn+Y4Qf/aigtIQNoxWfqde3pA== X-Received: by 10.28.184.23 with SMTP id i23mr15273360wmf.66.1479728980199; Mon, 21 Nov 2016 03:49:40 -0800 (PST) Received: from t460p.intel ([2a02:c7d:9bd6:b000:f37e:1e07:a7d8:46cd]) by smtp.gmail.com with ESMTPSA id i15sm24515278wjs.16.2016.11.21.03.49.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 21 Nov 2016 03:49:39 -0800 (PST) From: Tvrtko Ursulin X-Google-Original-From: Tvrtko Ursulin To: Intel-gfx@lists.freedesktop.org Date: Mon, 21 Nov 2016 11:49:29 +0000 Message-Id: <1479728969-5334-1-git-send-email-tvrtko.ursulin@linux.intel.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH] drm/i915: Remove plane config from intel_dump_pipe_config 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: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP From: Tvrtko Ursulin I am told the way it is done is not safe. Signed-off-by: Tvrtko Ursulin Suggested-by: Maarten Lankhorst Cc: Maarten Lankhorst Cc: Ville Syrjälä --- drivers/gpu/drm/i915/intel_display.c | 38 +----------------------------------- 1 file changed, 1 insertion(+), 37 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index b7a7ed82c325..272a1473011c 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -12729,12 +12729,7 @@ static void intel_dump_pipe_config(struct intel_crtc *crtc, struct intel_crtc_state *pipe_config, const char *context) { - struct drm_device *dev = crtc->base.dev; - struct drm_i915_private *dev_priv = to_i915(dev); - struct drm_plane *plane; - struct intel_plane *intel_plane; - struct intel_plane_state *state; - struct drm_framebuffer *fb; + struct drm_i915_private *dev_priv = to_i915(crtc->base.dev); DRM_DEBUG_KMS("[CRTC:%d:%s]%s\n", crtc->base.base.id, crtc->base.name, context); @@ -12822,37 +12817,6 @@ static void intel_dump_pipe_config(struct intel_crtc *crtc, pipe_config->dpll_hw_state.fp0, pipe_config->dpll_hw_state.fp1); } - - DRM_DEBUG_KMS("planes on this crtc\n"); - list_for_each_entry(plane, &dev->mode_config.plane_list, head) { - struct drm_format_name_buf format_name; - intel_plane = to_intel_plane(plane); - if (intel_plane->pipe != crtc->pipe) - continue; - - state = to_intel_plane_state(plane->state); - fb = state->base.fb; - if (!fb) { - DRM_DEBUG_KMS("[PLANE:%d:%s] disabled, scaler_id = %d\n", - plane->base.id, plane->name, state->scaler_id); - continue; - } - - 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)); - 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)); - } } static bool check_digital_port_conflicts(struct drm_atomic_state *state)