All of lore.kernel.org
 help / color / mirror / Atom feed
From: Oded Gabbay <oded.gabbay@amd.com>
To: dri-devel@lists.freedesktop.org
Cc: linux-kernel@vger.kernel.org, Alexander.Deucher@amd.com
Subject: [PATCH 1/3] amdkfd: Don't clear *kfd2kgd on kfd_module_init
Date: Sat, 20 Dec 2014 22:46:12 +0200	[thread overview]
Message-ID: <1419108374-7020-2-git-send-email-oded.gabbay@amd.com> (raw)
In-Reply-To: <1419108374-7020-1-git-send-email-oded.gabbay@amd.com>

When amdkfd and radeon are compiled inside the kernel image (not as modules),
radeon will load before amdkfd and will set *kfd2kgd to its interface
structure. Therefore, we must not set *kfd2kgd to NULL when amdkfd is loaded
because it will override radeon's initialization and cause kernel BUG.

Signed-off-by: Oded Gabbay <oded.gabbay@amd.com>
---
 drivers/gpu/drm/amd/amdkfd/kfd_module.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_module.c b/drivers/gpu/drm/amd/amdkfd/kfd_module.c
index 95d5af1..236562f 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_module.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_module.c
@@ -34,7 +34,7 @@
 #define KFD_DRIVER_MINOR	7
 #define KFD_DRIVER_PATCHLEVEL	0
 
-const struct kfd2kgd_calls *kfd2kgd;
+const struct kfd2kgd_calls *kfd2kgd = NULL;
 static const struct kgd2kfd_calls kgd2kfd = {
 	.exit		= kgd2kfd_exit,
 	.probe		= kgd2kfd_probe,
@@ -84,14 +84,13 @@ EXPORT_SYMBOL(kgd2kfd_init);
 
 void kgd2kfd_exit(void)
 {
+	kfd2kgd = NULL;
 }
 
 static int __init kfd_module_init(void)
 {
 	int err;
 
-	kfd2kgd = NULL;
-
 	/* Verify module parameters */
 	if ((sched_policy < KFD_SCHED_POLICY_HWS) ||
 		(sched_policy > KFD_SCHED_POLICY_NO_HWS)) {
-- 
2.1.0

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

WARNING: multiple messages have this Message-ID (diff)
From: Oded Gabbay <oded.gabbay@amd.com>
To: <dri-devel@lists.freedesktop.org>
Cc: David Airlie <airlied@linux.ie>,
	Jerome Glisse <j.glisse@gmail.com>,
	Joerg Roedel <joro@8bytes.org>, <linux-kernel@vger.kernel.org>,
	"John Bridgman" <John.Bridgman@amd.com>,
	<Alexander.Deucher@amd.com>
Subject: [PATCH 1/3] amdkfd: Don't clear *kfd2kgd on kfd_module_init
Date: Sat, 20 Dec 2014 22:46:12 +0200	[thread overview]
Message-ID: <1419108374-7020-2-git-send-email-oded.gabbay@amd.com> (raw)
In-Reply-To: <1419108374-7020-1-git-send-email-oded.gabbay@amd.com>

When amdkfd and radeon are compiled inside the kernel image (not as modules),
radeon will load before amdkfd and will set *kfd2kgd to its interface
structure. Therefore, we must not set *kfd2kgd to NULL when amdkfd is loaded
because it will override radeon's initialization and cause kernel BUG.

Signed-off-by: Oded Gabbay <oded.gabbay@amd.com>
---
 drivers/gpu/drm/amd/amdkfd/kfd_module.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_module.c b/drivers/gpu/drm/amd/amdkfd/kfd_module.c
index 95d5af1..236562f 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_module.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_module.c
@@ -34,7 +34,7 @@
 #define KFD_DRIVER_MINOR	7
 #define KFD_DRIVER_PATCHLEVEL	0
 
-const struct kfd2kgd_calls *kfd2kgd;
+const struct kfd2kgd_calls *kfd2kgd = NULL;
 static const struct kgd2kfd_calls kgd2kfd = {
 	.exit		= kgd2kfd_exit,
 	.probe		= kgd2kfd_probe,
@@ -84,14 +84,13 @@ EXPORT_SYMBOL(kgd2kfd_init);
 
 void kgd2kfd_exit(void)
 {
+	kfd2kgd = NULL;
 }
 
 static int __init kfd_module_init(void)
 {
 	int err;
 
-	kfd2kgd = NULL;
-
 	/* Verify module parameters */
 	if ((sched_policy < KFD_SCHED_POLICY_HWS) ||
 		(sched_policy > KFD_SCHED_POLICY_NO_HWS)) {
-- 
2.1.0


  reply	other threads:[~2014-12-20 20:46 UTC|newest]

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-12-20 20:46 [PATCH 0/3] Use workqueue for device init in amdkfd Oded Gabbay
2014-12-20 20:46 ` Oded Gabbay
2014-12-20 20:46 ` Oded Gabbay [this message]
2014-12-20 20:46   ` [PATCH 1/3] amdkfd: Don't clear *kfd2kgd on kfd_module_init Oded Gabbay
2014-12-20 21:25   ` Greg KH
2014-12-20 21:25     ` Greg KH
2014-12-21 11:12     ` Oded Gabbay
2014-12-21 11:12       ` Oded Gabbay
2014-12-21 11:27   ` Christian König
2014-12-21 11:27     ` Christian König
2014-12-21 11:34     ` Oded Gabbay
2014-12-21 11:34       ` Oded Gabbay
2014-12-21 12:19       ` Christian König
2014-12-21 12:19         ` Christian König
2014-12-21 13:06         ` Oded Gabbay
2014-12-21 13:06           ` Oded Gabbay
2014-12-21 13:24           ` Oded Gabbay
2014-12-21 13:24             ` Oded Gabbay
2014-12-21 15:57             ` Christian König
2014-12-21 15:57               ` Christian König
2014-12-21 16:03               ` Oded Gabbay
2014-12-21 16:03                 ` Oded Gabbay
2014-12-21 16:10                 ` Christian König
2014-12-21 16:10                   ` Christian König
2014-12-22  7:34                   ` Oded Gabbay
2014-12-22  7:34                     ` Oded Gabbay
2014-12-22  7:40                     ` Dave Airlie
2014-12-22  7:40                       ` Dave Airlie
2014-12-22  7:43                       ` Oded Gabbay
2014-12-22  7:43                         ` Oded Gabbay
2014-12-22  8:57                         ` Christian König
2014-12-22  8:57                           ` Christian König
2014-12-22  9:26                           ` Oded Gabbay
2014-12-22  9:26                             ` Oded Gabbay
2014-12-22 10:22                             ` Oded Gabbay
2014-12-22 10:22                               ` Oded Gabbay
2014-12-20 20:46 ` [PATCH 2/3] amdkfd: Track when amdkfd init is complete Oded Gabbay
2014-12-20 20:46   ` Oded Gabbay
2014-12-20 20:46 ` [PATCH 3/3] amdkfd: Use workqueue for GPU init Oded Gabbay
2014-12-20 20:46   ` Oded Gabbay

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=1419108374-7020-2-git-send-email-oded.gabbay@amd.com \
    --to=oded.gabbay@amd.com \
    --cc=Alexander.Deucher@amd.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=linux-kernel@vger.kernel.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.