All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] drm/amdgpu: allow direct upload save restore list for raven2
@ 2020-01-20 18:24 Alex Deucher
  2020-01-21 15:35 ` Greg KH
  0 siblings, 1 reply; 8+ messages in thread
From: Alex Deucher @ 2020-01-20 18:24 UTC (permalink / raw)
  To: stable, gregkh; +Cc: changzhu, Huang Rui, Alex Deucher

From: changzhu <Changfeng.Zhu@amd.com>

It will cause modprobe atombios stuck problem in raven2 if it doesn't
allow direct upload save restore list from gfx driver.
So it needs to allow direct upload save restore list for raven2
temporarily.

Bug: https://gitlab.freedesktop.org/drm/amd/issues/1013
Signed-off-by: changzhu <Changfeng.Zhu@amd.com>
Reviewed-by: Huang Rui <ray.huang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
(cherry picked from commit eebc7f4d7ffa09f2a620bd1e2c67ddd579118af9)
Cc: <stable@vger.kernel.org> # 5.4.x
---
 drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
index ab4a0d8545dc..0125ea7c4103 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
@@ -2923,7 +2923,9 @@ static void gfx_v9_0_init_pg(struct amdgpu_device *adev)
 	 * And it's needed by gfxoff feature.
 	 */
 	if (adev->gfx.rlc.is_rlc_v2_1) {
-		if (adev->asic_type == CHIP_VEGA12)
+		if (adev->asic_type == CHIP_VEGA12 ||
+		    (adev->asic_type == CHIP_RAVEN &&
+		     adev->rev_id >= 8))
 			gfx_v9_1_init_rlc_save_restore_list(adev);
 		gfx_v9_0_enable_save_restore_machine(adev);
 	}
-- 
2.24.1


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* Re: [PATCH] drm/amdgpu: allow direct upload save restore list for raven2
  2020-01-20 18:24 [PATCH] drm/amdgpu: allow direct upload save restore list for raven2 Alex Deucher
@ 2020-01-21 15:35 ` Greg KH
  0 siblings, 0 replies; 8+ messages in thread
From: Greg KH @ 2020-01-21 15:35 UTC (permalink / raw)
  To: Alex Deucher; +Cc: stable, changzhu, Huang Rui, Alex Deucher

On Mon, Jan 20, 2020 at 01:24:39PM -0500, Alex Deucher wrote:
> From: changzhu <Changfeng.Zhu@amd.com>
> 
> It will cause modprobe atombios stuck problem in raven2 if it doesn't
> allow direct upload save restore list from gfx driver.
> So it needs to allow direct upload save restore list for raven2
> temporarily.
> 
> Bug: https://gitlab.freedesktop.org/drm/amd/issues/1013
> Signed-off-by: changzhu <Changfeng.Zhu@amd.com>
> Reviewed-by: Huang Rui <ray.huang@amd.com>
> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
> (cherry picked from commit eebc7f4d7ffa09f2a620bd1e2c67ddd579118af9)
> Cc: <stable@vger.kernel.org> # 5.4.x
> ---
>  drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)

Now backported, thanks.

