Attachment 140574 Details for Bug 105760 – possible fix 2/4

[patch] possible fix 2/4

0002-drm-amdgpu-pp-smu7-remove-local-mc_addr-variable.patch (text/plain), 1.76 KB, created by Alex Deucher on 2018-07-11 19:21:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Deucher

Created: 2018-07-11 19:21:50 UTC

Size: 1.76 KB

patch

obsolete

>From 79f12d8f9b7ba1db5c9050300714b96d5da22041 Mon Sep 17 00:00:00 2001
>From: Alex Deucher <alexander.deucher@amd.com>
>Date: Wed, 11 Jul 2018 13:43:40 -0500
>Subject: [PATCH 2/4] drm/amdgpu/pp/smu7: remove local mc_addr variable
>
>use the structure member directly.
>
>Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
>---
> drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c | 8 ++------
> 1 file changed, 2 insertions(+), 6 deletions(-)
>
>diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c
>index 2527bfd640f2..ee6281759672 100644
>--- a/drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c
>+++ b/drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c
>@@ -570,7 +570,6 @@ int smu7_setup_pwr_virus(struct pp_hwmgr *hwmgr)
> int smu7_init(struct pp_hwmgr *hwmgr)
> {
> 	struct smu7_smumgr *smu_data;
>-	uint64_t mc_addr = 0;
> 	int r;
> 	/* Allocate memory for backend private data */
> 	smu_data = (struct smu7_smumgr *)(hwmgr->smu_backend);
>@@ -584,14 +583,12 @@ int smu7_init(struct pp_hwmgr *hwmgr)
> 		PAGE_SIZE,
> 		AMDGPU_GEM_DOMAIN_VRAM,
> 		&smu_data->header_buffer.handle,
>-		&mc_addr,
>+		&smu_data->header_buffer.mc_addr,
> 		&smu_data->header_buffer.kaddr);
> 
> 	if (r)
> 		return -EINVAL;
> 
>-	smu_data->header_buffer.mc_addr = mc_addr;
>-
> 	if (!hwmgr->not_vf)
> 		return 0;
> 
>@@ -601,7 +598,7 @@ int smu7_init(struct pp_hwmgr *hwmgr)
> 		PAGE_SIZE,
> 		AMDGPU_GEM_DOMAIN_VRAM,
> 		&smu_data->smu_buffer.handle,
>-		&mc_addr,
>+		&smu_data->smu_buffer.mc_addr,
> 		&smu_data->smu_buffer.kaddr);
> 
> 	if (r) {
>@@ -610,7 +607,6 @@ int smu7_init(struct pp_hwmgr *hwmgr)
> 					&smu_data->header_buffer.kaddr);
> 		return -EINVAL;
> 	}
>-	smu_data->smu_buffer.mc_addr = mc_addr;
> 
> 	if (smum_is_hw_avfs_present(hwmgr))
> 		hwmgr->avfs_supported = true;
>-- 
>2.13.6
>

Actions: View | Splinter Review

Attachments on bug 105760: 138374 | 138890 | 139668 | 140312 | 140356 | 140560 | 140573 | 140574 | 140575 | 140576 | 140577 | 140584 | 140585 | 140590 | 140591 | 140592 | 140593 | 140611 | 140650 | 140660 | 140845 | 140846 | 141369 | 141370

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.