Skip to content

Commit 71573db

Browse files
Aurabindo Pillaialexdeucher
authored andcommitted
drm/amd/display: switch to drm_dbg_ macros instead of DRM_DEBUG_ variants
Device pointer sources used: - connector->dev - when a DRM connector was available - old_plane_crtc->dev / new_plane_crtc->dev - for plane state functions - pass in drm_device - for the stream scaling function - aconnector->base.dev - for the VSDB parsing function Reviewed-by: Sun peng (Leo) Li <sunpeng.li@amd.com> Signed-off-by: Aurabindo Pillai <aurabindo.pillai@amd.com> Signed-off-by: Matthew Stewart <matthew.stewart2@amd.com> Tested-by: Dan Wheeler <daniel.wheeler@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
1 parent 869e386 commit 71573db

1 file changed

Lines changed: 13 additions & 12 deletions

File tree

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6418,7 +6418,8 @@ static void fill_dc_dirty_rects(struct drm_plane *plane,
64186418
&flip_addrs->dirty_rect_count, true);
64196419
}
64206420

6421-
static void update_stream_scaling_settings(const struct drm_display_mode *mode,
6421+
static void update_stream_scaling_settings(struct drm_device *dev,
6422+
const struct drm_display_mode *mode,
64226423
const struct dm_connector_state *dm_state,
64236424
struct dc_stream_state *stream)
64246425
{
@@ -6468,8 +6469,8 @@ static void update_stream_scaling_settings(const struct drm_display_mode *mode,
64686469
stream->src = src;
64696470
stream->dst = dst;
64706471

6471-
DRM_DEBUG_KMS("Destination Rectangle x:%d y:%d width:%d height:%d\n",
6472-
dst.x, dst.y, dst.width, dst.height);
6472+
drm_dbg_kms(dev, "Destination Rectangle x:%d y:%d width:%d height:%d\n",
6473+
dst.x, dst.y, dst.width, dst.height);
64736474

64746475
}
64756476

@@ -7357,7 +7358,7 @@ create_stream_for_sink(struct drm_connector *connector,
73577358
apply_dsc_policy_for_stream(aconnector, sink, stream, &dsc_caps);
73587359
#endif
73597360

7360-
update_stream_scaling_settings(&mode, dm_state, stream);
7361+
update_stream_scaling_settings(dev, &mode, dm_state, stream);
73617362

73627363
fill_audio_info(
73637364
&stream->audio_info,
@@ -8092,7 +8093,7 @@ create_validate_stream_for_sink(struct drm_connector *connector,
80928093
dc_result = dm_validate_stream_and_context(adev->dm.dc, stream);
80938094

80948095
if (dc_result != DC_OK) {
8095-
DRM_DEBUG_KMS("Pruned mode %d x %d (clk %d) %s %s -- %s\n",
8096+
drm_dbg_kms(connector->dev, "Pruned mode %d x %d (clk %d) %s %s -- %s\n",
80968097
drm_mode->hdisplay,
80978098
drm_mode->vdisplay,
80988099
drm_mode->clock,
@@ -8444,7 +8445,7 @@ static int dm_encoder_helper_atomic_check(struct drm_encoder *encoder,
84448445
drm_dp_atomic_find_time_slots(state, mst_mgr, mst_port,
84458446
dm_new_connector_state->pbn);
84468447
if (dm_new_connector_state->vcpi_slots < 0) {
8447-
DRM_DEBUG_ATOMIC("failed finding vcpi slots: %d\n", (int)dm_new_connector_state->vcpi_slots);
8448+
drm_dbg_atomic(connector->dev, "failed finding vcpi slots: %d\n", (int)dm_new_connector_state->vcpi_slots);
84488449
return dm_new_connector_state->vcpi_slots;
84498450
}
84508451
return 0;
@@ -10894,7 +10895,7 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state)
1089410895

1089510896
stream_update.stream = dm_new_crtc_state->stream;
1089610897
if (scaling_changed) {
10897-
update_stream_scaling_settings(&dm_new_con_state->base.crtc->mode,
10898+
update_stream_scaling_settings(dev, &dm_new_con_state->base.crtc->mode,
1089810899
dm_new_con_state, dm_new_crtc_state->stream);
1089910900

1090010901
stream_update.src = dm_new_crtc_state->stream->src;
@@ -11613,7 +11614,7 @@ static int dm_update_crtc_state(struct amdgpu_display_manager *dm,
1161311614
/* Scaling or underscan settings */
1161411615
if (is_scaling_state_different(dm_old_conn_state, dm_new_conn_state) ||
1161511616
drm_atomic_crtc_needs_modeset(new_crtc_state))
11616-
update_stream_scaling_settings(
11617+
update_stream_scaling_settings(adev_to_drm(adev),
1161711618
&new_crtc_state->mode, dm_new_conn_state, dm_new_crtc_state->stream);
1161811619

1161911620
/* ABM settings */
@@ -11876,7 +11877,7 @@ static int dm_check_native_cursor_state(struct drm_crtc *new_plane_crtc,
1187611877
new_acrtc = to_amdgpu_crtc(new_plane_crtc);
1187711878

1187811879
if (new_plane_state->src_x != 0 || new_plane_state->src_y != 0) {
11879-
DRM_DEBUG_ATOMIC("Cropping not supported for cursor plane\n");
11880+
drm_dbg_atomic(new_plane_crtc->dev, "Cropping not supported for cursor plane\n");
1188011881
return -EINVAL;
1188111882
}
1188211883

@@ -11975,7 +11976,7 @@ static int dm_update_plane_state(struct dc *dc,
1197511976
if (!dm_old_crtc_state->stream)
1197611977
return 0;
1197711978

11978-
DRM_DEBUG_ATOMIC("Disabling DRM plane: %d on DRM crtc %d\n",
11979+
drm_dbg_atomic(old_plane_crtc->dev, "Disabling DRM plane: %d on DRM crtc %d\n",
1197911980
plane->base.id, old_plane_crtc->base.id);
1198011981

1198111982
ret = dm_atomic_get_state(state, &dm_state);
@@ -12028,7 +12029,7 @@ static int dm_update_plane_state(struct dc *dc,
1202812029
goto out;
1202912030
}
1203012031

12031-
DRM_DEBUG_ATOMIC("Enabling DRM plane: %d on DRM crtc %d\n",
12032+
drm_dbg_atomic(new_plane_crtc->dev, "Enabling DRM plane: %d on DRM crtc %d\n",
1203212033
plane->base.id, new_plane_crtc->base.id);
1203312034

1203412035
ret = fill_dc_plane_attributes(
@@ -13120,7 +13121,7 @@ static int parse_amd_vsdb(struct amdgpu_dm_connector *aconnector,
1312013121
amd_vsdb->version == HDMI_AMD_VENDOR_SPECIFIC_DATA_BLOCK_VERSION_3) {
1312113122
vsdb_info->replay_mode = (amd_vsdb->feature_caps & AMD_VSDB_VERSION_3_FEATURECAP_REPLAYMODE) ? true : false;
1312213123
vsdb_info->amd_vsdb_version = HDMI_AMD_VENDOR_SPECIFIC_DATA_BLOCK_VERSION_3;
13123-
DRM_DEBUG_KMS("Panel supports Replay Mode: %d\n", vsdb_info->replay_mode);
13124+
drm_dbg_kms(aconnector->base.dev, "Panel supports Replay Mode: %d\n", vsdb_info->replay_mode);
1312413125

1312513126
return true;
1312613127
}

0 commit comments

Comments
 (0)