greg k-h

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH] drm/amdgpu: allow direct upload save restore list for raven2
@ 2019-11-08 14:37     ` Deucher, Alexander
  0 siblings, 0 replies; 8+ messages in thread
From: Deucher, Alexander @ 2019-11-08 14:37 UTC (permalink / raw)
  To: Zhu, Changfeng, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, Zhang,
	Hawking, Huang, Ray


[-- Attachment #1.1: Type: text/plain, Size: 2103 bytes --]

What about picasso and raven1?
________________________________
From: amd-gfx <amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org> on behalf of Zhu, Changfeng <Changfeng.Zhu-5C7GfCeVMHo@public.gmane.org>
Sent: Thursday, November 7, 2019 8:54 PM
To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org <amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org>; Zhang, Hawking <Hawking.Zhang-5C7GfCeVMHo@public.gmane.org>; Huang, Ray <Ray.Huang-5C7GfCeVMHo@public.gmane.org>
Cc: Zhu, Changfeng <Changfeng.Zhu-5C7GfCeVMHo@public.gmane.org>
Subject: [PATCH] drm/amdgpu: allow direct upload save restore list for raven2

From: changzhu <Changfeng.Zhu-5C7GfCeVMHo@public.gmane.org>

It will cause modprobe atombios stuck problem in raven2 if it doesn't
allow direct upload save restore list from gfx driver.
So it needs to allow direct upload save restore list for raven2
temporarily.

Change-Id: I1fece1b9c61f7a13eec948f34eb60a9120046bc2
Signed-off-by: changzhu <Changfeng.Zhu-5C7GfCeVMHo@public.gmane.org>
---
 drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
index 4ed31e9a398c..dde9713c1d67 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
@@ -2729,7 +2729,9 @@ static void gfx_v9_0_init_pg(struct amdgpu_device *adev)
          * And it's needed by gfxoff feature.
          */
         if (adev->gfx.rlc.is_rlc_v2_1) {
-               if (adev->asic_type == CHIP_VEGA12)
+               if (adev->asic_type == CHIP_VEGA12 ||
+                   (adev->asic_type == CHIP_RAVEN &&
+                    adev->rev_id >= 8))
                         gfx_v9_1_init_rlc_save_restore_list(adev);
                 gfx_v9_0_enable_save_restore_machine(adev);
         }
--
2.17.1

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

[-- Attachment #1.2: Type: text/html, Size: 3820 bytes --]

[-- Attachment #2: Type: text/plain, Size: 153 bytes --]

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

^ permalink raw reply related	[flat|nested] 8+ messages in thread

* Re: [PATCH] drm/amdgpu: allow direct upload save restore list for raven2
@ 2019-11-08 14:37     ` Deucher, Alexander
  0 siblings, 0 replies; 8+ messages in thread
From: Deucher, Alexander @ 2019-11-08 14:37 UTC (permalink / raw)
  To: Zhu, Changfeng, amd-gfx, Zhang, Hawking, Huang, Ray


