[v2,2/2] drm/amdgpu: remove error message when loading driver

Submitted by Yu, Xiangliang on Nov. 22, 2016, 3:02 a.m.

Details

Message ID 1479783736-4233-1-git-send-email-Xiangliang.Yu@amd.com
State New
Headers show
Series "Series without cover letter" ( rev: 1 ) in AMD X.Org drivers

Not browsing as part of any series.

Commit Message

Yu, Xiangliang Nov. 22, 2016, 3:02 a.m.
Forget to check UCODE_ID_STORAGE case and will cause to print
error message when loading driver, corret it.

v2: use "drm/amdgpu" as the prefix for patch tile.

Signed-off-by: Xiangliang Yu <Xiangliang.Yu@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Patch hide | download patch | download mbox

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
index 7ded61e..9ada56c 100755
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
@@ -723,7 +723,7 @@  static uint16_t amdgpu_get_firmware_version(struct cgs_device *cgs_device,
 					enum cgs_ucode_id type)
 {
 	CGS_FUNC_ADEV;
-	uint16_t fw_version;
+	uint16_t fw_version = 0;
 
 	switch (type) {
 		case CGS_UCODE_ID_SDMA0:
@@ -753,9 +753,11 @@  static uint16_t amdgpu_get_firmware_version(struct cgs_device *cgs_device,
 		case CGS_UCODE_ID_RLC_G:
 			fw_version = adev->gfx.rlc_fw_version;
 			break;
+		case CGS_UCODE_ID_STORAGE:
+			break;
 		default:
 			DRM_ERROR("firmware type %d do not have version\n", type);
-			fw_version = 0;
+			break;
 	}
 	return fw_version;
 }

Comments

> -----Original Message-----

> From: amd-gfx [mailto:amd-gfx-bounces@lists.freedesktop.org] On Behalf

> Of Xiangliang Yu

> Sent: Monday, November 21, 2016 10:02 PM

> To: amd-gfx@freedesktop.org

> Cc: Yu, Xiangliang

> Subject: [Patch v2 2/2] drm/amdgpu: remove error message when loading

> driver

> 

> Forget to check UCODE_ID_STORAGE case and will cause to print

> error message when loading driver, corret it.

> 

> v2: use "drm/amdgpu" as the prefix for patch tile.

> 

> Signed-off-by: Xiangliang Yu <Xiangliang.Yu@amd.com>


Reviewed-by: Alex Deucher <alexander.deucher@amd.com>


> ---

>  drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 6 ++++--

>  1 file changed, 4 insertions(+), 2 deletions(-)

> 

> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c

> b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c

> index 7ded61e..9ada56c 100755

> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c

> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c

> @@ -723,7 +723,7 @@ static uint16_t amdgpu_get_firmware_version(struct

> cgs_device *cgs_device,

>  					enum cgs_ucode_id type)

>  {

>  	CGS_FUNC_ADEV;

> -	uint16_t fw_version;

> +	uint16_t fw_version = 0;

> 

>  	switch (type) {

>  		case CGS_UCODE_ID_SDMA0:

> @@ -753,9 +753,11 @@ static uint16_t

> amdgpu_get_firmware_version(struct cgs_device *cgs_device,

>  		case CGS_UCODE_ID_RLC_G:

>  			fw_version = adev->gfx.rlc_fw_version;

>  			break;

> +		case CGS_UCODE_ID_STORAGE:

> +			break;

>  		default:

>  			DRM_ERROR("firmware type %d do not have

> version\n", type);

> -			fw_version = 0;

> +			break;

>  	}

>  	return fw_version;

>  }

> --

> 2.7.4

> 

> _______________________________________________

> amd-gfx mailing list

> amd-gfx@lists.freedesktop.org

> https://lists.freedesktop.org/mailman/listinfo/amd-gfx