@@ -179,7 +179,7 @@ int uvd_v1_0_init(struct radeon_device *rdev)
179179
180180 r = radeon_ring_lock (rdev , ring , 10 );
181181 if (r ) {
182- DRM_ERROR ( "radeon: ring failed to lock UVD ring (%d).\n" , r );
182+ drm_err ( & rdev -> ddev , "radeon: ring failed to lock UVD ring (%d).\n" , r );
183183 goto done ;
184184 }
185185
@@ -232,7 +232,7 @@ int uvd_v1_0_init(struct radeon_device *rdev)
232232 break ;
233233 }
234234
235- DRM_INFO ( "UVD initialized successfully.\n" );
235+ drm_info ( & rdev -> ddev , "UVD initialized successfully.\n" );
236236 }
237237
238238 return r ;
@@ -338,7 +338,7 @@ int uvd_v1_0_start(struct radeon_device *rdev)
338338 if (status & 2 )
339339 break ;
340340
341- DRM_ERROR ( "UVD not responding, trying to reset the VCPU!!!\n" );
341+ drm_err ( & rdev -> ddev , "UVD not responding, trying to reset the VCPU!!!\n" );
342342 WREG32_P (UVD_SOFT_RESET , VCPU_SOFT_RESET , ~VCPU_SOFT_RESET );
343343 mdelay (10 );
344344 WREG32_P (UVD_SOFT_RESET , 0 , ~VCPU_SOFT_RESET );
@@ -347,7 +347,7 @@ int uvd_v1_0_start(struct radeon_device *rdev)
347347 }
348348
349349 if (r ) {
350- DRM_ERROR ( "UVD not responding, giving up!!!\n" );
350+ drm_err ( & rdev -> ddev , "UVD not responding, giving up!!!\n" );
351351 return r ;
352352 }
353353
@@ -427,7 +427,7 @@ int uvd_v1_0_ring_test(struct radeon_device *rdev, struct radeon_ring *ring)
427427 WREG32 (UVD_CONTEXT_ID , 0xCAFEDEAD );
428428 r = radeon_ring_lock (rdev , ring , 3 );
429429 if (r ) {
430- DRM_ERROR ( "radeon: cp failed to lock ring %d (%d).\n" ,
430+ drm_err ( & rdev -> ddev , "radeon: cp failed to lock ring %d (%d).\n" ,
431431 ring -> idx , r );
432432 return r ;
433433 }
@@ -442,10 +442,10 @@ int uvd_v1_0_ring_test(struct radeon_device *rdev, struct radeon_ring *ring)
442442 }
443443
444444 if (i < rdev -> usec_timeout ) {
445- DRM_INFO ( "ring test on %d succeeded in %d usecs\n" ,
445+ drm_info ( & rdev -> ddev , "ring test on %d succeeded in %d usecs\n" ,
446446 ring -> idx , i );
447447 } else {
448- DRM_ERROR ( "radeon: ring %d test failed (0x%08X)\n" ,
448+ drm_err ( & rdev -> ddev , "radeon: ring %d test failed (0x%08X)\n" ,
449449 ring -> idx , tmp );
450450 r = - EINVAL ;
451451 }
@@ -507,34 +507,34 @@ int uvd_v1_0_ib_test(struct radeon_device *rdev, struct radeon_ring *ring)
507507 else
508508 r = radeon_set_uvd_clocks (rdev , 53300 , 40000 );
509509 if (r ) {
510- DRM_ERROR ( "radeon: failed to raise UVD clocks (%d).\n" , r );
510+ drm_err ( & rdev -> ddev , "radeon: failed to raise UVD clocks (%d).\n" , r );
511511 return r ;
512512 }
513513
514514 r = radeon_uvd_get_create_msg (rdev , ring -> idx , 1 , NULL );
515515 if (r ) {
516- DRM_ERROR ( "radeon: failed to get create msg (%d).\n" , r );
516+ drm_err ( & rdev -> ddev , "radeon: failed to get create msg (%d).\n" , r );
517517 goto error ;
518518 }
519519
520520 r = radeon_uvd_get_destroy_msg (rdev , ring -> idx , 1 , & fence );
521521 if (r ) {
522- DRM_ERROR ( "radeon: failed to get destroy ib (%d).\n" , r );
522+ drm_err ( & rdev -> ddev , "radeon: failed to get destroy ib (%d).\n" , r );
523523 goto error ;
524524 }
525525
526526 r = radeon_fence_wait_timeout (fence , false, usecs_to_jiffies (
527527 RADEON_USEC_IB_TEST_TIMEOUT ));
528528 if (r < 0 ) {
529- DRM_ERROR ( "radeon: fence wait failed (%d).\n" , r );
529+ drm_err ( & rdev -> ddev , "radeon: fence wait failed (%d).\n" , r );
530530 goto error ;
531531 } else if (r == 0 ) {
532- DRM_ERROR ( "radeon: fence wait timed out.\n" );
532+ drm_err ( & rdev -> ddev , "radeon: fence wait timed out.\n" );
533533 r = - ETIMEDOUT ;
534534 goto error ;
535535 }
536536 r = 0 ;
537- DRM_INFO ( "ib test on ring %d succeeded\n" , ring -> idx );
537+ drm_info ( & rdev -> ddev , "ib test on ring %d succeeded\n" , ring -> idx );
538538error :
539539 radeon_fence_unref (& fence );
540540 radeon_set_uvd_clocks (rdev , 0 , 0 );
0 commit comments