From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752247AbbKJMSk (ORCPT ); Tue, 10 Nov 2015 07:18:40 -0500 Received: from mout.kundenserver.de ([212.227.17.10]:56275 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750906AbbKJMSi (ORCPT ); Tue, 10 Nov 2015 07:18:38 -0500 From: Arnd Bergmann To: Christian =?ISO-8859-1?Q?K=F6nig?= , Dave Airlie Cc: Jammy Zhou , Chunming Zhou , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, dri-devel@lists.freedesktop.org Subject: [PATCH] drm/amdgpu: fix seq_printf format string Date: Tue, 10 Nov 2015 13:17:55 +0100 Message-ID: <6655728.oIVJfmhexk@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Provags-ID: V03:K0:GRbBPFoeEdZzq4JDt3DWCdCHOGVnW8IXBb9MtUnKD8GMI2TCahH mtou9+EVsY0kJ81eBILHv2Xzl6ApUslTpKsSN8zEJqBM9VaiuFuTCkyl+8iKVQeVfJ57GXG HmLsB3nTH6CDI7NeRZm2P5glYhEkJu4GNoZaYVO0S9iZnlP0vKRJ5oP1g8nMsHj5RhcfQDy 4BmpDEfxuaEbePNVDvn6Q== X-UI-Out-Filterresults: notjunk:1;V01:K0:VIncryxLRYQ=:XinwSySnFmtHX1+qxBRbZL UKSijZO6Qhartw0IOrFgC4jHyCZLWT3+MI1BeNs5hnhWd3zUtpAmK/7K7i0owwFSWRQEVYIO4 Ouhbu5Gs6DkNDmouXHmrQqO8J2klPXbT5dkcKpVX6JnUhN0QNgapfKbs47SuK2kEqLgCTDG+V Nba7VY0bmuGhs5B4PqS+aEexcBk8d2vxPGE4rCmKMrXuizN/xpu9Q0RmdBJzMyKDNRGz9LLwE 9hFhMO2papf9wIcQvgxUYsV38BZECVZuzbhIQncxL9v/Q4Ztzh2dnkiB3dqVxdvVQXQGjYel3 L8jzgUuO04LV5DP7R9xVWsWbti0NhWIBOOHGUcJp8EYdCvnfLwUjy+Lz95HwDfZXvOSyP4hhb 6NjwUbM6+CM/vb79/YWxuW9J+HGVCz410d3Ry0wJjxUvbX2QQpDo0vvXGzgOEVS0vyGPCt9Av nKc9cnoMJtN32hlljU2VTcvKKWkCfic9rnywbtJk4JMYtlIO9yPgoBYUlksQH5CJNByGNWwAh Z+43i0FLTzm+KgV3iK5A9Z3MCRw+KuvAEUC//PY65OBU3PnVM3Hc5hxr4Oqr8uwSsmCm48527 csvnjz8NY/Wu4qDymhHkb0ZvWHjD1enMKVeg8OoBReE2PBpVyCPAd+9UrdhsSxQZfOjHbgHSD 9gzm+DgWRYKvGfLx0jb4zyxqk6YnzHWtcVRLGnU3AC4CA4DEcMqaj6g9js06KXyezzR1WTV0N G0sAdS57bEubKQeU Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The amdgpu driver has a debugfs interface that shows the amount of VRAM in use, but the newly added code causes a build error on all 32-bit architectures: drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:1076:17: warning: format '%lu' expects argument of type 'long unsigned int', but argument 4 has type 'long long int' [-Wformat=] This fixes the format string to use "%llu" for printing 64-bit numbers, which works everywhere, as long as we also cast to 'u64'. Unlike atomic64_t, u64 is defined as 'unsigned long long' on all architectures. Signed-off-by: Arnd Bergmann Fixes: a2ef8a974931 ("drm/amdgpu: add vram usage into debugfs") --- This appeared a few weeks ago with ARM allmodconfig. I was waiting for someone to complain about the warning on x86 first, but that apparently has not happened. diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c index 81bb8e9fc26d..d4bac5f49939 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c @@ -1073,10 +1073,10 @@ static int amdgpu_mm_dump_table(struct seq_file *m, void *data) ret = drm_mm_dump_table(m, mm); spin_unlock(&glob->lru_lock); if (ttm_pl == TTM_PL_VRAM) - seq_printf(m, "man size:%llu pages, ram usage:%luMB, vis usage:%luMB\n", + seq_printf(m, "man size:%llu pages, ram usage:%lluMB, vis usage:%lluMB\n", adev->mman.bdev.man[ttm_pl].size, - atomic64_read(&adev->vram_usage) >> 20, - atomic64_read(&adev->vram_vis_usage) >> 20); + (u64)atomic64_read(&adev->vram_usage) >> 20, + (u64)atomic64_read(&adev->vram_vis_usage) >> 20); return ret; }