[-- Attachment #1.1: Type: text/plain, Size: 1865 bytes --]

What about picasso and raven1?
________________________________
From: amd-gfx <amd-gfx-bounces@lists.freedesktop.org> on behalf of Zhu, Changfeng <Changfeng.Zhu@amd.com>
Sent: Thursday, November 7, 2019 8:54 PM
To: amd-gfx@lists.freedesktop.org <amd-gfx@lists.freedesktop.org>; Zhang, Hawking <Hawking.Zhang@amd.com>; Huang, Ray <Ray.Huang@amd.com>
Cc: Zhu, Changfeng <Changfeng.Zhu@amd.com>
Subject: [PATCH] drm/amdgpu: allow direct upload save restore list for raven2

From: changzhu <Changfeng.Zhu@amd.com>

It will cause modprobe atombios stuck problem in raven2 if it doesn't
allow direct upload save restore list from gfx driver.
So it needs to allow direct upload save restore list for raven2
temporarily.

Change-Id: I1fece1b9c61f7a13eec948f34eb60a9120046bc2
Signed-off-by: changzhu <Changfeng.Zhu@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
index 4ed31e9a398c..dde9713c1d67 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
@@ -2729,7 +2729,9 @@ static void gfx_v9_0_init_pg(struct amdgpu_device *adev)
          * And it's needed by gfxoff feature.
          */
         if (adev->gfx.rlc.is_rlc_v2_1) {
-               if (adev->asic_type == CHIP_VEGA12)
+               if (adev->asic_type == CHIP_VEGA12 ||
+                   (adev->asic_type == CHIP_RAVEN &&
+                    adev->rev_id >= 8))
                         gfx_v9_1_init_rlc_save_restore_list(adev);
                 gfx_v9_0_enable_save_restore_machine(adev);
         }
--
2.17.1

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

[-- Attachment #1.2: Type: text/html, Size: 3603 bytes --]

[-- Attachment #2: Type: text/plain, Size: 153 bytes --]

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

^ permalink raw reply related	[flat|nested] 8+ messages in thread

* RE: [PATCH] drm/amdgpu: allow direct upload save restore list for raven2
@ 2019-11-08  2:22     ` Huang, Ray
  0 siblings, 0 replies; 8+ messages in thread
From: Huang, Ray @ 2019-11-08  2:22 UTC (permalink / raw)
  To: Zhu, Changfeng, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, Zhang, Hawking

> -----Original Message-----
> From: Zhu, Changfeng <Changfeng.Zhu@amd.com>
> Sent: Friday, November 08, 2019 9:55 AM
> To: amd-gfx@lists.freedesktop.org; Zhang, Hawking
> <Hawking.Zhang@amd.com>; Huang, Ray <Ray.Huang@amd.com>
> Cc: Zhu, Changfeng <Changfeng.Zhu@amd.com>
> Subject: [PATCH] drm/amdgpu: allow direct upload save restore list for
> raven2
> 
> From: changzhu <Changfeng.Zhu@amd.com>
> 
> It will cause modprobe atombios stuck problem in raven2 if it doesn't allow
> direct upload save restore list from gfx driver.
> So it needs to allow direct upload save restore list for raven2 temporarily.
> 
> Change-Id: I1fece1b9c61f7a13eec948f34eb60a9120046bc2
> Signed-off-by: changzhu <Changfeng.Zhu@amd.com>

Reviewed-by: Huang Rui <ray.huang@amd.com>

> ---
>  drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
> b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
> index 4ed31e9a398c..dde9713c1d67 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
> @@ -2729,7 +2729,9 @@ static void gfx_v9_0_init_pg(struct amdgpu_device
> *adev)
>  	 * And it's needed by gfxoff feature.
>  	 */
>  	if (adev->gfx.rlc.is_rlc_v2_1) {
> -		if (adev->asic_type == CHIP_VEGA12)
> +		if (adev->asic_type == CHIP_VEGA12 ||
> +		    (adev->asic_type == CHIP_RAVEN &&
> +		     adev->rev_id >= 8))
>  			gfx_v9_1_init_rlc_save_restore_list(adev);
>  		gfx_v9_0_enable_save_restore_machine(adev);
>  	}
> --
> 2.17.1

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

^ permalink raw reply	[flat|nested] 8+ messages in thread

* RE: [PATCH] drm/amdgpu: allow direct upload save restore list for raven2
@ 2019-11-08  2:22     ` Huang, Ray
  0 siblings, 0 replies; 8+ messages in thread
From: Huang, Ray @ 2019-11-08  2:22 UTC (permalink / raw)
  To: Zhu, Changfeng, amd-gfx, Zhang, Hawking

> -----Original Message-----
> From: Zhu, Changfeng <Changfeng.Zhu@amd.com>
> Sent: Friday, November 08, 2019 9:55 AM
> To: amd-gfx@lists.freedesktop.org; Zhang, Hawking
> <Hawking.Zhang@amd.com>; Huang, Ray <Ray.Huang@amd.com>
> Cc: Zhu, Changfeng <Changfeng.Zhu@amd.com>
> Subject: [PATCH] drm/amdgpu: allow direct upload save restore list for
> raven2
> 
> From: changzhu <Changfeng.Zhu@amd.com>
> 
> It will cause modprobe atombios stuck problem in raven2 if it doesn't allow
> direct upload save restore list from gfx driver.
> So it needs to allow direct upload save restore list for raven2 temporarily.
> 
> Change-Id: I1fece1b9c61f7a13eec948f34eb60a9120046bc2
> Signed-off-by: changzhu <Changfeng.Zhu@amd.com>

Reviewed-by: Huang Rui <ray.huang@amd.com>

> ---
>  drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
> b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
> index 4ed31e9a398c..dde9713c1d67 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
> @@ -2729,7 +2729,9 @@ static void gfx_v9_0_init_pg(struct amdgpu_device
> *adev)
>  	 * And it's needed by gfxoff feature.
>  	 */
>  	if (adev->gfx.rlc.is_rlc_v2_1) {
> -		if (adev->asic_type == CHIP_VEGA12)
> +		if (adev->asic_type == CHIP_VEGA12 ||
> +		    (adev->asic_type == CHIP_RAVEN &&
> +		     adev->rev_id >= 8))
>  			gfx_v9_1_init_rlc_save_restore_list(adev);
>  		gfx_v9_0_enable_save_restore_machine(adev);
>  	}
> --
> 2.17.1

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

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [PATCH] drm/amdgpu: allow direct upload save restore list for raven2
@ 2019-11-08  1:54 ` Zhu, Changfeng
  0 siblings, 0 replies; 8+ messages in thread
From: Zhu, Changfeng @ 2019-11-08  1:54 UTC (permalink / raw)
  To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, Zhang, Hawking, Huang, Ray
  Cc: Zhu, Changfeng

From: changzhu <Changfeng.Zhu@amd.com>

It will cause modprobe atombios stuck problem in raven2 if it doesn't
allow direct upload save restore list from gfx driver.
So it needs to allow direct upload save restore list for raven2
temporarily.

Change-Id: I1fece1b9c61f7a13eec948f34eb60a9120046bc2
Signed-off-by: changzhu <Changfeng.Zhu@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
index 4ed31e9a398c..dde9713c1d67 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
@@ -2729,7 +2729,9 @@ static void gfx_v9_0_init_pg(struct amdgpu_device *adev)
 	 * And it's needed by gfxoff feature.
 	 */
 	if (adev->gfx.rlc.is_rlc_v2_1) {
-		if (adev->asic_type == CHIP_VEGA12)
+		if (adev->asic_type == CHIP_VEGA12 ||
+		    (adev->asic_type == CHIP_RAVEN &&
+		     adev->rev_id >= 8))
 			gfx_v9_1_init_rlc_save_restore_list(adev);
 		gfx_v9_0_enable_save_restore_machine(adev);
 	}
-- 
2.17.1

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

^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [PATCH] drm/amdgpu: allow direct upload save restore list for raven2
@ 2019-11-08  1:54 ` Zhu, Changfeng
  0 siblings, 0 replies; 8+ messages in thread
From: Zhu, Changfeng @ 2019-11-08  1:54 UTC (permalink / raw)
  To: amd-gfx, Zhang, Hawking, Huang, Ray; +Cc: Zhu, Changfeng

From: changzhu <Changfeng.Zhu@amd.com>

It will cause modprobe atombios stuck problem in raven2 if it doesn't
allow direct upload save restore list from gfx driver.
So it needs to allow direct upload save restore list for raven2
temporarily.

Change-Id: I1fece1b9c61f7a13eec948f34eb60a9120046bc2
Signed-off-by: changzhu <Changfeng.Zhu@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
index 4ed31e9a398c..dde9713c1d67 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
@@ -2729,7 +2729,9 @@ static void gfx_v9_0_init_pg(struct amdgpu_device *adev)
 	 * And it's needed by gfxoff feature.
 	 */
 	if (adev->gfx.rlc.is_rlc_v2_1) {
-		if (adev->asic_type == CHIP_VEGA12)
+		if (adev->asic_type == CHIP_VEGA12 ||
+		    (adev->asic_type == CHIP_RAVEN &&
+		     adev->rev_id >= 8))
 			gfx_v9_1_init_rlc_save_restore_list(adev);
 		gfx_v9_0_enable_save_restore_machine(adev);
 	}
-- 
2.17.1

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

^ permalink raw reply related	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2020-01-21 15:35 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-20 18:24 [PATCH] drm/amdgpu: allow direct upload save restore list for raven2 Alex Deucher
2020-01-21 15:35 ` Greg KH
  -- strict thread matches above, loose matches on Subject: below --
2019-11-08  1:54 Zhu, Changfeng
2019-11-08  1:54 ` Zhu, Changfeng
     [not found] ` <20191108015432.11840-1-changfeng.zhu-5C7GfCeVMHo@public.gmane.org>
2019-11-08  2:22   ` Huang, Ray
2019-11-08  2:22     ` Huang, Ray
2019-11-08 14:37   ` Deucher, Alexander
2019-11-08 14:37     ` Deucher, Alexander

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.