[PATCH v2] drm/radeon: Do not use deprecated drm log API

[PATCH v2] drm/radeon: Do not use deprecated drm log API

[Nirmoy Das]

Replace deprecated DRM_DEBUG_KMS_RATELIMITED() and DRM_ERROR()
with proper APIs.

v2: replace pr_err with dev_err(Alex).

Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: Christian König <christian.koenig@amd.com>

Signed-off-by: Nirmoy Das <nirmoy.das@intel.com>
---
 drivers/gpu/drm/radeon/radeon_dp_auxch.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/radeon/radeon_dp_auxch.c b/drivers/gpu/drm/radeon/radeon_dp_auxch.c
index 69379b95146e..1e5b6baf76a1 100644
--- a/drivers/gpu/drm/radeon/radeon_dp_auxch.c
+++ b/drivers/gpu/drm/radeon/radeon_dp_auxch.c
@@ -158,7 +158,7 @@ radeon_dp_aux_transfer_native(struct drm_dp_aux *aux, struct drm_dp_aux_msg *msg
 	} while (retry_count++ < 1000);
 
 	if (retry_count >= 1000) {
-		DRM_ERROR("auxch hw never signalled completion, error %08x\n", tmp);
+		dev_err(rdev->dev, "auxch hw never signalled completion, error %08x\n", tmp);
 		ret = -EIO;
 		goto done;
 	}
@@ -168,8 +168,7 @@ radeon_dp_aux_transfer_native(struct drm_dp_aux *aux, struct drm_dp_aux_msg *msg
 		goto done;
 	}
 	if (tmp & AUX_RX_ERROR_FLAGS) {
-		DRM_DEBUG_KMS_RATELIMITED("dp_aux_ch flags not zero: %08x\n",
-					  tmp);
+		drm_dbg_kms_ratelimited(dev, "dp_aux_ch flags not zero: %08x\n", tmp);
 		ret = -EIO;
 		goto done;
 	}
-- 
2.39.0

[PATCH 2/2] drm_print: Remove deprecated DRM_DEBUG_KMS_RATELIMITED()

[Nirmoy Das]

There are no current users of DRM_DEBUG_KMS_RATELIMITED()
so remove it.

Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Maxime Ripard <mripard@kernel.org>
Cc: Thomas Zimmermann <tzimmermann@suse.de>
Cc: David Airlie <airlied@gmail.com>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Sam Ravnborg <sam@ravnborg.org>

Signed-off-by: Nirmoy Das <nirmoy.das@intel.com>
Reviewed-by: Sam Ravnborg <sam@ravnborg.org>
---
 include/drm/drm_print.h | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/include/drm/drm_print.h b/include/drm/drm_print.h
