From patchwork Thu Jul 10 21:54:13 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oded Gabbay X-Patchwork-Id: 4528631 Return-Path: X-Original-To: patchwork-dri-devel@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 DBB06BEEAA for ; Thu, 10 Jul 2014 23:34:16 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1C456201F4 for ; Thu, 10 Jul 2014 23:34:16 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 4B687201B4 for ; Thu, 10 Jul 2014 23:34:15 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id AF35E6E7B8; Thu, 10 Jul 2014 16:33:25 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-we0-f175.google.com (mail-we0-f175.google.com [74.125.82.175]) by gabe.freedesktop.org (Postfix) with ESMTP id CC6236E440 for ; Thu, 10 Jul 2014 14:56:32 -0700 (PDT) Received: by mail-we0-f175.google.com with SMTP id k48so194744wev.6 for ; Thu, 10 Jul 2014 14:56:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=FGSh9MQygzwPkmBKfkF1mZVl0e+m0HaeFuP47h5oSmE=; b=QfLXKhAUJfgdWMX8BhluSHJfe9rKhOIDDlNdg3Xr7+D9Mkj5etv9sUkZvBNWN6mFU6 fQPmjFZHGEeEaUaGjFGzmrbsYDshZSy5CDExJO7hqKXNtZjDdGZ50Hkw//PotNYVX4Rj ZGbjz0U4zBJSXd+6bJER/ljJLDPqX5xV8qHaWlD53ecd2ku+SffValh9nEr2BHdggMpo i7mKpA+8dmaV8m87xkeceNMKLnx0R4IDpaDXWspsrHoCDiyM4wDPZALaxvOG91G15Yp9 aU678tUe5FKCvjDioNyitJ3UfA/REktDSoPFFOqtjq9Bb0k5oohXqXVy44aoQjXL8jXN WjAQ== X-Received: by 10.180.82.166 with SMTP id j6mr21985812wiy.71.1405029390249; Thu, 10 Jul 2014 14:56:30 -0700 (PDT) Received: from localhost.localdomain ([77.127.59.49]) by mx.google.com with ESMTPSA id pq9sm831097wjc.35.2014.07.10.14.56.28 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 10 Jul 2014 14:56:29 -0700 (PDT) From: Oded Gabbay X-Google-Original-From: Oded Gabbay To: David Airlie , Alex Deucher , Jerome Glisse Subject: [PATCH 57/83] hsa/radeon: Eliminate warnings in compilation Date: Fri, 11 Jul 2014 00:54:13 +0300 Message-Id: <1405029279-6894-29-git-send-email-oded.gabbay@amd.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1405029279-6894-1-git-send-email-oded.gabbay@amd.com> References: <1405029279-6894-1-git-send-email-oded.gabbay@amd.com> X-Mailman-Approved-At: Thu, 10 Jul 2014 16:33:12 -0700 Cc: Andrew Lewycky , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.15 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-Spam-Status: No, score=-4.0 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RCVD_IN_SORBS_WEB, 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 Signed-off-by: Oded Gabbay --- drivers/gpu/hsa/radeon/kfd_chardev.c | 6 +++--- drivers/gpu/hsa/radeon/kfd_kernel_queue.c | 4 ++-- drivers/gpu/hsa/radeon/kfd_queue.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/hsa/radeon/kfd_chardev.c b/drivers/gpu/hsa/radeon/kfd_chardev.c index 9a77332..80b702e 100644 --- a/drivers/gpu/hsa/radeon/kfd_chardev.c +++ b/drivers/gpu/hsa/radeon/kfd_chardev.c @@ -114,8 +114,8 @@ kfd_open(struct inode *inode, struct file *filep) process->is_32bit_user_mode = is_compat_task(); - dev_info(kfd_device, "process %d opened, compat mode (32 bit) - %d\n", - process->pasid, process->is_32bit_user_mode); + dev_dbg(kfd_device, "process %d opened, compat mode (32 bit) - %d\n", + process->pasid, process->is_32bit_user_mode); kfd_init_apertures(process); @@ -149,7 +149,7 @@ kfd_ioctl_create_queue(struct file *filep, struct kfd_process *p, void __user *a pr_debug("%s Arguments: Queue Percentage (%d, %d)\n" "Queue Priority (%d, %d)\n" "Queue Address (0x%llX, 0x%llX)\n" - "Queue Size (%u64, %ll)\n", + "Queue Size (%llX, %u)\n", __func__, q_properties.queue_percent, args.queue_percentage, q_properties.priority, args.queue_priority, diff --git a/drivers/gpu/hsa/radeon/kfd_kernel_queue.c b/drivers/gpu/hsa/radeon/kfd_kernel_queue.c index aa64693e..25528b3 100644 --- a/drivers/gpu/hsa/radeon/kfd_kernel_queue.c +++ b/drivers/gpu/hsa/radeon/kfd_kernel_queue.c @@ -89,8 +89,8 @@ static bool initialize(struct kernel_queue *kq, struct kfd_dev *dev, prop.type = type; prop.vmid = 0; prop.queue_address = kq->pq_gpu_addr; - prop.read_ptr = kq->rptr_gpu_addr; - prop.write_ptr = kq->wptr_gpu_addr; + prop.read_ptr = (qptr_t *) kq->rptr_gpu_addr; + prop.write_ptr = (qptr_t *) kq->wptr_gpu_addr; if (init_queue(&kq->queue, prop) != 0) goto err_init_queue; diff --git a/drivers/gpu/hsa/radeon/kfd_queue.c b/drivers/gpu/hsa/radeon/kfd_queue.c index 2d22cc1..646b6d1 100644 --- a/drivers/gpu/hsa/radeon/kfd_queue.c +++ b/drivers/gpu/hsa/radeon/kfd_queue.c @@ -67,7 +67,7 @@ void print_queue(struct queue *q) "Queue Doorbell Pointer: 0x%p\n" "Queue Doorbell Offset: %u\n" "Queue MQD Address: 0x%p\n" - "Queue MQD Gart: 0x%p\n" + "Queue MQD Gart: 0x%llX\n" "Queue Process Address: 0x%p\n" "Queue Device Address: 0x%p\n", q->properties.type,