From: Harry Wentland <harry.wentland@amd.com>
To: Alex Deucher <alexdeucher@gmail.com>,
Luben Tuikov <luben.tuikov@amd.com>
Cc: Alex Deucher <alexander.deucher@amd.com>,
amd-gfx list <amd-gfx@lists.freedesktop.org>
Subject: Re: [PATCH] drm/amd/display: Use DRM_DEBUG_DP
Date: Tue, 23 Mar 2021 12:01:44 -0400 [thread overview]
Message-ID: <9042072e-107a-eec8-2357-962698d91d0e@amd.com> (raw)
In-Reply-To: <CADnq5_OrcLoBH7d1n1aL9eCQSqaajgYaU5ypXwzgm+-DPaahpw@mail.gmail.com>
Thanks for converting these away from _DRIVER.
On 2021-03-23 10:26 a.m., Alex Deucher wrote:
> On Mon, Mar 22, 2021 at 8:31 PM Luben Tuikov <luben.tuikov@amd.com> wrote:
>>
>> Convert IRQ-based prints from DRM_DEBUG_DRIVER to
>> DRM_DEBUG_DP, as the latter is not used in drm/amd
>> prior to this patch and since IRQ-based prints
>> drown out the rest of the driver's
>> DRM_DEBUG_DRIVER messages.
>>
>> Cc: Harry Wentland <Harry.Wentland@amd.com>
>> Cc: Alex Deucher <alexander.deucher@amd.com>
>> Signed-off-by: Luben Tuikov <luben.tuikov@amd.com>
>> ---
>> .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 67 +++++++++----------
>> 1 file changed, 33 insertions(+), 34 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 f455fc3aa561..aabaa652f6dc 100644
>> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
>> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
>> @@ -449,9 +449,9 @@ static void dm_pflip_high_irq(void *interrupt_params)
>> amdgpu_crtc->pflip_status = AMDGPU_FLIP_NONE;
>> spin_unlock_irqrestore(&adev_to_drm(adev)->event_lock, flags);
>>
>> - DRM_DEBUG_DRIVER("crtc:%d[%p], pflip_stat:AMDGPU_FLIP_NONE, vrr[%d]-fp %d\n",
>> - amdgpu_crtc->crtc_id, amdgpu_crtc,
>> - vrr_active, (int) !e);
>> + DRM_DEBUG_DP("crtc:%d[%p], pflip_stat:AMDGPU_FLIP_NONE, vrr[%d]-fp %d\n",
>
> Should probably be _KMS or _ATOMIC since this is not displayport specific.
It looks like _ATOMIC is strictly for code dealing with atomic. KMS is a
better bet.
_KMS
>
>> + amdgpu_crtc->crtc_id, amdgpu_crtc,
>> + vrr_active, (int) !e);
>> }
>>
>> static void dm_vupdate_high_irq(void *interrupt_params)
>> @@ -993,8 +993,7 @@ static void event_mall_stutter(struct work_struct *work)
>> dc_allow_idle_optimizations(
>> dm->dc, dm->active_vblank_irq_count == 0);
>>
>> - DRM_DEBUG_DRIVER("Allow idle optimizations (MALL): %d\n", dm->active_vblank_irq_count == 0);
>> -
>> + DRM_DEBUG_DP("Allow idle optimizations (MALL): %d\n", dm->active_vblank_irq_count == 0);
>
> Maybe _VBL or _KMS or _ATOMIC?
>
_KMS
>>
>> mutex_unlock(&dm->dc_lock);
>> }
>> @@ -1810,8 +1809,8 @@ static void dm_gpureset_toggle_interrupts(struct amdgpu_device *adev,
>> if (acrtc && state->stream_status[i].plane_count != 0) {
>> irq_source = IRQ_TYPE_PFLIP + acrtc->otg_inst;
>> rc = dc_interrupt_set(adev->dm.dc, irq_source, enable) ? 0 : -EBUSY;
>> - DRM_DEBUG("crtc %d - vupdate irq %sabling: r=%d\n",
>> - acrtc->crtc_id, enable ? "en" : "dis", rc);
>> + DRM_DEBUG_DP("crtc %d - vupdate irq %sabling: r=%d\n",
>> + acrtc->crtc_id, enable ? "en" : "dis", rc);
>
> I think this should be _VBL.
>
_VBL
>> if (rc)
>> DRM_WARN("Failed to %s pflip interrupts\n",
>> enable ? "enable" : "disable");
>> @@ -4966,8 +4965,8 @@ static void update_stream_scaling_settings(const struct drm_display_mode *mode,
>> stream->src = src;
>> stream->dst = dst;
>>
>> - DRM_DEBUG_DRIVER("Destination Rectangle x:%d y:%d width:%d height:%d\n",
>> - dst.x, dst.y, dst.width, dst.height);
>> + DRM_DEBUG_DP("Destination Rectangle x:%d y:%d width:%d height:%d\n",
>> + dst.x, dst.y, dst.width, dst.height);
>
> Should probably be _KMS or _ATOMIC since this is not displayport specific.
>
_KMS
>>
>> }
>>
>> @@ -5710,8 +5709,8 @@ static inline int dm_set_vupdate_irq(struct drm_crtc *crtc, bool enable)
>>
>> rc = dc_interrupt_set(adev->dm.dc, irq_source, enable) ? 0 : -EBUSY;
>>
>> - DRM_DEBUG_DRIVER("crtc %d - vupdate irq %sabling: r=%d\n",
>> - acrtc->crtc_id, enable ? "en" : "dis", rc);
>> + DRM_DEBUG_DP("crtc %d - vupdate irq %sabling: r=%d\n",
>> + acrtc->crtc_id, enable ? "en" : "dis", rc);
>
> Should probably be _VBL.
>
_VBL
>> return rc;
>> }
>>
>> @@ -6664,7 +6663,7 @@ static int dm_plane_helper_prepare_fb(struct drm_plane *plane,
>> int r;
>>
>> if (!new_state->fb) {
>> - DRM_DEBUG_DRIVER("No FB bound\n");
>> + DRM_DEBUG_DP("No FB bound\n");
>
> Should probably be _KMS or _ATOMIC since this is not displayport specific.
>
_KMS
>> return 0;
>> }
>>
>> @@ -7896,11 +7895,11 @@ static void handle_cursor_update(struct drm_plane *plane,
>> if (!plane->state->fb && !old_plane_state->fb)
>> return;
>>
>> - DRM_DEBUG_DRIVER("%s: crtc_id=%d with size %d to %d\n",
>> - __func__,
>> - amdgpu_crtc->crtc_id,
>> - plane->state->crtc_w,
>> - plane->state->crtc_h);
>> + DRM_DEBUG_DP("%s: crtc_id=%d with size %d to %d\n",
>> + __func__,
>> + amdgpu_crtc->crtc_id,
>> + plane->state->crtc_w,
>> + plane->state->crtc_h);
>
> Should probably be _KMS or _ATOMIC since this is not displayport specific.
_KMS
>
>>
>> ret = get_cursor_position(plane, crtc, &position);
>> if (ret)
>> @@ -7958,8 +7957,8 @@ static void prepare_flip_isr(struct amdgpu_crtc *acrtc)
>> /* Mark this event as consumed */
>> acrtc->base.state->event = NULL;
>>
>> - DRM_DEBUG_DRIVER("crtc:%d, pflip_stat:AMDGPU_FLIP_SUBMITTED\n",
>> - acrtc->crtc_id);
>> + DRM_DEBUG_DP("crtc:%d, pflip_stat:AMDGPU_FLIP_SUBMITTED\n",
>> + acrtc->crtc_id);
>
> Should probably be _KMS or _ATOMIC since this is not displayport specific.
_KMS
>
>> }
>>
>> static void update_freesync_state_on_stream(
>> @@ -8265,9 +8264,9 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state,
>> &bundle->flip_addrs[planes_count].address,
>> afb->tmz_surface, false);
>>
>> - DRM_DEBUG_DRIVER("plane: id=%d dcc_en=%d\n",
>> - new_plane_state->plane->index,
>> - bundle->plane_infos[planes_count].dcc.enable);
>> + DRM_DEBUG_DP("plane: id=%d dcc_en=%d\n",
>> + new_plane_state->plane->index,
>> + bundle->plane_infos[planes_count].dcc.enable);
>
> Should probably be _ATOMIC.
_ATOMIC here and below
Harry
>
>>
>> bundle->surface_updates[planes_count].plane_info =
>> &bundle->plane_infos[planes_count];
>> @@ -8299,10 +8298,10 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state,
>> dc_plane,
>> bundle->flip_addrs[planes_count].flip_timestamp_in_us);
>>
>> - DRM_DEBUG_DRIVER("%s Flipping to hi: 0x%x, low: 0x%x\n",
>> - __func__,
>> - bundle->flip_addrs[planes_count].address.grph.addr.high_part,
>> - bundle->flip_addrs[planes_count].address.grph.addr.low_part);
>> + DRM_DEBUG_DP("%s Flipping to hi: 0x%x, low: 0x%x\n",
>> + __func__,
>> + bundle->flip_addrs[planes_count].address.grph.addr.high_part,
>> + bundle->flip_addrs[planes_count].address.grph.addr.low_part);
>>
>
> Same here.
>
>> planes_count += 1;
>>
>> @@ -8621,7 +8620,7 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state)
>> dm_new_crtc_state = to_dm_crtc_state(new_crtc_state);
>> dm_old_crtc_state = to_dm_crtc_state(old_crtc_state);
>>
>> - DRM_DEBUG_DRIVER(
>> + DRM_DEBUG_DP(
>
> And here.
>
>> "amdgpu_crtc id:%d crtc_state_flags: enable:%d, active:%d, "
>> "planes_changed:%d, mode_changed:%d,active_changed:%d,"
>> "connectors_changed:%d\n",
>> @@ -8655,7 +8654,7 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state)
>>
>> if (modeset_required(new_crtc_state, dm_new_crtc_state->stream, dm_old_crtc_state->stream)) {
>>
>> - DRM_DEBUG_DRIVER("Atomic commit: SET crtc id %d: [%p]\n", acrtc->crtc_id, acrtc);
>> + DRM_DEBUG_DP("Atomic commit: SET crtc id %d: [%p]\n", acrtc->crtc_id, acrtc);
>>
>
> And here.
>
>> if (!dm_new_crtc_state->stream) {
>> /*
>> @@ -8688,7 +8687,7 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state)
>> crtc->hwmode = new_crtc_state->mode;
>> mode_set_reset_required = true;
>> } else if (modereset_required(new_crtc_state)) {
>> - DRM_DEBUG_DRIVER("Atomic commit: RESET. crtc id %d:[%p]\n", acrtc->crtc_id, acrtc);
>> + DRM_DEBUG_DP("Atomic commit: RESET. crtc id %d:[%p]\n", acrtc->crtc_id, acrtc);
>
> And here.
>
>> /* i.e. reset mode */
>> if (dm_old_crtc_state->stream)
>> remove_stream(adev, acrtc, dm_old_crtc_state->stream);
>> @@ -9298,7 +9297,7 @@ static int dm_update_crtc_state(struct amdgpu_display_manager *dm,
>> if (!drm_atomic_crtc_needs_modeset(new_crtc_state))
>> goto skip_modeset;
>>
>> - DRM_DEBUG_DRIVER(
>> + DRM_DEBUG_DP(
>
> Should probably be _KMS or _ATOMIC since this is not displayport specific.
>
>> "amdgpu_crtc id:%d crtc_state_flags: enable:%d, active:%d, "
>> "planes_changed:%d, mode_changed:%d,active_changed:%d,"
>> "connectors_changed:%d\n",
>> @@ -9382,8 +9381,8 @@ static int dm_update_crtc_state(struct amdgpu_display_manager *dm,
>>
>> dc_stream_retain(new_stream);
>>
>> - DRM_DEBUG_DRIVER("Enabling DRM crtc: %d\n",
>> - crtc->base.id);
>> + DRM_DEBUG_DP("Enabling DRM crtc: %d\n",
>> + crtc->base.id);
>>
>
> Same here.
>
>> if (dc_add_stream_to_ctx(
>> dm->dc,
>> @@ -9728,8 +9727,8 @@ static int dm_update_plane_state(struct dc *dc,
>> if (!dc_new_plane_state)
>> return -ENOMEM;
>>
>> - DRM_DEBUG_DRIVER("Enabling DRM plane: %d on DRM crtc %d\n",
>> - plane->base.id, new_plane_crtc->base.id);
>> + DRM_DEBUG_DP("Enabling DRM plane: %d on DRM crtc %d\n",
>> + plane->base.id, new_plane_crtc->base.id);
>>
>
> And here.
>
>> ret = fill_dc_plane_attributes(
>> drm_to_adev(new_plane_crtc->dev),
>> --
>> 2.31.0.rc2
>>
>> _______________________________________________
>> amd-gfx mailing list
>> amd-gfx@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/amd-gfx>
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
next prev parent reply other threads:[~2021-03-23 16:01 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-23 0:31 [PATCH] drm/amd/display: Use DRM_DEBUG_DP Luben Tuikov
2021-03-23 14:26 ` Alex Deucher
2021-03-23 16:01 ` Harry Wentland [this message]
2021-03-23 20:26 ` Luben Tuikov
2021-03-23 23:07 ` [PATCH v2] " Luben Tuikov
2021-03-24 2:34 ` [PATCH] " Deucher, Alexander
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=9042072e-107a-eec8-2357-962698d91d0e@amd.com \
--to=harry.wentland@amd.com \
--cc=alexander.deucher@amd.com \
--cc=alexdeucher@gmail.com \
--cc=amd-gfx@lists.freedesktop.org \
--cc=luben.tuikov@amd.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.