index a44fb7ef257f..c3753da97c4e 100644
--- a/include/drm/drm_print.h
+++ b/include/drm/drm_print.h
@@ -605,9 +605,6 @@ void __drm_err(const char *format, ...);
 #define drm_dbg_kms_ratelimited(drm, fmt, ...) \
 	__DRM_DEFINE_DBG_RATELIMITED(KMS, drm, fmt, ## __VA_ARGS__)
 
-/* NOTE: this is deprecated in favor of drm_dbg_kms_ratelimited(NULL, ...). */
-#define DRM_DEBUG_KMS_RATELIMITED(fmt, ...) drm_dbg_kms_ratelimited(NULL, fmt, ## __VA_ARGS__)
-
 /*
  * struct drm_device based WARNs
  *
-- 
2.39.0

Re: [PATCH 2/2] drm_print: Remove deprecated DRM_DEBUG_KMS_RATELIMITED()

[Alex Deucher]

On Tue, Jan 17, 2023 at 1:05 PM Nirmoy Das <nirmoy.das@intel.com> wrote:
>
> There are no current users of DRM_DEBUG_KMS_RATELIMITED()
> so remove it.
>
> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> Cc: Maxime Ripard <mripard@kernel.org>
> Cc: Thomas Zimmermann <tzimmermann@suse.de>
> Cc: David Airlie <airlied@gmail.com>
> Cc: Daniel Vetter <daniel@ffwll.ch>
> Cc: Sam Ravnborg <sam@ravnborg.org>
>
> Signed-off-by: Nirmoy Das <nirmoy.das@intel.com>
> Reviewed-by: Sam Ravnborg <sam@ravnborg.org>

Series is:
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>

Feel free to take the patches through whatever tree you want.

Alex

> ---
>  include/drm/drm_print.h | 3 ---
>  1 file changed, 3 deletions(-)
>
> diff --git a/include/drm/drm_print.h b/include/drm/drm_print.h
> index a44fb7ef257f..c3753da97c4e 100644
> --- a/include/drm/drm_print.h
> +++ b/include/drm/drm_print.h
> @@ -605,9 +605,6 @@ void __drm_err(const char *format, ...);
>  #define drm_dbg_kms_ratelimited(drm, fmt, ...) \
>         __DRM_DEFINE_DBG_RATELIMITED(KMS, drm, fmt, ## __VA_ARGS__)
>
> -/* NOTE: this is deprecated in favor of drm_dbg_kms_ratelimited(NULL, ...). */
> -#define DRM_DEBUG_KMS_RATELIMITED(fmt, ...) drm_dbg_kms_ratelimited(NULL, fmt, ## __VA_ARGS__)
> -
>  /*
>   * struct drm_device based WARNs
>   *
> --
> 2.39.0
>

Re: [PATCH 2/2] drm_print: Remove deprecated DRM_DEBUG_KMS_RATELIMITED()

[Das, Nirmoy]

Hi Alex,

On 1/17/2023 7:06 PM, Alex Deucher wrote:
> On Tue, Jan 17, 2023 at 1:05 PM Nirmoy Das <nirmoy.das@intel.com> wrote:
>> There are no current users of DRM_DEBUG_KMS_RATELIMITED()
>> so remove it.
>>
>> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
>> Cc: Maxime Ripard <mripard@kernel.org>
>> Cc: Thomas Zimmermann <tzimmermann@suse.de>
>> Cc: David Airlie <airlied@gmail.com>
>> Cc: Daniel Vetter <daniel@ffwll.ch>
>> Cc: Sam Ravnborg <sam@ravnborg.org>
>>
>> Signed-off-by: Nirmoy Das <nirmoy.das@intel.com>
>> Reviewed-by: Sam Ravnborg <sam@ravnborg.org>
> Series is:
> Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
>
> Feel free to take the patches through whatever tree you want.


Please help me with this, I don't have committer rights for any tree.


Nirmoy


>
> Alex
>
>> ---
>>   include/drm/drm_print.h | 3 ---
>>   1 file changed, 3 deletions(-)
>>
>> diff --git a/include/drm/drm_print.h b/include/drm/drm_print.h
>> index a44fb7ef257f..c3753da97c4e 100644
>> --- a/include/drm/drm_print.h
>> +++ b/include/drm/drm_print.h
>> @@ -605,9 +605,6 @@ void __drm_err(const char *format, ...);
>>   #define drm_dbg_kms_ratelimited(drm, fmt, ...) \
>>          __DRM_DEFINE_DBG_RATELIMITED(KMS, drm, fmt, ## __VA_ARGS__)
>>
>> -/* NOTE: this is deprecated in favor of drm_dbg_kms_ratelimited(NULL, ...). */
>> -#define DRM_DEBUG_KMS_RATELIMITED(fmt, ...) drm_dbg_kms_ratelimited(NULL, fmt, ## __VA_ARGS__)
>> -
>>   /*
>>    * struct drm_device based WARNs
>>    *
>> --
>> 2.39.0
>>

Re: [PATCH 2/2] drm_print: Remove deprecated DRM_DEBUG_KMS_RATELIMITED()

[Christian König]

Am 17.01.23 um 19:12 schrieb Das, Nirmoy:
> Hi Alex,
>
> On 1/17/2023 7:06 PM, Alex Deucher wrote:
>> On Tue, Jan 17, 2023 at 1:05 PM Nirmoy Das <nirmoy.das@intel.com> wrote:
>>> There are no current users of DRM_DEBUG_KMS_RATELIMITED()
>>> so remove it.
>>>
>>> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
>>> Cc: Maxime Ripard <mripard@kernel.org>
>>> Cc: Thomas Zimmermann <tzimmermann@suse.de>
>>> Cc: David Airlie <airlied@gmail.com>
>>> Cc: Daniel Vetter <daniel@ffwll.ch>
>>> Cc: Sam Ravnborg <sam@ravnborg.org>
>>>
>>> Signed-off-by: Nirmoy Das <nirmoy.das@intel.com>
>>> Reviewed-by: Sam Ravnborg <sam@ravnborg.org>
>> Series is:
>> Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
>>
>> Feel free to take the patches through whatever tree you want.
>
>
> Please help me with this, I don't have committer rights for any tree.

Going to push that into drm-misc-next later today.

Thanks,
Christian.

>
>
> Nirmoy
>
>
>>
>> Alex
>>
>>> ---
>>>   include/drm/drm_print.h | 3 ---
>>>   1 file changed, 3 deletions(-)
>>>
>>> diff --git a/include/drm/drm_print.h b/include/drm/drm_print.h
>>> index a44fb7ef257f..c3753da97c4e 100644
>>> --- a/include/drm/drm_print.h
>>> +++ b/include/drm/drm_print.h
>>> @@ -605,9 +605,6 @@ void __drm_err(const char *format, ...);
>>>   #define drm_dbg_kms_ratelimited(drm, fmt, ...) \
>>>          __DRM_DEFINE_DBG_RATELIMITED(KMS, drm, fmt, ## __VA_ARGS__)
>>>
>>> -/* NOTE: this is deprecated in favor of 
>>> drm_dbg_kms_ratelimited(NULL, ...). */
>>> -#define DRM_DEBUG_KMS_RATELIMITED(fmt, ...) 
>>> drm_dbg_kms_ratelimited(NULL, fmt, ## __VA_ARGS__)
>>> -
>>>   /*
>>>    * struct drm_device based WARNs
>>>    *
>>> -- 
>>> 2.39.0
>>>

Re: [PATCH 2/2] drm_print: Remove deprecated DRM_DEBUG_KMS_RATELIMITED()

[Das, Nirmoy]

On 1/18/2023 7:27 AM, Christian König wrote:
>
>
> Am 17.01.23 um 19:12 schrieb Das, Nirmoy:
>> Hi Alex,
>>
>> On 1/17/2023 7:06 PM, Alex Deucher wrote:
>>> On Tue, Jan 17, 2023 at 1:05 PM Nirmoy Das <nirmoy.das@intel.com> 
>>> wrote:
>>>> There are no current users of DRM_DEBUG_KMS_RATELIMITED()
>>>> so remove it.
>>>>
>>>> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
>>>> Cc: Maxime Ripard <mripard@kernel.org>
>>>> Cc: Thomas Zimmermann <tzimmermann@suse.de>
>>>> Cc: David Airlie <airlied@gmail.com>
>>>> Cc: Daniel Vetter <daniel@ffwll.ch>
>>>> Cc: Sam Ravnborg <sam@ravnborg.org>
>>>>
>>>> Signed-off-by: Nirmoy Das <nirmoy.das@intel.com>
>>>> Reviewed-by: Sam Ravnborg <sam@ravnborg.org>
>>> Series is:
>>> Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
>>>
>>> Feel free to take the patches through whatever tree you want.
>>
>>
>> Please help me with this, I don't have committer rights for any tree.
>
> Going to push that into drm-misc-next later today.


Thanks, Christian.


>
> Thanks,
> Christian.
>
>>
>>
>> Nirmoy
>>
>>
>>>
>>> Alex
>>>
>>>> ---
>>>>   include/drm/drm_print.h | 3 ---
>>>>   1 file changed, 3 deletions(-)
>>>>
>>>> diff --git a/include/drm/drm_print.h b/include/drm/drm_print.h
>>>> index a44fb7ef257f..c3753da97c4e 100644
>>>> --- a/include/drm/drm_print.h
>>>> +++ b/include/drm/drm_print.h
>>>> @@ -605,9 +605,6 @@ void __drm_err(const char *format, ...);
>>>>   #define drm_dbg_kms_ratelimited(drm, fmt, ...) \
>>>>          __DRM_DEFINE_DBG_RATELIMITED(KMS, drm, fmt, ## __VA_ARGS__)
>>>>
>>>> -/* NOTE: this is deprecated in favor of 
>>>> drm_dbg_kms_ratelimited(NULL, ...). */
>>>> -#define DRM_DEBUG_KMS_RATELIMITED(fmt, ...) 
>>>> drm_dbg_kms_ratelimited(NULL, fmt, ## __VA_ARGS__)
>>>> -
>>>>   /*
>>>>    * struct drm_device based WARNs
>>>>    *
>>>> -- 
>>>> 2.39.0
>>>>
>

Re: [PATCH v2] drm/radeon: Do not use deprecated drm log API

[Sam Ravnborg]

Hi Nirmoy,
On Tue, Jan 17, 2023 at 07:04:16PM +0100, Nirmoy Das wrote:
> Replace deprecated DRM_DEBUG_KMS_RATELIMITED() and DRM_ERROR()
> with proper APIs.
Thanks for working on this!

Also thanks for Christian to take care and apply the patches.

	Sam