@@ -673,64 +673,64 @@ void amdgpu_add_thermal_controller(struct amdgpu_device *adev)
673673 adev -> pm .fan_max_rpm = controller -> ucFanMaxRPM ;
674674 }
675675 if (controller -> ucType == ATOM_PP_THERMALCONTROLLER_RV6xx ) {
676- DRM_INFO ( "Internal thermal controller %s fan control\n" ,
676+ drm_info ( adev_to_drm ( adev ), "Internal thermal controller %s fan control\n" ,
677677 (controller -> ucFanParameters &
678678 ATOM_PP_FANPARAMETERS_NOFAN ) ? "without" : "with" );
679679 adev -> pm .int_thermal_type = THERMAL_TYPE_RV6XX ;
680680 } else if (controller -> ucType == ATOM_PP_THERMALCONTROLLER_RV770 ) {
681- DRM_INFO ( "Internal thermal controller %s fan control\n" ,
681+ drm_info ( adev_to_drm ( adev ), "Internal thermal controller %s fan control\n" ,
682682 (controller -> ucFanParameters &
683683 ATOM_PP_FANPARAMETERS_NOFAN ) ? "without" : "with" );
684684 adev -> pm .int_thermal_type = THERMAL_TYPE_RV770 ;
685685 } else if (controller -> ucType == ATOM_PP_THERMALCONTROLLER_EVERGREEN ) {
686- DRM_INFO ( "Internal thermal controller %s fan control\n" ,
686+ drm_info ( adev_to_drm ( adev ), "Internal thermal controller %s fan control\n" ,
687687 (controller -> ucFanParameters &
688688 ATOM_PP_FANPARAMETERS_NOFAN ) ? "without" : "with" );
689689 adev -> pm .int_thermal_type = THERMAL_TYPE_EVERGREEN ;
690690 } else if (controller -> ucType == ATOM_PP_THERMALCONTROLLER_SUMO ) {
691- DRM_INFO ( "Internal thermal controller %s fan control\n" ,
691+ drm_info ( adev_to_drm ( adev ), "Internal thermal controller %s fan control\n" ,
692692 (controller -> ucFanParameters &
693693 ATOM_PP_FANPARAMETERS_NOFAN ) ? "without" : "with" );
694694 adev -> pm .int_thermal_type = THERMAL_TYPE_SUMO ;
695695 } else if (controller -> ucType == ATOM_PP_THERMALCONTROLLER_NISLANDS ) {
696- DRM_INFO ( "Internal thermal controller %s fan control\n" ,
696+ drm_info ( adev_to_drm ( adev ), "Internal thermal controller %s fan control\n" ,
697697 (controller -> ucFanParameters &
698698 ATOM_PP_FANPARAMETERS_NOFAN ) ? "without" : "with" );
699699 adev -> pm .int_thermal_type = THERMAL_TYPE_NI ;
700700 } else if (controller -> ucType == ATOM_PP_THERMALCONTROLLER_SISLANDS ) {
701- DRM_INFO ( "Internal thermal controller %s fan control\n" ,
701+ drm_info ( adev_to_drm ( adev ), "Internal thermal controller %s fan control\n" ,
702702 (controller -> ucFanParameters &
703703 ATOM_PP_FANPARAMETERS_NOFAN ) ? "without" : "with" );
704704 adev -> pm .int_thermal_type = THERMAL_TYPE_SI ;
705705 } else if (controller -> ucType == ATOM_PP_THERMALCONTROLLER_CISLANDS ) {
706- DRM_INFO ( "Internal thermal controller %s fan control\n" ,
706+ drm_info ( adev_to_drm ( adev ), "Internal thermal controller %s fan control\n" ,
707707 (controller -> ucFanParameters &
708708 ATOM_PP_FANPARAMETERS_NOFAN ) ? "without" : "with" );
709709 adev -> pm .int_thermal_type = THERMAL_TYPE_CI ;
710710 } else if (controller -> ucType == ATOM_PP_THERMALCONTROLLER_KAVERI ) {
711- DRM_INFO ( "Internal thermal controller %s fan control\n" ,
711+ drm_info ( adev_to_drm ( adev ), "Internal thermal controller %s fan control\n" ,
712712 (controller -> ucFanParameters &
713713 ATOM_PP_FANPARAMETERS_NOFAN ) ? "without" : "with" );
714714 adev -> pm .int_thermal_type = THERMAL_TYPE_KV ;
715715 } else if (controller -> ucType == ATOM_PP_THERMALCONTROLLER_EXTERNAL_GPIO ) {
716- DRM_INFO ( "External GPIO thermal controller %s fan control\n" ,
716+ drm_info ( adev_to_drm ( adev ), "External GPIO thermal controller %s fan control\n" ,
717717 (controller -> ucFanParameters &
718718 ATOM_PP_FANPARAMETERS_NOFAN ) ? "without" : "with" );
719719 adev -> pm .int_thermal_type = THERMAL_TYPE_EXTERNAL_GPIO ;
720720 } else if (controller -> ucType ==
721721 ATOM_PP_THERMALCONTROLLER_ADT7473_WITH_INTERNAL ) {
722- DRM_INFO ( "ADT7473 with internal thermal controller %s fan control\n" ,
722+ drm_info ( adev_to_drm ( adev ), "ADT7473 with internal thermal controller %s fan control\n" ,
723723 (controller -> ucFanParameters &
724724 ATOM_PP_FANPARAMETERS_NOFAN ) ? "without" : "with" );
725725 adev -> pm .int_thermal_type = THERMAL_TYPE_ADT7473_WITH_INTERNAL ;
726726 } else if (controller -> ucType ==
727727 ATOM_PP_THERMALCONTROLLER_EMC2103_WITH_INTERNAL ) {
728- DRM_INFO ( "EMC2103 with internal thermal controller %s fan control\n" ,
728+ drm_info ( adev_to_drm ( adev ), "EMC2103 with internal thermal controller %s fan control\n" ,
729729 (controller -> ucFanParameters &
730730 ATOM_PP_FANPARAMETERS_NOFAN ) ? "without" : "with" );
731731 adev -> pm .int_thermal_type = THERMAL_TYPE_EMC2103_WITH_INTERNAL ;
732732 } else if (controller -> ucType < ARRAY_SIZE (pp_lib_thermal_controller_names )) {
733- DRM_INFO ( "Possible %s thermal controller at 0x%02x %s fan control\n" ,
733+ drm_info ( adev_to_drm ( adev ), "Possible %s thermal controller at 0x%02x %s fan control\n" ,
734734 pp_lib_thermal_controller_names [controller -> ucType ],
735735 controller -> ucI2cAddress >> 1 ,
736736 (controller -> ucFanParameters &
@@ -746,7 +746,7 @@ void amdgpu_add_thermal_controller(struct amdgpu_device *adev)
746746 i2c_new_client_device (& adev -> pm .i2c_bus -> adapter , & info );
747747 }
748748 } else {
749- DRM_INFO ( "Unknown thermal controller type %d at 0x%02x %s fan control\n" ,
749+ drm_info ( adev_to_drm ( adev ), "Unknown thermal controller type %d at 0x%02x %s fan control\n" ,
750750 controller -> ucType ,
751751 controller -> ucI2cAddress >> 1 ,
752752 (controller -> ucFanParameters &
0 commit comments