From patchwork Thu Jul 24 17:58:06 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Matwey V. Kornilov" X-Patchwork-Id: 4619281 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 71079C0514 for ; Thu, 24 Jul 2014 17:58:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 97CE32011E for ; Thu, 24 Jul 2014 17:58:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A9C46201D3 for ; Thu, 24 Jul 2014 17:58:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759628AbaGXR6Y (ORCPT ); Thu, 24 Jul 2014 13:58:24 -0400 Received: from mail-lb0-f181.google.com ([209.85.217.181]:58781 "EHLO mail-lb0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759622AbaGXR6X (ORCPT ); Thu, 24 Jul 2014 13:58:23 -0400 Received: by mail-lb0-f181.google.com with SMTP id 10so2504049lbg.40 for ; Thu, 24 Jul 2014 10:58:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id; bh=zptrD7Xs1x+hSxzCHmE61t2LiGtcXPfGQGr7k5+PymI=; b=rvZBepYTHS7RqHGbvMOZ1cYgfSOOK0MaOjI1iJCPlATprSI1GW2+Qk5I8ExEeT2Rvz x8BYn8dvR6Tlx9gzIXfqf26EFChudwqie+/x9V7OZVZ39U5qgoR3/S+1aRLhRLONZkMA 8p7YF7CFxLIzsKjY6W6maOxG/QCspymZDr9pRdlfaJI+7TvnyB01Ln9tdIsfnTmZ22cU k+lNh1vG4YKJniIBlk8eHKAVf6Lk1x/tf1OtrHZiYNjNgZ6DD6QuTHZl65BWJ2S2Ds2c 1aFCi6z33iNIGBXjl+g0JO5ZBhVpmbBlyeJMmXORWB6bg0zyNHpZjn461PN4UQzRASdP dyMw== X-Received: by 10.152.44.129 with SMTP id e1mr11281143lam.91.1406224701371; Thu, 24 Jul 2014 10:58:21 -0700 (PDT) Received: from epsilon.local.ru ([37.29.115.164]) by mx.google.com with ESMTPSA id ol5sm11660658lbb.16.2014.07.24.10.58.20 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 24 Jul 2014 10:58:20 -0700 (PDT) From: matwey@sai.msu.ru To: airlied@linux.ie Cc: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-omap@vger.kernel.org, matwey.kornilov@gmail.com, "Matwey V. Kornilov" Subject: [PATCH] gpu: drm: omapdrm: Use %pad format for values of the dma_addr_t type Date: Thu, 24 Jul 2014 21:58:06 +0400 Message-Id: <1406224686-4857-1-git-send-email-matwey@sai.msu.ru> X-Mailer: git-send-email 1.8.1.4 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: "Matwey V. Kornilov" The format change is to fix the following compilation issue: ../drivers/gpu/drm/omapdrm/omap_plane.c: In function 'omap_plane_pre_apply': ../drivers/gpu/drm/omapdrm/omap_plane.c:145:2: error: format '%x' expects argument of type 'unsigned int', but argument 5 has type 'dma_addr_t' [-Werror=format=] DBG("%d,%d %08x %08x", info->pos_x, info->pos_y, ^ ../drivers/gpu/drm/omapdrm/omap_plane.c:145:2: error: format '%x' expects argument of type 'unsigned int', but argument 6 has type 'dma_addr_t' [-Werror=format=] cc1: all warnings being treated as errors ../scripts/Makefile.build:273: recipe for target 'drivers/gpu/drm/omapdrm/omap_plane.o' failed Signed-off-by: Matwey V. Kornilov --- drivers/gpu/drm/omapdrm/omap_gem.c | 10 +++++----- drivers/gpu/drm/omapdrm/omap_plane.c | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/omapdrm/omap_gem.c b/drivers/gpu/drm/omapdrm/omap_gem.c index 95dbce2..44305c6 100644 --- a/drivers/gpu/drm/omapdrm/omap_gem.c +++ b/drivers/gpu/drm/omapdrm/omap_gem.c @@ -791,7 +791,7 @@ int omap_gem_get_paddr(struct drm_gem_object *obj, omap_obj->paddr = tiler_ssptr(block); omap_obj->block = block; - DBG("got paddr: %08x", omap_obj->paddr); + DBG("got paddr: %pad", &(omap_obj->paddr)); } omap_obj->paddr_cnt++; @@ -985,9 +985,9 @@ void omap_gem_describe(struct drm_gem_object *obj, struct seq_file *m) off = drm_vma_node_start(&obj->vma_node); - seq_printf(m, "%08x: %2d (%2d) %08llx %08Zx (%2d) %p %4d", + seq_printf(m, "%08x: %2d (%2d) %08llx %pad (%2d) %p %4d", omap_obj->flags, obj->name, obj->refcount.refcount.counter, - off, omap_obj->paddr, omap_obj->paddr_cnt, + off, &(omap_obj->paddr), omap_obj->paddr_cnt, omap_obj->vaddr, omap_obj->roll); if (omap_obj->flags & OMAP_BO_TILED) { @@ -1467,8 +1467,8 @@ void omap_gem_init(struct drm_device *dev) entry->paddr = tiler_ssptr(block); entry->block = block; - DBG("%d:%d: %dx%d: paddr=%08x stride=%d", i, j, w, h, - entry->paddr, + DBG("%d:%d: %dx%d: paddr=%pad stride=%d", i, j, w, h, + &(entry->paddr), usergart[i].stride_pfn << PAGE_SHIFT); } } diff --git a/drivers/gpu/drm/omapdrm/omap_plane.c b/drivers/gpu/drm/omapdrm/omap_plane.c index 3cf31ee..aaa9a2c 100644 --- a/drivers/gpu/drm/omapdrm/omap_plane.c +++ b/drivers/gpu/drm/omapdrm/omap_plane.c @@ -142,8 +142,8 @@ static void omap_plane_pre_apply(struct omap_drm_apply *apply) DBG("%dx%d -> %dx%d (%d)", info->width, info->height, info->out_width, info->out_height, info->screen_width); - DBG("%d,%d %08x %08x", info->pos_x, info->pos_y, - info->paddr, info->p_uv_addr); + DBG("%d,%d %pad %pad", info->pos_x, info->pos_y, + &(info->paddr), &(info->p_uv_addr)); /* TODO: */ ilace = false;