From patchwork Thu Jul 10 21:54:14 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oded Gabbay X-Patchwork-Id: 4528391 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 BDAB5BEECB for ; Thu, 10 Jul 2014 23:33:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C4904201B4 for ; Thu, 10 Jul 2014 23:33:48 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id BF916201DE for ; Thu, 10 Jul 2014 23:33:47 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id F1FB16E795; Thu, 10 Jul 2014 16:33:22 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wi0-f175.google.com (mail-wi0-f175.google.com [209.85.212.175]) by gabe.freedesktop.org (Postfix) with ESMTP id 9BD396E440 for ; Thu, 10 Jul 2014 14:56:34 -0700 (PDT) Received: by mail-wi0-f175.google.com with SMTP id ho1so5334784wib.2 for ; Thu, 10 Jul 2014 14:56:32 -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=DhTRxhEsRRO8LgKjbn81ePB1OMK5AGxxKxhdsJ935DE=; b=jVIrAgomXHoJSbkNP+vIx4R9sZoNv8wbnHXYk8FVkQDJW63I2tTETGC17193HlcTtu lgh843aBzapG/vzbt7mzjunI1OtrzwQ1GzloUG6O3TsGHiomRUQ2PUC7xV8g2s1vS3bk WukGKcbkRfvPP5M0anxz32nUkuyk7z9tGJ5XXqZIJkxORB+ARL6nQyFj3KoWw8pZ453x eCTpVpSByx0y4ZwIL9WnYKrvqYtD9VogIU1+CM86AgjyJuyQDPxOjMvWue+ENZuEX1Cv TQzZFV1pjCDwi/WWP7GGB00LsTcZ0zyHCO8kLekp3HhL75s/wr68oMvCR+M3wA7EBW1z gLdw== X-Received: by 10.180.211.71 with SMTP id na7mr22199209wic.55.1405029392704; Thu, 10 Jul 2014 14:56:32 -0700 (PDT) Received: from localhost.localdomain ([77.127.59.49]) by mx.google.com with ESMTPSA id pq9sm831097wjc.35.2014.07.10.14.56.30 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 10 Jul 2014 14:56:32 -0700 (PDT) From: Oded Gabbay X-Google-Original-From: Oded Gabbay To: David Airlie , Alex Deucher , Jerome Glisse Subject: [PATCH 58/83] hsa/radeon: Various kernel styling fixes Date: Fri, 11 Jul 2014 00:54:14 +0300 Message-Id: <1405029279-6894-30-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_device_queue_manager.h | 6 +++--- drivers/gpu/hsa/radeon/kfd_hw_pointer_store.h | 6 +++--- drivers/gpu/hsa/radeon/kfd_kernel_queue.h | 6 +++--- drivers/gpu/hsa/radeon/kfd_module.c | 8 ++++---- drivers/gpu/hsa/radeon/kfd_mqd_manager.h | 6 +++--- drivers/gpu/hsa/radeon/kfd_pm4_headers.h | 11 ++++++----- drivers/gpu/hsa/radeon/kfd_pm4_opcodes.h | 6 +++--- 7 files changed, 25 insertions(+), 24 deletions(-) diff --git a/drivers/gpu/hsa/radeon/kfd_device_queue_manager.h b/drivers/gpu/hsa/radeon/kfd_device_queue_manager.h index fe9ef10..57dc636 100644 --- a/drivers/gpu/hsa/radeon/kfd_device_queue_manager.h +++ b/drivers/gpu/hsa/radeon/kfd_device_queue_manager.h @@ -21,8 +21,8 @@ * */ -#ifndef DEVICE_QUEUE_MANAGER_H_ -#define DEVICE_QUEUE_MANAGER_H_ +#ifndef KFD_DEVICE_QUEUE_MANAGER_H_ +#define KFD_DEVICE_QUEUE_MANAGER_H_ #include #include @@ -98,4 +98,4 @@ struct device_queue_manager { -#endif /* DEVICE_QUEUE_MANAGER_H_ */ +#endif /* KFD_DEVICE_QUEUE_MANAGER_H_ */ diff --git a/drivers/gpu/hsa/radeon/kfd_hw_pointer_store.h b/drivers/gpu/hsa/radeon/kfd_hw_pointer_store.h index f384b7f..642703f 100644 --- a/drivers/gpu/hsa/radeon/kfd_hw_pointer_store.h +++ b/drivers/gpu/hsa/radeon/kfd_hw_pointer_store.h @@ -21,8 +21,8 @@ * */ -#ifndef HW_POINTER_STORE_H_ -#define HW_POINTER_STORE_H_ +#ifndef KFD_HW_POINTER_STORE_H_ +#define KFD_HW_POINTER_STORE_H_ #include @@ -61,4 +61,4 @@ radeon_kfd_hw_pointer_store_mmap(struct hw_pointer_store_properties *ptr, struct vm_area_struct *vma); -#endif /* HW_POINTER_STORE_H_ */ +#endif /* KFD_HW_POINTER_STORE_H_ */ diff --git a/drivers/gpu/hsa/radeon/kfd_kernel_queue.h b/drivers/gpu/hsa/radeon/kfd_kernel_queue.h index 963e861..abfb9c8 100644 --- a/drivers/gpu/hsa/radeon/kfd_kernel_queue.h +++ b/drivers/gpu/hsa/radeon/kfd_kernel_queue.h @@ -21,8 +21,8 @@ * */ -#ifndef KERNEL_QUEUE_H_ -#define KERNEL_QUEUE_H_ +#ifndef KFD_KERNEL_QUEUE_H_ +#define KFD_KERNEL_QUEUE_H_ #include #include @@ -63,4 +63,4 @@ struct kernel_queue { struct list_head list; }; -#endif /* KERNEL_QUEUE_H_ */ +#endif /* KFD_KERNEL_QUEUE_H_ */ diff --git a/drivers/gpu/hsa/radeon/kfd_module.c b/drivers/gpu/hsa/radeon/kfd_module.c index e8bb67c..85069c5 100644 --- a/drivers/gpu/hsa/radeon/kfd_module.c +++ b/drivers/gpu/hsa/radeon/kfd_module.c @@ -24,7 +24,7 @@ #include #include #include - +#include #include "kfd_priv.h" #define DRIVER_AUTHOR "Andrew Lewycky, Oded Gabbay, Evgeny Pinchuk, others." @@ -46,7 +46,7 @@ static const struct kgd2kfd_calls kgd2kfd = { int sched_policy = KFD_SCHED_POLICY_HWS_NO_OVERSUBSCRIPTION; module_param(sched_policy, int, S_IRUSR | S_IWUSR); -MODULE_PARM_DESC(sched_policy, "Kernel comline parameter define the kfd scheduling policy"); +MODULE_PARM_DESC(sched_policy, "Kernel cmdline parameter define the kfd scheduling policy"); bool kgd2kfd_init(unsigned interface_version, const struct kfd2kgd_calls *f2g, @@ -95,7 +95,7 @@ static int __init kfd_module_init(void) if (err < 0) goto err_topology; - pr_info("[hsa] Initialized kfd module"); + dev_info(kfd_device, "Initialized module\n"); return 0; err_topology: @@ -114,7 +114,7 @@ static void __exit kfd_module_exit(void) mmput_unregister_notifier(&kfd_mmput_nb); radeon_kfd_chardev_exit(); radeon_kfd_pasid_exit(); - pr_info("[hsa] Removed kfd module"); + dev_info(kfd_device, "Removed module\n"); } module_init(kfd_module_init); diff --git a/drivers/gpu/hsa/radeon/kfd_mqd_manager.h b/drivers/gpu/hsa/radeon/kfd_mqd_manager.h index 8e7a5fd..314d490 100644 --- a/drivers/gpu/hsa/radeon/kfd_mqd_manager.h +++ b/drivers/gpu/hsa/radeon/kfd_mqd_manager.h @@ -21,8 +21,8 @@ * */ -#ifndef MQD_MANAGER_H_ -#define MQD_MANAGER_H_ +#ifndef KFD_MQD_MANAGER_H_ +#define KFD_MQD_MANAGER_H_ #include "kfd_priv.h" @@ -44,4 +44,4 @@ struct mqd_manager { }; -#endif /* MQD_MANAGER_H_ */ +#endif /* KFD_MQD_MANAGER_H_ */ diff --git a/drivers/gpu/hsa/radeon/kfd_pm4_headers.h b/drivers/gpu/hsa/radeon/kfd_pm4_headers.h index dae460f..3ffb3f4 100644 --- a/drivers/gpu/hsa/radeon/kfd_pm4_headers.h +++ b/drivers/gpu/hsa/radeon/kfd_pm4_headers.h @@ -21,8 +21,8 @@ * */ -#ifndef F32_MES_PM4_PACKETS_72_H -#define F32_MES_PM4_PACKETS_72_H +#ifndef KFD_PM4_HEADERS_H_ +#define KFD_PM4_HEADERS_H_ #ifndef PM4_HEADER_DEFINED #define PM4_HEADER_DEFINED @@ -657,7 +657,7 @@ typedef struct _PM4__SET_SH_REG { #ifndef _PM4__SET_CONFIG_REG_DEFINED #define _PM4__SET_CONFIG_REG_DEFINED -typedef struct _PM4__SET_CONFIG_REG { +struct pm4__set_config_reg { union { PM4_TYPE_3_HEADER header; unsigned int ordinal1; @@ -676,6 +676,7 @@ typedef struct _PM4__SET_CONFIG_REG { unsigned int reg_data[1]; /* 1..N of these fields */ -} PM4_SET_CONFIG_REG, *PPM4_SET_CONFIG_REG; -#endif +}; #endif + +#endif /* KFD_PM4_HEADERS_H_ */ diff --git a/drivers/gpu/hsa/radeon/kfd_pm4_opcodes.h b/drivers/gpu/hsa/radeon/kfd_pm4_opcodes.h index c04060c..b72fa3b 100644 --- a/drivers/gpu/hsa/radeon/kfd_pm4_opcodes.h +++ b/drivers/gpu/hsa/radeon/kfd_pm4_opcodes.h @@ -22,8 +22,8 @@ */ -#ifndef PM4_IT_OPCODES_H -#define PM4_IT_OPCODES_H +#ifndef KFD_PM4_OPCODES_H +#define KFD_PM4_OPCODES_H enum it_opcode_type { IT_NOP = 0x10, @@ -103,5 +103,5 @@ enum it_opcode_type { #define PM4_TYPE_2 2 #define PM4_TYPE_3 3 -#endif /* PM4_IT_OPCODES_H */ +#endif /* KFD_PM4_OPCODES_H */