[PATCH] drm/amdgpu: consolidate case statements

[PATCH] drm/amdgpu: consolidate case statements

[Alex Deucher]

IP_VERSION(11, 0, 13) does the exact same thing as
IP_VERSION(11, 0, 12) so squash them together.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c b/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
index 382cebfc2069..aaf200ec982b 100644
--- a/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
@@ -216,13 +216,6 @@ static int psp_v11_0_init_microcode(struct psp_context *psp)
 	case IP_VERSION(11, 0, 7):
 	case IP_VERSION(11, 0, 11):
 	case IP_VERSION(11, 0, 12):
-		err = psp_init_sos_microcode(psp, chip_name);
-		if (err)
-			return err;
-		err = psp_init_ta_microcode(psp, chip_name);
-		if (err)
-			return err;
-		break;
 	case IP_VERSION(11, 0, 13):
 		err = psp_init_sos_microcode(psp, chip_name);
 		if (err)
-- 
2.31.1

[PATCH] Documentation/gpu: remove spurious "+" in amdgpu.rst

[Alex Deucher]

Not sure why that was there.  Remove it.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
 Documentation/gpu/amdgpu.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/gpu/amdgpu.rst b/Documentation/gpu/amdgpu.rst
index 364680cdad2e..8ba72e898099 100644
--- a/Documentation/gpu/amdgpu.rst
+++ b/Documentation/gpu/amdgpu.rst
@@ -300,8 +300,8 @@ pcie_replay_count
 .. kernel-doc:: drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
    :doc: pcie_replay_count
 
-+GPU SmartShift Information
-============================
+GPU SmartShift Information
+==========================
 
 GPU SmartShift information via sysfs
 
-- 
2.31.1

Re: [PATCH] drm/amdgpu: consolidate case statements

[Christian König]

Am 29.09.21 um 19:45 schrieb Alex Deucher:
> IP_VERSION(11, 0, 13) does the exact same thing as
> IP_VERSION(11, 0, 12) so squash them together.
>
> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

Reviewed-by: Christian König <christian.koenig@amd.com>

> ---
>   drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 7 -------
>   1 file changed, 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c b/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
> index 382cebfc2069..aaf200ec982b 100644
> --- a/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
> @@ -216,13 +216,6 @@ static int psp_v11_0_init_microcode(struct psp_context *psp)
>   	case IP_VERSION(11, 0, 7):
>   	case IP_VERSION(11, 0, 11):
>   	case IP_VERSION(11, 0, 12):
> -		err = psp_init_sos_microcode(psp, chip_name);
> -		if (err)
> -			return err;
> -		err = psp_init_ta_microcode(psp, chip_name);
> -		if (err)
> -			return err;
> -		break;
>   	case IP_VERSION(11, 0, 13):
>   		err = psp_init_sos_microcode(psp, chip_name);
>   		if (err)

Re: [PATCH] Documentation/gpu: remove spurious "+" in amdgpu.rst

[Christian König]

Am 29.09.21 um 19:45 schrieb Alex Deucher:
> Not sure why that was there.  Remove it.
>
> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

Reviewed-by: Christian König <christian.koenig@amd.com>

> ---
>   Documentation/gpu/amdgpu.rst | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/Documentation/gpu/amdgpu.rst b/Documentation/gpu/amdgpu.rst
> index 364680cdad2e..8ba72e898099 100644
> --- a/Documentation/gpu/amdgpu.rst
> +++ b/Documentation/gpu/amdgpu.rst
> @@ -300,8 +300,8 @@ pcie_replay_count
>   .. kernel-doc:: drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
>      :doc: pcie_replay_count
>   
> -+GPU SmartShift Information
> -============================
> +GPU SmartShift Information
> +==========================
>   
>   GPU SmartShift information via sysfs
>