All of lore.kernel.org
 help / color / mirror / Atom feed
From: Daniel Vetter <daniel.vetter@ffwll.ch>
To: DRI Development <dri-devel@lists.freedesktop.org>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>,
	Intel Graphics Development <intel-gfx@lists.freedesktop.org>
Subject: [PATCH 01/10] drm/amd-kfd: Clean up inline handling
Date: Tue, 21 Jun 2016 11:10:26 +0200	[thread overview]
Message-ID: <1466500235-21282-2-git-send-email-daniel.vetter@ffwll.ch> (raw)
In-Reply-To: <1466500235-21282-1-git-send-email-daniel.vetter@ffwll.ch>

- inline functions need to be static inline, otherwise gcc can opt to
  not inline and the linker gets unhappy.
- no forward decls for inline functions, just include the right headers.

Cc: Oded Gabbay <oded.gabbay@gmail.com>
Cc: Ben Goz <ben.goz@amd.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---
 drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h | 4 ++--
 drivers/gpu/drm/amd/amdkfd/kfd_priv.h                 | 3 ---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h
index ec4036a09f3e..a625b9137da2 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h
@@ -187,12 +187,12 @@ int init_pipelines(struct device_queue_manager *dqm,
 unsigned int get_first_pipe(struct device_queue_manager *dqm);
 unsigned int get_pipes_num(struct device_queue_manager *dqm);
 
-extern inline unsigned int get_sh_mem_bases_32(struct kfd_process_device *pdd)
+static inline unsigned int get_sh_mem_bases_32(struct kfd_process_device *pdd)
 {
 	return (pdd->lds_base >> 16) & 0xFF;
 }
 
-extern inline unsigned int
+static inline unsigned int
 get_sh_mem_bases_nybble_64(struct kfd_process_device *pdd)
 {
 	return (pdd->lds_base >> 60) & 0x0E;
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
index d0d5f4baf72d..80113c335966 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
@@ -617,10 +617,7 @@ int kgd2kfd_resume(struct kfd_dev *kfd);
 int kfd_init_apertures(struct kfd_process *process);
 
 /* Queue Context Management */
-inline uint32_t lower_32(uint64_t x);
-inline uint32_t upper_32(uint64_t x);
 struct cik_sdma_rlc_registers *get_sdma_mqd(void *mqd);
-inline uint32_t get_sdma_base_addr(struct cik_sdma_rlc_registers *m);
 
 int init_queue(struct queue **q, struct queue_properties properties);
 void uninit_queue(struct queue *q);
-- 
2.8.1

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

  reply	other threads:[~2016-06-21  9:10 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-21  9:10 [PATCH 00/10] RFC: hot-unplug safe connector list locking Daniel Vetter
2016-06-21  9:10 ` Daniel Vetter [this message]
2016-06-21 19:11   ` [PATCH 01/10] drm/amd-kfd: Clean up inline handling Oded Gabbay
2016-06-21 19:22     ` Daniel Vetter
2016-06-22  7:35     ` Daniel Vetter
2016-06-21  9:10 ` [PATCH 02/10] drm: Don't compute obj counts expensively in get_resources Daniel Vetter
2016-06-21  9:48   ` Chris Wilson
2016-06-21 12:21     ` Daniel Vetter
2016-06-21 12:29   ` [PATCH] " Daniel Vetter
2016-06-21 12:40     ` Chris Wilson
2016-06-21  9:10 ` [PATCH 03/10] drm: Add explicit iter struct to drm_for_each_connector Daniel Vetter
2016-06-21  9:10 ` [PATCH 04/10] drm/i915: Use use the drm_for_each_connector in i915_debugfs.c Daniel Vetter
2016-06-21  9:10 ` [PATCH 05/10] drm/i915: Roll out drm_for_each_connector in intel_hotplug.c Daniel Vetter
2016-06-21  9:10 ` [PATCH 06/10] drm: Drop cargo-culted modeset_lock_all from encoder/plane init/cleanup Daniel Vetter
2016-06-21  9:10 ` [PATCH 07/10] drm: Revamp connector_list protection Daniel Vetter
2016-06-22  9:09   ` Daniel Vetter
2016-06-21  9:10 ` [PATCH 08/10] drm: Drop mode_config.mutex from connector_register_all Daniel Vetter
2016-06-21  9:10 ` [PATCH 09/10] drm: Drop mode_config.mutex from get_resources ioctl Daniel Vetter
2016-06-21  9:44   ` Chris Wilson
2016-06-21 12:41     ` [PATCH] " Daniel Vetter
2016-06-21  9:10 ` [PATCH 10/10] drm: Drop mode_config.mutex from _reset() Daniel Vetter
2016-06-21 10:28 ` ✗ Ro.CI.BAT: warning for RFC: hot-unplug safe connector list locking Patchwork

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1466500235-21282-2-git-send-email-daniel.vetter@ffwll.ch \
    --to=daniel.vetter@ffwll.ch \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=intel-gfx@lists.freedesktop.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.