* RE: [PATCH] drm/amdgpu: Enable chained IB MCBP support
[not found] ` <1493277503-14294-1-git-send-email-trigger.huang-5C7GfCeVMHo@public.gmane.org>
@ 2017-04-27 7:21 ` Liu, Monk
2017-04-27 7:52 ` Yu, Xiangliang
2017-04-27 9:59 ` Christian König
2 siblings, 0 replies; 4+ messages in thread
From: Liu, Monk @ 2017-04-27 7:21 UTC (permalink / raw)
To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org
Cc: Yu, Xiangliang, Huang, Trigger
Reviewed-by: Monk Liu <monk.liu@amd.com>
-----Original Message-----
From: Trigger Huang [mailto:trigger.huang@amd.com]
Sent: Thursday, April 27, 2017 3:18 PM
To: amd-gfx@lists.freedesktop.org
Cc: Liu, Monk <Monk.Liu@amd.com>; Yu, Xiangliang <Xiangliang.Yu@amd.com>; Huang, Trigger <Trigger.Huang@amd.com>
Subject: [PATCH] drm/amdgpu: Enable chained IB MCBP support
Support for MCBP/Virtualization in combination with chained IBs is formal released on firmware feature version #46. So enable it according to firmware feature version, otherwise, world switch will hang.
Signed-off-by: Trigger Huang <trigger.huang@amd.com>
---
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
index 2ff5f19..9a8c042 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
@@ -941,12 +941,6 @@ static int gfx_v8_0_init_microcode(struct amdgpu_device *adev)
cp_hdr = (const struct gfx_firmware_header_v1_0 *)adev->gfx.me_fw->data;
adev->gfx.me_fw_version = le32_to_cpu(cp_hdr->header.ucode_version);
- /* chain ib ucode isn't formal released, just disable it by far
- * TODO: when ucod ready we should use ucode version to judge if
- * chain-ib support or not.
- */
- adev->virt.chained_ib_support = false;
-
adev->gfx.me_feature_version = le32_to_cpu(cp_hdr->ucode_feature_version);
snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_ce.bin", chip_name); @@ -960,6 +954,17 @@ static int gfx_v8_0_init_microcode(struct amdgpu_device *adev)
adev->gfx.ce_fw_version = le32_to_cpu(cp_hdr->header.ucode_version);
adev->gfx.ce_feature_version = le32_to_cpu(cp_hdr->ucode_feature_version);
+ /*
+ * Support for MCBP/Virtualization in combination with chained IBs is
+ * formal released on feature version #46
+ */
+ if (adev->gfx.ce_feature_version >= 46 &&
+ adev->gfx.pfp_feature_version >= 46) {
+ adev->virt.chained_ib_support = true;
+ DRM_INFO("Chained IB support enabled!\n");
+ } else
+ adev->virt.chained_ib_support = false;
+
snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_rlc.bin", chip_name);
err = request_firmware(&adev->gfx.rlc_fw, fw_name, adev->dev);
if (err)
--
2.7.4
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 4+ messages in thread* RE: [PATCH] drm/amdgpu: Enable chained IB MCBP support
[not found] ` <1493277503-14294-1-git-send-email-trigger.huang-5C7GfCeVMHo@public.gmane.org>
2017-04-27 7:21 ` Liu, Monk
@ 2017-04-27 7:52 ` Yu, Xiangliang
2017-04-27 9:59 ` Christian König
2 siblings, 0 replies; 4+ messages in thread
From: Yu, Xiangliang @ 2017-04-27 7:52 UTC (permalink / raw)
To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org
Cc: Liu, Monk, Huang, Trigger
Reviewed-by: Xiangliang Yu <Xiangliang.Yu@amd.com>
Thanks!
Xiangliang Yu
> -----Original Message-----
> From: Trigger Huang [mailto:trigger.huang@amd.com]
> Sent: Thursday, April 27, 2017 3:18 PM
> To: amd-gfx@lists.freedesktop.org
> Cc: Liu, Monk <Monk.Liu@amd.com>; Yu, Xiangliang
> <Xiangliang.Yu@amd.com>; Huang, Trigger <Trigger.Huang@amd.com>
> Subject: [PATCH] drm/amdgpu: Enable chained IB MCBP support
>
> Support for MCBP/Virtualization in combination with chained IBs is formal
> released on firmware feature version #46. So enable it according to firmware
> feature version, otherwise, world switch will hang.
>
> Signed-off-by: Trigger Huang <trigger.huang@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 17 +++++++++++------
> 1 file changed, 11 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
> b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
> index 2ff5f19..9a8c042 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
> @@ -941,12 +941,6 @@ static int gfx_v8_0_init_microcode(struct
> amdgpu_device *adev)
> cp_hdr = (const struct gfx_firmware_header_v1_0 *)adev-
> >gfx.me_fw->data;
> adev->gfx.me_fw_version = le32_to_cpu(cp_hdr-
> >header.ucode_version);
>
> - /* chain ib ucode isn't formal released, just disable it by far
> - * TODO: when ucod ready we should use ucode version to judge if
> - * chain-ib support or not.
> - */
> - adev->virt.chained_ib_support = false;
> -
> adev->gfx.me_feature_version = le32_to_cpu(cp_hdr-
> >ucode_feature_version);
>
> snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_ce.bin",
> chip_name); @@ -960,6 +954,17 @@ static int
> gfx_v8_0_init_microcode(struct amdgpu_device *adev)
> adev->gfx.ce_fw_version = le32_to_cpu(cp_hdr-
> >header.ucode_version);
> adev->gfx.ce_feature_version = le32_to_cpu(cp_hdr-
> >ucode_feature_version);
>
> + /*
> + * Support for MCBP/Virtualization in combination with chained IBs is
> + * formal released on feature version #46
> + */
> + if (adev->gfx.ce_feature_version >= 46 &&
> + adev->gfx.pfp_feature_version >= 46) {
> + adev->virt.chained_ib_support = true;
> + DRM_INFO("Chained IB support enabled!\n");
> + } else
> + adev->virt.chained_ib_support = false;
> +
> snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_rlc.bin",
> chip_name);
> err = request_firmware(&adev->gfx.rlc_fw, fw_name, adev->dev);
> if (err)
> --
> 2.7.4
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] drm/amdgpu: Enable chained IB MCBP support
[not found] ` <1493277503-14294-1-git-send-email-trigger.huang-5C7GfCeVMHo@public.gmane.org>
2017-04-27 7:21 ` Liu, Monk
2017-04-27 7:52 ` Yu, Xiangliang
@ 2017-04-27 9:59 ` Christian König
2 siblings, 0 replies; 4+ messages in thread
From: Christian König @ 2017-04-27 9:59 UTC (permalink / raw)
To: Trigger Huang, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
Cc: Xiangliang.Yu-5C7GfCeVMHo, Monk.Liu-5C7GfCeVMHo
Am 27.04.2017 um 09:18 schrieb Trigger Huang:
> Support for MCBP/Virtualization in combination with chained IBs is
> formal released on firmware feature version #46. So enable it
> according to firmware feature version, otherwise, world switch will
> hang.
>
> Signed-off-by: Trigger Huang <trigger.huang@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 17 +++++++++++------
> 1 file changed, 11 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
> index 2ff5f19..9a8c042 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
> @@ -941,12 +941,6 @@ static int gfx_v8_0_init_microcode(struct amdgpu_device *adev)
> cp_hdr = (const struct gfx_firmware_header_v1_0 *)adev->gfx.me_fw->data;
> adev->gfx.me_fw_version = le32_to_cpu(cp_hdr->header.ucode_version);
>
> - /* chain ib ucode isn't formal released, just disable it by far
> - * TODO: when ucod ready we should use ucode version to judge if
> - * chain-ib support or not.
> - */
> - adev->virt.chained_ib_support = false;
> -
> adev->gfx.me_feature_version = le32_to_cpu(cp_hdr->ucode_feature_version);
>
> snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_ce.bin", chip_name);
> @@ -960,6 +954,17 @@ static int gfx_v8_0_init_microcode(struct amdgpu_device *adev)
> adev->gfx.ce_fw_version = le32_to_cpu(cp_hdr->header.ucode_version);
> adev->gfx.ce_feature_version = le32_to_cpu(cp_hdr->ucode_feature_version);
>
> + /*
> + * Support for MCBP/Virtualization in combination with chained IBs is
> + * formal released on feature version #46
> + */
> + if (adev->gfx.ce_feature_version >= 46 &&
> + adev->gfx.pfp_feature_version >= 46) {
> + adev->virt.chained_ib_support = true;
> + DRM_INFO("Chained IB support enabled!\n");
> + } else
> + adev->virt.chained_ib_support = false;
> +
> snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_rlc.bin", chip_name);
> err = request_firmware(&adev->gfx.rlc_fw, fw_name, adev->dev);
> if (err)
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 4+ messages in thread