tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

drm/amdgpu/vcn: Change amdgpu_vcn_sw_fini return to void

The function amdgpu_vcn_sw_fini() returns an integer, but this number is
always 0. This commit changes the amdgpu_vcn_sw_fini() return to void,
and eliminates all checks to this return across different VCNs.

Signed-off-by: Rodrigo Siqueira <siqueira@igalia.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Rodrigo Siqueira and committed by
Alex Deucher 0855c764 3d9752f4

+19 -39
+2 -4
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
··· 257 257 return 0; 258 258 } 259 259 260 - int amdgpu_vcn_sw_fini(struct amdgpu_device *adev, int i) 260 + void amdgpu_vcn_sw_fini(struct amdgpu_device *adev, int i) 261 261 { 262 262 int j; 263 263 264 264 if (adev->vcn.harvest_config & (1 << i)) 265 - return 0; 265 + return; 266 266 267 267 amdgpu_bo_free_kernel( 268 268 &adev->vcn.inst[i].dpg_sram_bo, ··· 292 292 293 293 mutex_destroy(&adev->vcn.inst[i].vcn_pg_lock); 294 294 mutex_destroy(&adev->vcn.inst[i].vcn1_jpeg1_workaround); 295 - 296 - return 0; 297 295 } 298 296 299 297 bool amdgpu_vcn_is_disabled_vcn(struct amdgpu_device *adev, enum vcn_ring_type type, uint32_t vcn_instance)
+1 -1
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h
··· 516 516 517 517 int amdgpu_vcn_early_init(struct amdgpu_device *adev, int i); 518 518 int amdgpu_vcn_sw_init(struct amdgpu_device *adev, int i); 519 - int amdgpu_vcn_sw_fini(struct amdgpu_device *adev, int i); 519 + void amdgpu_vcn_sw_fini(struct amdgpu_device *adev, int i); 520 520 int amdgpu_vcn_suspend(struct amdgpu_device *adev, int i); 521 521 int amdgpu_vcn_resume(struct amdgpu_device *adev, int i); 522 522 void amdgpu_vcn_ring_begin_use(struct amdgpu_ring *ring);
+2 -2
drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
··· 230 230 231 231 jpeg_v1_0_sw_fini(ip_block); 232 232 233 - r = amdgpu_vcn_sw_fini(adev, 0); 233 + amdgpu_vcn_sw_fini(adev, 0); 234 234 235 235 kfree(adev->vcn.ip_dump); 236 236 237 - return r; 237 + return 0; 238 238 } 239 239 240 240 /**
+2 -2
drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c
··· 267 267 268 268 amdgpu_vcn_sysfs_reset_mask_fini(adev); 269 269 270 - r = amdgpu_vcn_sw_fini(adev, 0); 270 + amdgpu_vcn_sw_fini(adev, 0); 271 271 272 - return r; 272 + return 0; 273 273 } 274 274 275 275 /**
+1 -3
drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c
··· 442 442 r = amdgpu_vcn_suspend(adev, i); 443 443 if (r) 444 444 return r; 445 - r = amdgpu_vcn_sw_fini(adev, i); 446 - if (r) 447 - return r; 445 + amdgpu_vcn_sw_fini(adev, i); 448 446 } 449 447 450 448 return 0;
+1 -3
drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c
··· 349 349 if (r) 350 350 return r; 351 351 352 - r = amdgpu_vcn_sw_fini(adev, i); 353 - if (r) 354 - return r; 352 + amdgpu_vcn_sw_fini(adev, i); 355 353 } 356 354 357 355 return 0;
+2 -5
drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c
··· 302 302 303 303 amdgpu_vcn_sysfs_reset_mask_fini(adev); 304 304 305 - for (i = 0; i < adev->vcn.num_vcn_inst; i++) { 306 - r = amdgpu_vcn_sw_fini(adev, i); 307 - if (r) 308 - return r; 309 - } 305 + for (i = 0; i < adev->vcn.num_vcn_inst; i++) 306 + amdgpu_vcn_sw_fini(adev, i); 310 307 311 308 return 0; 312 309 }
+2 -5
drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c
··· 283 283 284 284 amdgpu_vcn_sysfs_reset_mask_fini(adev); 285 285 286 - for (i = 0; i < adev->vcn.num_vcn_inst; i++) { 287 - r = amdgpu_vcn_sw_fini(adev, i); 288 - if (r) 289 - return r; 290 - } 286 + for (i = 0; i < adev->vcn.num_vcn_inst; i++) 287 + amdgpu_vcn_sw_fini(adev, i); 291 288 292 289 return 0; 293 290 }
+1 -3
drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c
··· 270 270 if (r) 271 271 return r; 272 272 273 - r = amdgpu_vcn_sw_fini(adev, i); 274 - if (r) 275 - return r; 273 + amdgpu_vcn_sw_fini(adev, i); 276 274 } 277 275 278 276 return 0;
+2 -5
drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c
··· 232 232 233 233 amdgpu_vcn_sysfs_reset_mask_fini(adev); 234 234 235 - for (i = 0; i < adev->vcn.num_vcn_inst; i++) { 236 - r = amdgpu_vcn_sw_fini(adev, i); 237 - if (r) 238 - return r; 239 - } 235 + for (i = 0; i < adev->vcn.num_vcn_inst; i++) 236 + amdgpu_vcn_sw_fini(adev, i); 240 237 241 238 return 0; 242 239 }
+3 -6
drivers/gpu/drm/amd/amdgpu/vcn_v5_0_1.c
··· 245 245 return r; 246 246 } 247 247 248 - for (i = 0; i < adev->vcn.num_vcn_inst; i++) { 249 - r = amdgpu_vcn_sw_fini(adev, i); 250 - if (r) 251 - return r; 252 - } 253 - 254 248 amdgpu_vcn_sysfs_reset_mask_fini(adev); 249 + 250 + for (i = 0; i < adev->vcn.num_vcn_inst; i++) 251 + amdgpu_vcn_sw_fini(adev, i); 255 252 256 253 return 0; 257 254 }