[PATCH 1/6] drm/amdgpu: fix mutex list null pointer reference

[PATCH 1/6] drm/amdgpu: fix mutex list null pointer reference

[Xiangliang Yu]

From: Pixel Ding <Pixel.Ding@amd.com>

Fix NULL pointer reference.

Signed-off-by: Pixel Ding <Pixel.Ding@amd.com>
Signed-off-by: Xiangliang Yu <Xiangliang.Yu@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index e685ca9..aef2019 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -2118,7 +2118,8 @@ void amdgpu_device_fini(struct amdgpu_device *adev)
 
 	DRM_INFO("amdgpu: finishing device.\n");
 	adev->shutdown = true;
-	drm_crtc_force_disable_all(adev->ddev);
+	if (adev->ddev->mode_config.funcs)
+		drm_crtc_force_disable_all(adev->ddev);
 	/* evict vram memory */
 	amdgpu_bo_evict_vram(adev);
 	amdgpu_ib_pool_fini(adev);
-- 
2.7.4

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

[PATCH 2/6] drm/amdgpu: reset GDW, GWS and OA software copy to update them

[Xiangliang Yu]

From: Pixel Ding <Pixel.Ding@amd.com>

Reset GDW, GWS and OA when SRIOV do reset.

Signed-off-by: Pixel Ding <Pixel.Ding@amd.com>
Signed-off-by: Xiangliang Yu <Xiangliang.Yu@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index aef2019..f11241d 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -2538,7 +2538,7 @@ static int amdgpu_recover_vram_from_shadow(struct amdgpu_device *adev,
  */
 int amdgpu_sriov_gpu_reset(struct amdgpu_device *adev, bool voluntary)
 {
-	int i, r = 0;
+	int i, j, r = 0;
 	int resched;
 	struct amdgpu_bo *bo, *tmp;
 	struct amdgpu_ring *ring;
@@ -2616,6 +2616,14 @@ int amdgpu_sriov_gpu_reset(struct amdgpu_device *adev, bool voluntary)
 	}
 	fence_put(fence);
 
+	for (i = 0; i < AMDGPU_MAX_VMHUBS; i++) {
+		struct amdgpu_vm_id_manager *id_mgr =
+			&adev->vm_manager.id_mgr[i];
+
+		for (j = 1; j < id_mgr->num_ids; j++)
+			amdgpu_vm_reset_id(adev, i, j);
+	}
+
 	for (i = 0; i < AMDGPU_MAX_RINGS; ++i) {
 		struct amdgpu_ring *ring = adev->rings[i];
 		if (!ring || !ring->sched.thread)
-- 
2.7.4

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

[PATCH 3/6] drm/amdgpu: don't clean the framebuffer for VF

[Xiangliang Yu]

From: Pixel Ding <Pixel.Ding@amd.com>

The SRIOV host driver cleans framebuffer for each VF, guest driver
needn't this action which costs much time on some virtualization
platform, otherwise it might get timeout to initialize.

Signed-off-by: Pixel Ding <Pixel.Ding@amd.com>
Signed-off-by: Xiangliang Yu <Xiangliang.Yu@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c
index e869e60..6f5d994 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c
@@ -242,6 +242,9 @@ static int amdgpufb_create(struct drm_fb_helper *helper,
 	/* setup helper */
 	rfbdev->helper.fb = fb;
 
+	if (!amdgpu_sriov_vf(adev))
+		memset_io(abo->kptr, 0x0, amdgpu_bo_size(abo));
+
 	strcpy(info->fix.id, "amdgpudrmfb");
 
 	drm_fb_helper_fill_fix(info, fb->pitches[0], fb->depth);
-- 
2.7.4

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

RE: [PATCH 2/6] drm/amdgpu: reset GDW, GWS and OA software copy to update them

[Liu, Monk]

NAK, this patch is not needed currently

1, Because TDR feature is still undergoing, so all patches related with TDR should pending now
2, I don't think this is needed, @Pixel can you get the latest amd-staging-4.9 driver and try it, see if the "vm fault" duplicated without this patch?  Because I remember no such issue In staging driver 

BR Monk

-----Original Message-----
From: amd-gfx [mailto:amd-gfx-bounces@lists.freedesktop.org] On Behalf Of Xiangliang Yu
Sent: Thursday, May 04, 2017 2:34 PM
To: amd-gfx@lists.freedesktop.org
Cc: Ding, Pixel <Pixel.Ding@amd.com>; Yu, Xiangliang <Xiangliang.Yu@amd.com>
Subject: [PATCH 2/6] drm/amdgpu: reset GDW, GWS and OA software copy to update them

From: Pixel Ding <Pixel.Ding@amd.com>

Reset GDW, GWS and OA when SRIOV do reset.

Signed-off-by: Pixel Ding <Pixel.Ding@amd.com>
Signed-off-by: Xiangliang Yu <Xiangliang.Yu@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index aef2019..f11241d 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -2538,7 +2538,7 @@ static int amdgpu_recover_vram_from_shadow(struct amdgpu_device *adev,
  */
 int amdgpu_sriov_gpu_reset(struct amdgpu_device *adev, bool voluntary)  {
-	int i, r = 0;
+	int i, j, r = 0;
 	int resched;
 	struct amdgpu_bo *bo, *tmp;
 	struct amdgpu_ring *ring;
@@ -2616,6 +2616,14 @@ int amdgpu_sriov_gpu_reset(struct amdgpu_device *adev, bool voluntary)
 	}
 	fence_put(fence);
 
+	for (i = 0; i < AMDGPU_MAX_VMHUBS; i++) {
+		struct amdgpu_vm_id_manager *id_mgr =
+			&adev->vm_manager.id_mgr[i];
+
+		for (j = 1; j < id_mgr->num_ids; j++)
+			amdgpu_vm_reset_id(adev, i, j);
+	}
+
 	for (i = 0; i < AMDGPU_MAX_RINGS; ++i) {
 		struct amdgpu_ring *ring = adev->rings[i];
 		if (!ring || !ring->sched.thread)
--
2.7.4

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

RE: [PATCH 3/6] drm/amdgpu: don't clean the framebuffer for VF

[Liu, Monk]

NAK

This behavior that Hypervisor cleans framebuffer for each VF is only on AWS, 
Regular GIM doesn't clean framebuffer after FLR, so guest driver still need this cleaning,

Please keep this patch in your AWS branch only.

BR Monk

-----Original Message-----
From: amd-gfx [mailto:amd-gfx-bounces@lists.freedesktop.org] On Behalf Of Xiangliang Yu
Sent: Thursday, May 04, 2017 2:34 PM
To: amd-gfx@lists.freedesktop.org
Cc: Ding, Pixel <Pixel.Ding@amd.com>; Yu, Xiangliang <Xiangliang.Yu@amd.com>
Subject: [PATCH 3/6] drm/amdgpu: don't clean the framebuffer for VF

From: Pixel Ding <Pixel.Ding@amd.com>

The SRIOV host driver cleans framebuffer for each VF, guest driver needn't this action which costs much time on some virtualization platform, otherwise it might get timeout to initialize.

Signed-off-by: Pixel Ding <Pixel.Ding@amd.com>
Signed-off-by: Xiangliang Yu <Xiangliang.Yu@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c
index e869e60..6f5d994 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c
@@ -242,6 +242,9 @@ static int amdgpufb_create(struct drm_fb_helper *helper,
 	/* setup helper */
 	rfbdev->helper.fb = fb;
 
+	if (!amdgpu_sriov_vf(adev))
+		memset_io(abo->kptr, 0x0, amdgpu_bo_size(abo));
+
 	strcpy(info->fix.id, "amdgpudrmfb");
 
 	drm_fb_helper_fill_fix(info, fb->pitches[0], fb->depth);
--
2.7.4

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Re: [PATCH 2/6] drm/amdgpu: reset GDW, GWS and OA software copy to update them

[Ding, Pixel]

In theory this patch is mandatory. It fixes the VM fault issue after TDR on Tonga. You can remove it when you rewrite TDR, but currently Tonga GPU reset has problem without this patch if MCBP is enabled. We need to flush GDS after reset, it’s bypassed if the SW state is not cleaned.

— 
Sincerely Yours,
Pixel







On 04/05/2017, 3:28 PM, "Liu, Monk" <Monk.Liu@amd.com> wrote:

>NAK, this patch is not needed currently
>
>1, Because TDR feature is still undergoing, so all patches related with TDR should pending now
>2, I don't think this is needed, @Pixel can you get the latest amd-staging-4.9 driver and try it, see if the "vm fault" duplicated without this patch?  Because I remember no such issue In staging driver 
>
>BR Monk
>
>-----Original Message-----
>From: amd-gfx [mailto:amd-gfx-bounces@lists.freedesktop.org] On Behalf Of Xiangliang Yu
>Sent: Thursday, May 04, 2017 2:34 PM
>To: amd-gfx@lists.freedesktop.org
>Cc: Ding, Pixel <Pixel.Ding@amd.com>; Yu, Xiangliang <Xiangliang.Yu@amd.com>
>Subject: [PATCH 2/6] drm/amdgpu: reset GDW, GWS and OA software copy to update them
>
>From: Pixel Ding <Pixel.Ding@amd.com>
>
>Reset GDW, GWS and OA when SRIOV do reset.
>
>Signed-off-by: Pixel Ding <Pixel.Ding@amd.com>
>Signed-off-by: Xiangliang Yu <Xiangliang.Yu@amd.com>
>---
> drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 10 +++++++++-
> 1 file changed, 9 insertions(+), 1 deletion(-)
>
>diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
>index aef2019..f11241d 100644
>--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
>+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
>@@ -2538,7 +2538,7 @@ static int amdgpu_recover_vram_from_shadow(struct amdgpu_device *adev,
>  */
> int amdgpu_sriov_gpu_reset(struct amdgpu_device *adev, bool voluntary)  {
>-	int i, r = 0;
>+	int i, j, r = 0;
> 	int resched;
> 	struct amdgpu_bo *bo, *tmp;
> 	struct amdgpu_ring *ring;
>@@ -2616,6 +2616,14 @@ int amdgpu_sriov_gpu_reset(struct amdgpu_device *adev, bool voluntary)
> 	}
> 	fence_put(fence);
> 
>+	for (i = 0; i < AMDGPU_MAX_VMHUBS; i++) {
>+		struct amdgpu_vm_id_manager *id_mgr =
>+			&adev->vm_manager.id_mgr[i];
>+
>+		for (j = 1; j < id_mgr->num_ids; j++)
>+			amdgpu_vm_reset_id(adev, i, j);
>+	}
>+
> 	for (i = 0; i < AMDGPU_MAX_RINGS; ++i) {
> 		struct amdgpu_ring *ring = adev->rings[i];
> 		if (!ring || !ring->sched.thread)
>--
>2.7.4
>
>_______________________________________________
>amd-gfx mailing list
>amd-gfx@lists.freedesktop.org
>https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Re: [PATCH 3/6] drm/amdgpu: don't clean the framebuffer for VF

[Ding, Pixel]

This patch is not necessary since FB is already cleaned by GPU.
— 
Sincerely Yours,
Pixel








On 04/05/2017, 3:30 PM, "Liu, Monk" <Monk.Liu@amd.com> wrote:

>NAK
>
>This behavior that Hypervisor cleans framebuffer for each VF is only on AWS, 
>Regular GIM doesn't clean framebuffer after FLR, so guest driver still need this cleaning,
>
>Please keep this patch in your AWS branch only.
>
>BR Monk
>
>-----Original Message-----
>From: amd-gfx [mailto:amd-gfx-bounces@lists.freedesktop.org] On Behalf Of Xiangliang Yu
>Sent: Thursday, May 04, 2017 2:34 PM
>To: amd-gfx@lists.freedesktop.org
>Cc: Ding, Pixel <Pixel.Ding@amd.com>; Yu, Xiangliang <Xiangliang.Yu@amd.com>
>Subject: [PATCH 3/6] drm/amdgpu: don't clean the framebuffer for VF
>
>From: Pixel Ding <Pixel.Ding@amd.com>
>
>The SRIOV host driver cleans framebuffer for each VF, guest driver needn't this action which costs much time on some virtualization platform, otherwise it might get timeout to initialize.
>
>Signed-off-by: Pixel Ding <Pixel.Ding@amd.com>
>Signed-off-by: Xiangliang Yu <Xiangliang.Yu@amd.com>
>---
> drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 3 +++
> 1 file changed, 3 insertions(+)
>
>diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c
>index e869e60..6f5d994 100644
>--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c
>+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c
>@@ -242,6 +242,9 @@ static int amdgpufb_create(struct drm_fb_helper *helper,
> 	/* setup helper */
> 	rfbdev->helper.fb = fb;
> 
>+	if (!amdgpu_sriov_vf(adev))
>+		memset_io(abo->kptr, 0x0, amdgpu_bo_size(abo));
>+
> 	strcpy(info->fix.id, "amdgpudrmfb");
> 
> 	drm_fb_helper_fill_fix(info, fb->pitches[0], fb->depth);
>--
>2.7.4
>
>_______________________________________________
>amd-gfx mailing list
>amd-gfx@lists.freedesktop.org
>https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

RE: [PATCH 2/6] drm/amdgpu: reset GDW, GWS and OA software copy to update them

[Liu, Monk]

Like I said, you need to test it on amd-staging-4.9 branch

I don't think this patch is necessary unless you prove it 

-----Original Message-----
From: Ding, Pixel 
Sent: Thursday, May 04, 2017 4:14 PM
To: Liu, Monk <Monk.Liu@amd.com>; Yu, Xiangliang <Xiangliang.Yu@amd.com>; amd-gfx@lists.freedesktop.org
Subject: Re: [PATCH 2/6] drm/amdgpu: reset GDW, GWS and OA software copy to update them

In theory this patch is mandatory. It fixes the VM fault issue after TDR on Tonga. You can remove it when you rewrite TDR, but currently Tonga GPU reset has problem without this patch if MCBP is enabled. We need to flush GDS after reset, it’s bypassed if the SW state is not cleaned.

— 
Sincerely Yours,
Pixel







On 04/05/2017, 3:28 PM, "Liu, Monk" <Monk.Liu@amd.com> wrote:

>NAK, this patch is not needed currently
>
>1, Because TDR feature is still undergoing, so all patches related with TDR should pending now
>2, I don't think this is needed, @Pixel can you get the latest amd-staging-4.9 driver and try it, see if the "vm fault" duplicated without this patch?  Because I remember no such issue In staging driver 
>
>BR Monk
>
>-----Original Message-----
>From: amd-gfx [mailto:amd-gfx-bounces@lists.freedesktop.org] On Behalf Of Xiangliang Yu
>Sent: Thursday, May 04, 2017 2:34 PM
>To: amd-gfx@lists.freedesktop.org
>Cc: Ding, Pixel <Pixel.Ding@amd.com>; Yu, Xiangliang <Xiangliang.Yu@amd.com>
>Subject: [PATCH 2/6] drm/amdgpu: reset GDW, GWS and OA software copy to update them
>
>From: Pixel Ding <Pixel.Ding@amd.com>
>
>Reset GDW, GWS and OA when SRIOV do reset.
>
>Signed-off-by: Pixel Ding <Pixel.Ding@amd.com>
>Signed-off-by: Xiangliang Yu <Xiangliang.Yu@amd.com>
>---
> drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 10 +++++++++-
> 1 file changed, 9 insertions(+), 1 deletion(-)
>
>diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
>index aef2019..f11241d 100644
>--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
>+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
>@@ -2538,7 +2538,7 @@ static int amdgpu_recover_vram_from_shadow(struct amdgpu_device *adev,
>  */
> int amdgpu_sriov_gpu_reset(struct amdgpu_device *adev, bool voluntary)  {
>-	int i, r = 0;
>+	int i, j, r = 0;
> 	int resched;
> 	struct amdgpu_bo *bo, *tmp;
> 	struct amdgpu_ring *ring;
>@@ -2616,6 +2616,14 @@ int amdgpu_sriov_gpu_reset(struct amdgpu_device *adev, bool voluntary)
> 	}
> 	fence_put(fence);
> 
>+	for (i = 0; i < AMDGPU_MAX_VMHUBS; i++) {
>+		struct amdgpu_vm_id_manager *id_mgr =
>+			&adev->vm_manager.id_mgr[i];
>+
>+		for (j = 1; j < id_mgr->num_ids; j++)
>+			amdgpu_vm_reset_id(adev, i, j);
>+	}
>+
> 	for (i = 0; i < AMDGPU_MAX_RINGS; ++i) {
> 		struct amdgpu_ring *ring = adev->rings[i];
> 		if (!ring || !ring->sched.thread)
>--
>2.7.4
>
>_______________________________________________
>amd-gfx mailing list
>amd-gfx@lists.freedesktop.org
>https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Re: [PATCH 2/6] drm/amdgpu: reset GDW, GWS and OA software copy to update them

[Ding, Pixel]

Hi Xiangliang,

Please verify as Monk requested.

— 
Sincerely Yours,
Pixel







On 04/05/2017, 4:22 PM, "Liu, Monk" <Monk.Liu@amd.com> wrote:

>Like I said, you need to test it on amd-staging-4.9 branch
>
>I don't think this patch is necessary unless you prove it 
>
>-----Original Message-----
>From: Ding, Pixel 
>Sent: Thursday, May 04, 2017 4:14 PM
>To: Liu, Monk <Monk.Liu@amd.com>; Yu, Xiangliang <Xiangliang.Yu@amd.com>; amd-gfx@lists.freedesktop.org
>Subject: Re: [PATCH 2/6] drm/amdgpu: reset GDW, GWS and OA software copy to update them
>
>In theory this patch is mandatory. It fixes the VM fault issue after TDR on Tonga. You can remove it when you rewrite TDR, but currently Tonga GPU reset has problem without this patch if MCBP is enabled. We need to flush GDS after reset, it’s bypassed if the SW state is not cleaned.
>
>— 
>Sincerely Yours,
>Pixel
>
>
>
>
>
>
>
>On 04/05/2017, 3:28 PM, "Liu, Monk" <Monk.Liu@amd.com> wrote:
>
>>NAK, this patch is not needed currently
>>
>>1, Because TDR feature is still undergoing, so all patches related with TDR should pending now
>>2, I don't think this is needed, @Pixel can you get the latest amd-staging-4.9 driver and try it, see if the "vm fault" duplicated without this patch?  Because I remember no such issue In staging driver 
>>
>>BR Monk
>>
>>-----Original Message-----
>>From: amd-gfx [mailto:amd-gfx-bounces@lists.freedesktop.org] On Behalf Of Xiangliang Yu
>>Sent: Thursday, May 04, 2017 2:34 PM
>>To: amd-gfx@lists.freedesktop.org
>>Cc: Ding, Pixel <Pixel.Ding@amd.com>; Yu, Xiangliang <Xiangliang.Yu@amd.com>
>>Subject: [PATCH 2/6] drm/amdgpu: reset GDW, GWS and OA software copy to update them
>>
>>From: Pixel Ding <Pixel.Ding@amd.com>
>>
>>Reset GDW, GWS and OA when SRIOV do reset.
>>
>>Signed-off-by: Pixel Ding <Pixel.Ding@amd.com>
>>Signed-off-by: Xiangliang Yu <Xiangliang.Yu@amd.com>
>>---
>> drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 10 +++++++++-
>> 1 file changed, 9 insertions(+), 1 deletion(-)
>>
>>diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
>>index aef2019..f11241d 100644
>>--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
>>+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
>>@@ -2538,7 +2538,7 @@ static int amdgpu_recover_vram_from_shadow(struct amdgpu_device *adev,
>>  */
>> int amdgpu_sriov_gpu_reset(struct amdgpu_device *adev, bool voluntary)  {
>>-	int i, r = 0;
>>+	int i, j, r = 0;
>> 	int resched;
>> 	struct amdgpu_bo *bo, *tmp;
>> 	struct amdgpu_ring *ring;
>>@@ -2616,6 +2616,14 @@ int amdgpu_sriov_gpu_reset(struct amdgpu_device *adev, bool voluntary)
>> 	}
>> 	fence_put(fence);
>> 
>>+	for (i = 0; i < AMDGPU_MAX_VMHUBS; i++) {
>>+		struct amdgpu_vm_id_manager *id_mgr =
>>+			&adev->vm_manager.id_mgr[i];
>>+
>>+		for (j = 1; j < id_mgr->num_ids; j++)
>>+			amdgpu_vm_reset_id(adev, i, j);
>>+	}
>>+
>> 	for (i = 0; i < AMDGPU_MAX_RINGS; ++i) {
>> 		struct amdgpu_ring *ring = adev->rings[i];
>> 		if (!ring || !ring->sched.thread)
>>--
>>2.7.4
>>
>>_______________________________________________
>>amd-gfx mailing list
>>amd-gfx@lists.freedesktop.org
>>https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

RE: [PATCH 1/6] drm/amdgpu: fix mutex list null pointer reference

[Deucher, Alexander]

> -----Original Message-----
> From: amd-gfx [mailto:amd-gfx-bounces@lists.freedesktop.org] On Behalf
> Of Xiangliang Yu
> Sent: Thursday, May 04, 2017 2:34 AM
> To: amd-gfx@lists.freedesktop.org
> Cc: Ding, Pixel; Yu, Xiangliang
> Subject: [PATCH 1/6] drm/amdgpu: fix mutex list null pointer reference
> 
> From: Pixel Ding <Pixel.Ding@amd.com>
> 
> Fix NULL pointer reference.
> 
> Signed-off-by: Pixel Ding <Pixel.Ding@amd.com>
> Signed-off-by: Xiangliang Yu <Xiangliang.Yu@amd.com>
> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> index e685ca9..aef2019 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> @@ -2118,7 +2118,8 @@ void amdgpu_device_fini(struct amdgpu_device
> *adev)
> 
>  	DRM_INFO("amdgpu: finishing device.\n");
>  	adev->shutdown = true;
> -	drm_crtc_force_disable_all(adev->ddev);
> +	if (adev->ddev->mode_config.funcs)
> +		drm_crtc_force_disable_all(adev->ddev);

For consistency, I think we generally check for adev->mode_info.mode_confg_initialized or adev->mode_info.num_crtc.  Either way:
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>

>  	/* evict vram memory */
>  	amdgpu_bo_evict_vram(adev);
>  	amdgpu_ib_pool_fini(adev);
> --
> 2.7.4
> 
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

RE: [PATCH 2/6] drm/amdgpu: reset GDW, GWS and OA software copy to update them

[Yu, Xiangliang]

@Pixel, @monk,

found out staging FLR  has issue, I'll check it at first.
Let's hold the patch.


Thanks!
Xiangliang Yu


> -----Original Message-----
> From: Ding, Pixel
> Sent: Thursday, May 04, 2017 4:23 PM
> To: Liu, Monk <Monk.Liu@amd.com>; Yu, Xiangliang
> <Xiangliang.Yu@amd.com>; amd-gfx@lists.freedesktop.org
> Subject: Re: [PATCH 2/6] drm/amdgpu: reset GDW, GWS and OA software
> copy to update them
> 
> Hi Xiangliang,
> 
> Please verify as Monk requested.
> 
> —
> Sincerely Yours,
> Pixel
> 
> 
> 
> 
> 
> 
> 
> On 04/05/2017, 4:22 PM, "Liu, Monk" <Monk.Liu@amd.com> wrote:
> 
> >Like I said, you need to test it on amd-staging-4.9 branch
> >
> >I don't think this patch is necessary unless you prove it
> >
> >-----Original Message-----
> >From: Ding, Pixel
> >Sent: Thursday, May 04, 2017 4:14 PM
> >To: Liu, Monk <Monk.Liu@amd.com>; Yu, Xiangliang
> <Xiangliang.Yu@amd.com>; amd-gfx@lists.freedesktop.org
> >Subject: Re: [PATCH 2/6] drm/amdgpu: reset GDW, GWS and OA software
> copy to update them
> >
> >In theory this patch is mandatory. It fixes the VM fault issue after TDR on
> Tonga. You can remove it when you rewrite TDR, but currently Tonga GPU
> reset has problem without this patch if MCBP is enabled. We need to flush
> GDS after reset, it’s bypassed if the SW state is not cleaned.
> >
> >—
> >Sincerely Yours,
> >Pixel
> >
> >
> >
> >
> >
> >
> >
> >On 04/05/2017, 3:28 PM, "Liu, Monk" <Monk.Liu@amd.com> wrote:
> >
> >>NAK, this patch is not needed currently
> >>
> >>1, Because TDR feature is still undergoing, so all patches related with TDR
> should pending now
> >>2, I don't think this is needed, @Pixel can you get the latest amd-staging-
> 4.9 driver and try it, see if the "vm fault" duplicated without this patch?
> Because I remember no such issue In staging driver
> >>
> >>BR Monk
> >>
> >>-----Original Message-----
> >>From: amd-gfx [mailto:amd-gfx-bounces@lists.freedesktop.org] On
> Behalf Of Xiangliang Yu
> >>Sent: Thursday, May 04, 2017 2:34 PM
> >>To: amd-gfx@lists.freedesktop.org
> >>Cc: Ding, Pixel <Pixel.Ding@amd.com>; Yu, Xiangliang
> <Xiangliang.Yu@amd.com>
> >>Subject: [PATCH 2/6] drm/amdgpu: reset GDW, GWS and OA software
> copy to update them
> >>
> >>From: Pixel Ding <Pixel.Ding@amd.com>
> >>
> >>Reset GDW, GWS and OA when SRIOV do reset.
> >>
> >>Signed-off-by: Pixel Ding <Pixel.Ding@amd.com>
> >>Signed-off-by: Xiangliang Yu <Xiangliang.Yu@amd.com>
> >>---
> >> drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 10 +++++++++-
> >> 1 file changed, 9 insertions(+), 1 deletion(-)
> >>
> >>diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> >>index aef2019..f11241d 100644
> >>--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> >>+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> >>@@ -2538,7 +2538,7 @@ static int
> amdgpu_recover_vram_from_shadow(struct amdgpu_device *adev,
> >>  */
> >> int amdgpu_sriov_gpu_reset(struct amdgpu_device *adev, bool
> voluntary)  {
> >>-	int i, r = 0;
> >>+	int i, j, r = 0;
> >> 	int resched;
> >> 	struct amdgpu_bo *bo, *tmp;
> >> 	struct amdgpu_ring *ring;
> >>@@ -2616,6 +2616,14 @@ int amdgpu_sriov_gpu_reset(struct
> amdgpu_device *adev, bool voluntary)
> >> 	}
> >> 	fence_put(fence);
> >>
> >>+	for (i = 0; i < AMDGPU_MAX_VMHUBS; i++) {
> >>+		struct amdgpu_vm_id_manager *id_mgr =
> >>+			&adev->vm_manager.id_mgr[i];
> >>+
> >>+		for (j = 1; j < id_mgr->num_ids; j++)
> >>+			amdgpu_vm_reset_id(adev, i, j);
> >>+	}
> >>+
> >> 	for (i = 0; i < AMDGPU_MAX_RINGS; ++i) {
> >> 		struct amdgpu_ring *ring = adev->rings[i];
> >> 		if (!ring || !ring->sched.thread)
> >>--
> >>2.7.4
> >>
> >>_______________________________________________
> >>amd-gfx mailing list
> >>amd-gfx@lists.freedesktop.org
> >>https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

RE: [PATCH 2/6] drm/amdgpu: reset GDW, GWS and OA software copy to update them

[Liu, Monk]

 can you check if vega the same  

-----Original Message-----
From: Yu, Xiangliang 
Sent: Friday, May 5, 2017 5:18 PM
To: Ding, Pixel <Pixel.Ding@amd.com>; Liu, Monk <Monk.Liu@amd.com>; amd-gfx@lists.freedesktop.org
Subject: RE: [PATCH 2/6] drm/amdgpu: reset GDW, GWS and OA software copy to update them

@Pixel, @monk,

found out staging FLR  has issue, I'll check it at first.
Let's hold the patch.


Thanks!
Xiangliang Yu


> -----Original Message-----
> From: Ding, Pixel
> Sent: Thursday, May 04, 2017 4:23 PM
> To: Liu, Monk <Monk.Liu@amd.com>; Yu, Xiangliang 
> <Xiangliang.Yu@amd.com>; amd-gfx@lists.freedesktop.org
> Subject: Re: [PATCH 2/6] drm/amdgpu: reset GDW, GWS and OA software 
> copy to update them
> 
> Hi Xiangliang,
> 
> Please verify as Monk requested.
> 
> —
> Sincerely Yours,
> Pixel
> 
> 
> 
> 
> 
> 
> 
> On 04/05/2017, 4:22 PM, "Liu, Monk" <Monk.Liu@amd.com> wrote:
> 
> >Like I said, you need to test it on amd-staging-4.9 branch
> >
> >I don't think this patch is necessary unless you prove it
> >
> >-----Original Message-----
> >From: Ding, Pixel
> >Sent: Thursday, May 04, 2017 4:14 PM
> >To: Liu, Monk <Monk.Liu@amd.com>; Yu, Xiangliang
> <Xiangliang.Yu@amd.com>; amd-gfx@lists.freedesktop.org
> >Subject: Re: [PATCH 2/6] drm/amdgpu: reset GDW, GWS and OA software
> copy to update them
> >
> >In theory this patch is mandatory. It fixes the VM fault issue after 
> >TDR on
> Tonga. You can remove it when you rewrite TDR, but currently Tonga GPU 
> reset has problem without this patch if MCBP is enabled. We need to 
> flush GDS after reset, it’s bypassed if the SW state is not cleaned.
> >
> >—
> >Sincerely Yours,
> >Pixel
> >
> >
> >
> >
> >
> >
> >
> >On 04/05/2017, 3:28 PM, "Liu, Monk" <Monk.Liu@amd.com> wrote:
> >
> >>NAK, this patch is not needed currently
> >>
> >>1, Because TDR feature is still undergoing, so all patches related 
> >>with TDR
> should pending now
> >>2, I don't think this is needed, @Pixel can you get the latest 
> >>amd-staging-
> 4.9 driver and try it, see if the "vm fault" duplicated without this patch?
> Because I remember no such issue In staging driver
> >>
> >>BR Monk
> >>
> >>-----Original Message-----
> >>From: amd-gfx [mailto:amd-gfx-bounces@lists.freedesktop.org] On
> Behalf Of Xiangliang Yu
> >>Sent: Thursday, May 04, 2017 2:34 PM
> >>To: amd-gfx@lists.freedesktop.org
> >>Cc: Ding, Pixel <Pixel.Ding@amd.com>; Yu, Xiangliang
> <Xiangliang.Yu@amd.com>
> >>Subject: [PATCH 2/6] drm/amdgpu: reset GDW, GWS and OA software
> copy to update them
> >>
> >>From: Pixel Ding <Pixel.Ding@amd.com>
> >>
> >>Reset GDW, GWS and OA when SRIOV do reset.
> >>
> >>Signed-off-by: Pixel Ding <Pixel.Ding@amd.com>
> >>Signed-off-by: Xiangliang Yu <Xiangliang.Yu@amd.com>
> >>---
> >> drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 10 +++++++++-
> >> 1 file changed, 9 insertions(+), 1 deletion(-)
> >>
> >>diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> >>index aef2019..f11241d 100644
> >>--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> >>+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> >>@@ -2538,7 +2538,7 @@ static int
> amdgpu_recover_vram_from_shadow(struct amdgpu_device *adev,
> >>  */
> >> int amdgpu_sriov_gpu_reset(struct amdgpu_device *adev, bool
> voluntary)  {
> >>-	int i, r = 0;
> >>+	int i, j, r = 0;
> >> 	int resched;
> >> 	struct amdgpu_bo *bo, *tmp;
> >> 	struct amdgpu_ring *ring;
> >>@@ -2616,6 +2616,14 @@ int amdgpu_sriov_gpu_reset(struct
> amdgpu_device *adev, bool voluntary)
> >> 	}
> >> 	fence_put(fence);
> >>
> >>+	for (i = 0; i < AMDGPU_MAX_VMHUBS; i++) {
> >>+		struct amdgpu_vm_id_manager *id_mgr =
> >>+			&adev->vm_manager.id_mgr[i];
> >>+
> >>+		for (j = 1; j < id_mgr->num_ids; j++)
> >>+			amdgpu_vm_reset_id(adev, i, j);
> >>+	}
> >>+
> >> 	for (i = 0; i < AMDGPU_MAX_RINGS; ++i) {
> >> 		struct amdgpu_ring *ring = adev->rings[i];
> >> 		if (!ring || !ring->sched.thread)
> >>--
> >>2.7.4
> >>
> >>_______________________________________________
> >>amd-gfx mailing list
> >>amd-gfx@lists.freedesktop.org
> >>https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx