From patchwork Fri Dec 30 16:33:38 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 9492323 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 8B3DC60417 for ; Fri, 30 Dec 2016 16:33:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6D3291FF15 for ; Fri, 30 Dec 2016 16:33:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5CE1122638; Fri, 30 Dec 2016 16:33:56 +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 7C1551FF15 for ; Fri, 30 Dec 2016 16:33:55 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6CC4E6E290; Fri, 30 Dec 2016 16:33:48 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@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 028956E227 for ; Fri, 30 Dec 2016 16:33:46 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id m203so71569082wma.3 for ; Fri, 30 Dec 2016 08:33:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id; bh=dbdxpTpI+xKVSKotr12iuh3ZQXP6RqSnfeXyZFhxZhs=; b=IyCQScgqLSSE4l/mLS3aN5pe2nTM9ompEcGRIHHlDOvHNGR20qLMKGYP0zTAXRzNLa quxhNf8WCV1wlTvPcTSTNeq33NjL3KzFL+oo8ZNUc8zR+iIHCkHbc+h+hCJAs03bFtjL hintAADW1hGRWngIMDqtvXrOArO0D8s5VkJ7I= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=dbdxpTpI+xKVSKotr12iuh3ZQXP6RqSnfeXyZFhxZhs=; b=ROj23T0Cr7lgHtEBg83KVc6mWc8IltRs+oV9REiIAAK9SsqPWPB8YEpbKOLE9BcqBq nfZA7QQcjx0vgA3PQlzHYzwWINeNcoW6Tsb50gF20mLSH9cZqbLwMAbrMcIteEtcDxj4 T0Tdmgzxh5QTWTBl4awKvtUOf8gVe+gkUORM5Tw9bHTX78+oANs1YRQqR8qPwYyf5++Y 8ZXH3bAzqRnjeNjDzbVHVtFys9/DM3zqOJGmez9HCTjXuFwJ958nqOakxtjakhbD7dcr 10Lo52XeYCjiSEaBKzIvwEe69y03jyUw8SGAz9bqQZQV5qSGN0UsFzlM7OETHBvGnSh6 SV+g== X-Gm-Message-State: AIkVDXJlEVKJflGQhrtSYkny/2m+Wa0WToKcO3KJ7zpsIVBGSv2WR/3eg502zz3PqHJNCg== X-Received: by 10.28.227.9 with SMTP id a9mr43578560wmh.85.1483115624017; Fri, 30 Dec 2016 08:33:44 -0800 (PST) Received: from dvetter-linux.ger.corp.intel.com ([194.230.155.242]) by smtp.gmail.com with ESMTPSA id z6sm74119399wjt.24.2016.12.30.08.33.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 30 Dec 2016 08:33:43 -0800 (PST) From: Daniel Vetter To: DRI Development Subject: [PATCH] drm/armada: Fix compile fail Date: Fri, 30 Dec 2016 17:33:38 +0100 Message-Id: <1483115618-18734-1-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.7.4 Cc: Daniel Vetter , Daniel Vetter , Russell King X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP I reported the include issue for tracepoints a while ago, but nothing seems to have happened. Now it bit us, since the drm_mm_print conversion was broken for armada. Fix them both. Reported-by: kbuild test robot Fixes: b5c3714fe878 ("drm/mm: Convert to drm_printer") Cc: Russell King Cc: Chris Wilson Signed-off-by: Daniel Vetter --- drivers/gpu/drm/armada/Makefile | 2 ++ drivers/gpu/drm/armada/armada_debugfs.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/armada/Makefile b/drivers/gpu/drm/armada/Makefile index a18f156c8b66..64c0b4546fb2 100644 --- a/drivers/gpu/drm/armada/Makefile +++ b/drivers/gpu/drm/armada/Makefile @@ -4,3 +4,5 @@ armada-y += armada_510.o armada-$(CONFIG_DEBUG_FS) += armada_debugfs.o obj-$(CONFIG_DRM_ARMADA) := armada.o + +CFLAGS_armada_trace.o := -I$(src) diff --git a/drivers/gpu/drm/armada/armada_debugfs.c b/drivers/gpu/drm/armada/armada_debugfs.c index 0c7b915be082..a8020cf9da2e 100644 --- a/drivers/gpu/drm/armada/armada_debugfs.c +++ b/drivers/gpu/drm/armada/armada_debugfs.c @@ -22,7 +22,7 @@ static int armada_debugfs_gem_linear_show(struct seq_file *m, void *data) struct drm_printer p = drm_seq_file_printer(m); mutex_lock(&priv->linear_lock); - drm_mm_dump_table(&p, &priv->linear); + drm_mm_print(&priv->linear, &p); mutex_unlock(&priv->linear_lock); return 0;