* [PATCH 1/1] drm/amd/display: WARN_ON cleanups
@ 2021-05-27 12:14 Nirmoy Das
2021-05-27 12:16 ` Das, Nirmoy
2021-05-28 15:28 ` Christian König
0 siblings, 2 replies; 5+ messages in thread
From: Nirmoy Das @ 2021-05-27 12:14 UTC (permalink / raw)
To: harry.wentland; +Cc: alexander.deucher, Nirmoy Das, christian.koenig, amd-gfx
Uuse WARN_ON() inside if-condition when possible.
Signed-off-by: Nirmoy Das <nirmoy.das@amd.com>
---
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index f2ed51484980..736eb537a8e4 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -315,8 +315,7 @@ get_crtc_by_otg_inst(struct amdgpu_device *adev,
struct drm_crtc *crtc;
struct amdgpu_crtc *amdgpu_crtc;
- if (otg_inst == -1) {
- WARN_ON(1);
+ if (WARN_ON(otg_inst == -1)) {
return adev->mode_info.crtcs[0];
}
@@ -397,8 +396,7 @@ static void dm_pflip_high_irq(void *interrupt_params)
e = amdgpu_crtc->event;
amdgpu_crtc->event = NULL;
- if (!e)
- WARN_ON(1);
+ WARN_ON(!e);
vrr_active = amdgpu_dm_vrr_active_irq(amdgpu_crtc);
@@ -6698,9 +6696,8 @@ static int dm_crtc_helper_atomic_check(struct drm_crtc *crtc,
dm_update_crtc_active_planes(crtc, crtc_state);
- if (unlikely(!dm_crtc_state->stream &&
- modeset_required(crtc_state, NULL, dm_crtc_state->stream))) {
- WARN_ON(1);
+ if (WARN_ON(unlikely(!dm_crtc_state->stream &&
+ modeset_required(crtc_state, NULL, dm_crtc_state->stream)))) {
return ret;
}
--
2.31.1
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 5+ messages in thread
* RE: [PATCH 1/1] drm/amd/display: WARN_ON cleanups
2021-05-27 12:14 [PATCH 1/1] drm/amd/display: WARN_ON cleanups Nirmoy Das
@ 2021-05-27 12:16 ` Das, Nirmoy
2021-05-27 15:06 ` Deucher, Alexander
2021-05-28 15:28 ` Christian König
1 sibling, 1 reply; 5+ messages in thread
From: Das, Nirmoy @ 2021-05-27 12:16 UTC (permalink / raw)
To: Wentland, Harry; +Cc: Deucher, Alexander, Koenig, Christian, amd-gfx
[AMD Official Use Only]
s/Uuse/use
-----Original Message-----
From: Das, Nirmoy <Nirmoy.Das@amd.com>
Sent: Thursday, May 27, 2021 2:15 PM
To: Wentland, Harry <Harry.Wentland@amd.com>
Cc: Deucher, Alexander <Alexander.Deucher@amd.com>; Koenig, Christian <Christian.Koenig@amd.com>; amd-gfx@lists.freedesktop.org; Das, Nirmoy <Nirmoy.Das@amd.com>
Subject: [PATCH 1/1] drm/amd/display: WARN_ON cleanups
Uuse WARN_ON() inside if-condition when possible.
Signed-off-by: Nirmoy Das <nirmoy.das@amd.com>
---
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index f2ed51484980..736eb537a8e4 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -315,8 +315,7 @@ get_crtc_by_otg_inst(struct amdgpu_device *adev,
struct drm_crtc *crtc;
struct amdgpu_crtc *amdgpu_crtc;
- if (otg_inst == -1) {
- WARN_ON(1);
+ if (WARN_ON(otg_inst == -1)) {
return adev->mode_info.crtcs[0];
}
@@ -397,8 +396,7 @@ static void dm_pflip_high_irq(void *interrupt_params)
e = amdgpu_crtc->event;
amdgpu_crtc->event = NULL;
- if (!e)
- WARN_ON(1);
+ WARN_ON(!e);
vrr_active = amdgpu_dm_vrr_active_irq(amdgpu_crtc);
@@ -6698,9 +6696,8 @@ static int dm_crtc_helper_atomic_check(struct drm_crtc *crtc,
dm_update_crtc_active_planes(crtc, crtc_state);
- if (unlikely(!dm_crtc_state->stream &&
- modeset_required(crtc_state, NULL, dm_crtc_state->stream))) {
- WARN_ON(1);
+ if (WARN_ON(unlikely(!dm_crtc_state->stream &&
+ modeset_required(crtc_state, NULL, dm_crtc_state->stream)))) {
return ret;
}
--
2.31.1
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 1/1] drm/amd/display: WARN_ON cleanups
2021-05-27 12:16 ` Das, Nirmoy
@ 2021-05-27 15:06 ` Deucher, Alexander
0 siblings, 0 replies; 5+ messages in thread
From: Deucher, Alexander @ 2021-05-27 15:06 UTC (permalink / raw)
To: Das, Nirmoy, Wentland, Harry; +Cc: Koenig, Christian, amd-gfx
[-- Attachment #1.1: Type: text/plain, Size: 2460 bytes --]
[Public]
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
________________________________
From: Das, Nirmoy <Nirmoy.Das@amd.com>
Sent: Thursday, May 27, 2021 8:16 AM
To: Wentland, Harry <Harry.Wentland@amd.com>
Cc: Deucher, Alexander <Alexander.Deucher@amd.com>; Koenig, Christian <Christian.Koenig@amd.com>; amd-gfx@lists.freedesktop.org <amd-gfx@lists.freedesktop.org>
Subject: RE: [PATCH 1/1] drm/amd/display: WARN_ON cleanups
[AMD Official Use Only]
s/Uuse/use
-----Original Message-----
From: Das, Nirmoy <Nirmoy.Das@amd.com>
Sent: Thursday, May 27, 2021 2:15 PM
To: Wentland, Harry <Harry.Wentland@amd.com>
Cc: Deucher, Alexander <Alexander.Deucher@amd.com>; Koenig, Christian <Christian.Koenig@amd.com>; amd-gfx@lists.freedesktop.org; Das, Nirmoy <Nirmoy.Das@amd.com>
Subject: [PATCH 1/1] drm/amd/display: WARN_ON cleanups
Uuse WARN_ON() inside if-condition when possible.
Signed-off-by: Nirmoy Das <nirmoy.das@amd.com>
---
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index f2ed51484980..736eb537a8e4 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -315,8 +315,7 @@ get_crtc_by_otg_inst(struct amdgpu_device *adev,
struct drm_crtc *crtc;
struct amdgpu_crtc *amdgpu_crtc;
- if (otg_inst == -1) {
- WARN_ON(1);
+ if (WARN_ON(otg_inst == -1)) {
return adev->mode_info.crtcs[0];
}
@@ -397,8 +396,7 @@ static void dm_pflip_high_irq(void *interrupt_params)
e = amdgpu_crtc->event;
amdgpu_crtc->event = NULL;
- if (!e)
- WARN_ON(1);
+ WARN_ON(!e);
vrr_active = amdgpu_dm_vrr_active_irq(amdgpu_crtc);
@@ -6698,9 +6696,8 @@ static int dm_crtc_helper_atomic_check(struct drm_crtc *crtc,
dm_update_crtc_active_planes(crtc, crtc_state);
- if (unlikely(!dm_crtc_state->stream &&
- modeset_required(crtc_state, NULL, dm_crtc_state->stream))) {
- WARN_ON(1);
+ if (WARN_ON(unlikely(!dm_crtc_state->stream &&
+ modeset_required(crtc_state, NULL, dm_crtc_state->stream)))) {
return ret;
}
--
2.31.1
[-- Attachment #1.2: Type: text/html, Size: 4739 bytes --]
[-- Attachment #2: Type: text/plain, Size: 154 bytes --]
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 1/1] drm/amd/display: WARN_ON cleanups
2021-05-27 12:14 [PATCH 1/1] drm/amd/display: WARN_ON cleanups Nirmoy Das
2021-05-27 12:16 ` Das, Nirmoy
@ 2021-05-28 15:28 ` Christian König
2021-05-28 16:26 ` Das, Nirmoy
1 sibling, 1 reply; 5+ messages in thread
From: Christian König @ 2021-05-28 15:28 UTC (permalink / raw)
To: Nirmoy Das, harry.wentland; +Cc: alexander.deucher, christian.koenig, amd-gfx
Am 27.05.21 um 14:14 schrieb Nirmoy Das:
> Uuse WARN_ON() inside if-condition when possible.
>
> Signed-off-by: Nirmoy Das <nirmoy.das@amd.com>
> ---
> drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 11 ++++-------
> 1 file changed, 4 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> index f2ed51484980..736eb537a8e4 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> @@ -315,8 +315,7 @@ get_crtc_by_otg_inst(struct amdgpu_device *adev,
> struct drm_crtc *crtc;
> struct amdgpu_crtc *amdgpu_crtc;
>
> - if (otg_inst == -1) {
> - WARN_ON(1);
> + if (WARN_ON(otg_inst == -1)) {
> return adev->mode_info.crtcs[0];
> }
While at it you could also drop the extra {} here.
Apart from that patch is Acked-by: Christian König
<christian.koenig@amd.com>.
Christian.
>
> @@ -397,8 +396,7 @@ static void dm_pflip_high_irq(void *interrupt_params)
> e = amdgpu_crtc->event;
> amdgpu_crtc->event = NULL;
>
> - if (!e)
> - WARN_ON(1);
> + WARN_ON(!e);
>
> vrr_active = amdgpu_dm_vrr_active_irq(amdgpu_crtc);
>
> @@ -6698,9 +6696,8 @@ static int dm_crtc_helper_atomic_check(struct drm_crtc *crtc,
>
> dm_update_crtc_active_planes(crtc, crtc_state);
>
> - if (unlikely(!dm_crtc_state->stream &&
> - modeset_required(crtc_state, NULL, dm_crtc_state->stream))) {
> - WARN_ON(1);
> + if (WARN_ON(unlikely(!dm_crtc_state->stream &&
> + modeset_required(crtc_state, NULL, dm_crtc_state->stream)))) {
> return ret;
> }
>
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/1] drm/amd/display: WARN_ON cleanups
2021-05-28 15:28 ` Christian König
@ 2021-05-28 16:26 ` Das, Nirmoy
0 siblings, 0 replies; 5+ messages in thread
From: Das, Nirmoy @ 2021-05-28 16:26 UTC (permalink / raw)
To: Christian König, harry.wentland
Cc: alexander.deucher, christian.koenig, amd-gfx
On 5/28/2021 5:28 PM, Christian König wrote:
>
>
> Am 27.05.21 um 14:14 schrieb Nirmoy Das:
>> Uuse WARN_ON() inside if-condition when possible.
>>
>> Signed-off-by: Nirmoy Das <nirmoy.das@amd.com>
>> ---
>> drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 11 ++++-------
>> 1 file changed, 4 insertions(+), 7 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
>> b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
>> index f2ed51484980..736eb537a8e4 100644
>> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
>> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
>> @@ -315,8 +315,7 @@ get_crtc_by_otg_inst(struct amdgpu_device *adev,
>> struct drm_crtc *crtc;
>> struct amdgpu_crtc *amdgpu_crtc;
>> - if (otg_inst == -1) {
>> - WARN_ON(1);
>> + if (WARN_ON(otg_inst == -1)) {
>> return adev->mode_info.crtcs[0];
>> }
>
> While at it you could also drop the extra {} here.
I merged it this morning :/ I will speak with Alex to clean this up.
Nirmoy
>
> Apart from that patch is Acked-by: Christian König
> <christian.koenig@amd.com>.
>
> Christian.
>
>> @@ -397,8 +396,7 @@ static void dm_pflip_high_irq(void
>> *interrupt_params)
>> e = amdgpu_crtc->event;
>> amdgpu_crtc->event = NULL;
>> - if (!e)
>> - WARN_ON(1);
>> + WARN_ON(!e);
>> vrr_active = amdgpu_dm_vrr_active_irq(amdgpu_crtc);
>> @@ -6698,9 +6696,8 @@ static int dm_crtc_helper_atomic_check(struct
>> drm_crtc *crtc,
>> dm_update_crtc_active_planes(crtc, crtc_state);
>> - if (unlikely(!dm_crtc_state->stream &&
>> - modeset_required(crtc_state, NULL,
>> dm_crtc_state->stream))) {
>> - WARN_ON(1);
>> + if (WARN_ON(unlikely(!dm_crtc_state->stream &&
>> + modeset_required(crtc_state, NULL,
>> dm_crtc_state->stream)))) {
>> return ret;
>> }
>
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-05-28 16:26 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-27 12:14 [PATCH 1/1] drm/amd/display: WARN_ON cleanups Nirmoy Das
2021-05-27 12:16 ` Das, Nirmoy
2021-05-27 15:06 ` Deucher, Alexander
2021-05-28 15:28 ` Christian König
2021-05-28 16:26 ` Das, Nirmoy
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.