* [PATCH 1/2] drm/amdgpu: Add SI Family information
@ 2016-05-25 21:12 Alex Deucher
2016-05-25 21:12 ` [PATCH 2/2] drm/amdgpu/gfx6: Assign num_rbs Alex Deucher
0 siblings, 1 reply; 2+ messages in thread
From: Alex Deucher @ 2016-05-25 21:12 UTC (permalink / raw)
To: dri-devel; +Cc: Alex Deucher, Ken Wang
From: Ken Wang <Qingqing.Wang@amd.com>
Signed-off-by: Ken Wang <Qingqing.Wang@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 1 +
include/uapi/drm/amdgpu_drm.h | 1 +
2 files changed, 2 insertions(+)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index d269740..274473d 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -1169,6 +1169,7 @@ static int amdgpu_early_init(struct amdgpu_device *adev)
case CHIP_PITCAIRN:
case CHIP_OLAND:
case CHIP_HAINAN:
+ adev->family = AMDGPU_FAMILY_SI;
r = si_set_ip_blocks(adev);
if (r)
return r;
diff --git a/include/uapi/drm/amdgpu_drm.h b/include/uapi/drm/amdgpu_drm.h
index 453a76a..b473b53 100644
--- a/include/uapi/drm/amdgpu_drm.h
+++ b/include/uapi/drm/amdgpu_drm.h
@@ -637,6 +637,7 @@ struct drm_amdgpu_info_hw_ip {
* Supported GPU families
*/
#define AMDGPU_FAMILY_UNKNOWN 0
+#define AMDGPU_FAMILY_SI 110 /* Hainan, Oland, Verde, Pitcairn, Tahiti */
#define AMDGPU_FAMILY_CI 120 /* Bonaire, Hawaii */
#define AMDGPU_FAMILY_KV 125 /* Kaveri, Kabini, Mullins */
#define AMDGPU_FAMILY_VI 130 /* Iceland, Tonga */
--
2.5.5
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH 2/2] drm/amdgpu/gfx6: Assign num_rbs
2016-05-25 21:12 [PATCH 1/2] drm/amdgpu: Add SI Family information Alex Deucher
@ 2016-05-25 21:12 ` Alex Deucher
0 siblings, 0 replies; 2+ messages in thread
From: Alex Deucher @ 2016-05-25 21:12 UTC (permalink / raw)
To: dri-devel; +Cc: Alex Deucher, Ken Wang
From: Ken Wang <Qingqing.Wang@amd.com>
This got missed in the rebase as the code changed.
Signed-off-by: Ken Wang <Qingqing.Wang@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c
index 561d67a..8b9f432 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c
@@ -944,6 +944,7 @@ static void gfx_v6_0_setup_rb(struct amdgpu_device *adev,
adev->gfx.config.backend_enable_mask = enabled_rbs;
DRM_INFO("amdgpu: enabled_rbs %d \n", enabled_rbs);
+ adev->gfx.config.num_rbs = hweight32(enabled_rbs);
for (i = 0; i < se_num; i++) {
gfx_v6_0_select_se_sh(adev, i, 0xffffffff);
--
2.5.5
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-05-25 21:13 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-05-25 21:12 [PATCH 1/2] drm/amdgpu: Add SI Family information Alex Deucher
2016-05-25 21:12 ` [PATCH 2/2] drm/amdgpu/gfx6: Assign num_rbs Alex Deucher
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.