xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/radeon: clean up sumo_rlc_init() for code sharing

Browse Source 
This will eventually be shared with newer asics to
reduce code duplication.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Alex Deucher
2013-04-17 17:22:05 -04:00
parent 866d83de0c
commit 10b7ca7e09
1 changed files with 123 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/gpu/drm/radeon/evergreen.c
View File

@@ -3910,6 +3910,7 @@ int sumo_rlc_init(struct radeon_device *rdev)
dws = rdev->rlc.reg_list_size; dws = rdev->rlc.reg_list_size;
cs_data = rdev->rlc.cs_data; cs_data = rdev->rlc.cs_data;
if (src_ptr) {
/* save restore block */ /* save restore block */
if (rdev->rlc.save_restore_obj == NULL) { if (rdev->rlc.save_restore_obj == NULL) {
r = radeon_bo_create(rdev, dws * 4, PAGE_SIZE, true, r = radeon_bo_create(rdev, dws * 4, PAGE_SIZE, true,
@@ -3933,6 +3934,7 @@ int sumo_rlc_init(struct radeon_device *rdev)
sumo_rlc_fini(rdev); sumo_rlc_fini(rdev);
return r; return r;
} }
r = radeon_bo_kmap(rdev->rlc.save_restore_obj, (void **)&rdev->rlc.sr_ptr); r = radeon_bo_kmap(rdev->rlc.save_restore_obj, (void **)&rdev->rlc.sr_ptr);
if (r) { if (r) {
dev_warn(rdev->dev, "(%d) map RLC sr bo failed\n", r); dev_warn(rdev->dev, "(%d) map RLC sr bo failed\n", r);
@@ -3959,7 +3961,9 @@ int sumo_rlc_init(struct radeon_device *rdev)
radeon_bo_kunmap(rdev->rlc.save_restore_obj); radeon_bo_kunmap(rdev->rlc.save_restore_obj);
radeon_bo_unreserve(rdev->rlc.save_restore_obj); radeon_bo_unreserve(rdev->rlc.save_restore_obj);
}
if (cs_data) {
/* clear state block */ /* clear state block */
reg_list_num = 0; reg_list_num = 0;
dws = 0; dws = 0;
@@ -3989,12 +3993,12 @@ int sumo_rlc_init(struct radeon_device *rdev)
r = radeon_bo_pin(rdev->rlc.clear_state_obj, RADEON_GEM_DOMAIN_VRAM, r = radeon_bo_pin(rdev->rlc.clear_state_obj, RADEON_GEM_DOMAIN_VRAM,
&rdev->rlc.clear_state_gpu_addr); &rdev->rlc.clear_state_gpu_addr);
if (r) { if (r) {
radeon_bo_unreserve(rdev->rlc.clear_state_obj); radeon_bo_unreserve(rdev->rlc.clear_state_obj);
dev_warn(rdev->dev, "(%d) pin RLC c bo failed\n", r); dev_warn(rdev->dev, "(%d) pin RLC c bo failed\n", r);
sumo_rlc_fini(rdev); sumo_rlc_fini(rdev);
return r; return r;
} }
r = radeon_bo_kmap(rdev->rlc.clear_state_obj, (void **)&rdev->rlc.cs_ptr); r = radeon_bo_kmap(rdev->rlc.clear_state_obj, (void **)&rdev->rlc.cs_ptr);
if (r) { if (r) {
dev_warn(rdev->dev, "(%d) map RLC c bo failed\n", r); dev_warn(rdev->dev, "(%d) map RLC c bo failed\n", r);
@@ -4035,6 +4039,7 @@ int sumo_rlc_init(struct radeon_device *rdev)
radeon_bo_kunmap(rdev->rlc.clear_state_obj); radeon_bo_kunmap(rdev->rlc.clear_state_obj);
radeon_bo_unreserve(rdev->rlc.clear_state_obj); radeon_bo_unreserve(rdev->rlc.clear_state_obj);
}
return 0; return 0;
} }