dri-devel Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Oded Gabbay <oded.gabbay@gmail.com>
To: dri-devel@lists.freedesktop.org, alexdeucher@gmail.com
Subject: [PATCH 01/13] drm/radeon: Modify kgd_engine_type enum to match CZ
Date: Fri, 12 Jun 2015 22:31:09 +0300	[thread overview]
Message-ID: <1434137481-13315-2-git-send-email-oded.gabbay@gmail.com> (raw)
In-Reply-To: <1434137481-13315-1-git-send-email-oded.gabbay@gmail.com>

This patch splits the KGD_ENGINE_SDMA to KGD_ENGINE_SDMA1 and
KGD_ENGINE_SDMA2 to match CZ definitions.

Signed-off-by: Oded Gabbay <oded.gabbay@gmail.com>
---
 drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 3 ++-
 drivers/gpu/drm/radeon/radeon_kfd.c             | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/amd/include/kgd_kfd_interface.h b/drivers/gpu/drm/amd/include/kgd_kfd_interface.h
index 9080daa..888250b 100644
--- a/drivers/gpu/drm/amd/include/kgd_kfd_interface.h
+++ b/drivers/gpu/drm/amd/include/kgd_kfd_interface.h
@@ -52,7 +52,8 @@ enum kgd_engine_type {
 	KGD_ENGINE_MEC1,
 	KGD_ENGINE_MEC2,
 	KGD_ENGINE_RLC,
-	KGD_ENGINE_SDMA,
+	KGD_ENGINE_SDMA1,
+	KGD_ENGINE_SDMA2,
 	KGD_ENGINE_MAX
 };
 
diff --git a/drivers/gpu/drm/radeon/radeon_kfd.c b/drivers/gpu/drm/radeon/radeon_kfd.c
index e476c33..9a4d69e 100644
--- a/drivers/gpu/drm/radeon/radeon_kfd.c
+++ b/drivers/gpu/drm/radeon/radeon_kfd.c
@@ -845,7 +845,8 @@ static uint16_t get_fw_version(struct kgd_dev *kgd, enum kgd_engine_type type)
 		hdr = (const union radeon_firmware_header *) rdev->rlc_fw->data;
 		break;
 
-	case KGD_ENGINE_SDMA:
+	case KGD_ENGINE_SDMA1:
+	case KGD_ENGINE_SDMA2:
 		hdr = (const union radeon_firmware_header *)
 							rdev->sdma_fw->data;
 		break;
-- 
2.4.3

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

  reply	other threads:[~2015-06-12 19:31 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-06-12 19:31 [PATCH 00/13] Add Carrizo support for amdkfd Oded Gabbay
2015-06-12 19:31 ` Oded Gabbay [this message]
2015-06-12 19:31 ` [PATCH 02/13] drm/amdgpu: Add H/W agnostic amdgpu <--> amdkfd interface Oded Gabbay
2015-06-12 19:31 ` [PATCH 03/13] drm/amdgpu: add amdgpu <--> amdkfd gfx7 interface Oded Gabbay
2015-06-12 19:31 ` [PATCH 04/13] drm/amdgpu: Add amdgpu <--> amdkfd gfx8 interface Oded Gabbay
2015-06-12 19:31 ` [PATCH 05/13] drm/amdkfd: Add dependency of DRM_AMDGPU to Kconfig Oded Gabbay
2015-06-12 19:31 ` [PATCH 06/13] drm/amdkfd: add supported CZ devices PCI IDs to amdkfd Oded Gabbay
2015-06-12 19:31 ` [PATCH 07/13] drm/amdkfd: add CP HWS packet headers for VI Oded Gabbay
2015-06-12 19:31 ` [PATCH 08/13] drm/amdkfd: add support for VI in MQD manager Oded Gabbay
2015-06-12 19:31 ` [PATCH 09/13] drm/amdkfd: Add support for VI in DQM Oded Gabbay
2015-06-12 19:31 ` [PATCH 10/13] drm/amdkfd: fix runlist length calculation Oded Gabbay
2015-06-12 19:31 ` [PATCH 11/13] drm/amdkfd: Implement create_map_queues() for Carrizo Oded Gabbay
2015-06-12 19:31 ` [PATCH 12/13] drm/amdkfd: Use generic defines in new amd headers Oded Gabbay
2015-06-12 19:31 ` [PATCH 13/13] drm/amdkfd: Set correct doorbell packet type for Carrizo 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=1434137481-13315-2-git-send-email-oded.gabbay@gmail.com \
    --to=oded.gabbay@gmail.com \
    --cc=alexdeucher@gmail.com \
    --cc=dri-devel@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox