Skip to content

Commit 6ce4f9e

Browse files
Rodrigo Siqueiraalexdeucher
authored andcommitted
drm/amd/display: Add prefix to amdgpu crtc functions
The ftrace debug feature allows filtering functions based on a prefix, which can be helpful in some complex debug scenarios. The driver can benefit more from this feature if the function name follows some patterns; for this reason, this commit adds the prefix amdgpu_dm_crtc_ to all the functions that do not have it in the amdgpu_dm_crtc.c file. Reviewed-by: Aurabindo Pillai <aurabindo.pillai@amd.com> Acked-by: Roman Li <roman.li@amd.com> Signed-off-by: Rodrigo Siqueira <rodrigo.siqueira@amd.com> Tested-by: Daniel Wheeler <daniel.wheeler@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
1 parent 0d93f39 commit 6ce4f9e

1 file changed

Lines changed: 24 additions & 24 deletions

File tree

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

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ bool amdgpu_dm_crtc_vrr_active(struct dm_crtc_state *dm_state)
9696
dm_state->freesync_config.state == VRR_STATE_ACTIVE_FIXED;
9797
}
9898

99-
static void vblank_control_worker(struct work_struct *work)
99+
static void amdgpu_dm_crtc_vblank_control_worker(struct work_struct *work)
100100
{
101101
struct vblank_control_work *vblank_work =
102102
container_of(work, struct vblank_control_work, work);
@@ -151,7 +151,7 @@ static void vblank_control_worker(struct work_struct *work)
151151
kfree(vblank_work);
152152
}
153153

154-
static inline int dm_set_vblank(struct drm_crtc *crtc, bool enable)
154+
static inline int amdgpu_dm_crtc_set_vblank(struct drm_crtc *crtc, bool enable)
155155
{
156156
struct amdgpu_crtc *acrtc = to_amdgpu_crtc(crtc);
157157
struct amdgpu_device *adev = drm_to_adev(crtc->dev);
@@ -191,7 +191,7 @@ static inline int dm_set_vblank(struct drm_crtc *crtc, bool enable)
191191
if (!work)
192192
return -ENOMEM;
193193

194-
INIT_WORK(&work->work, vblank_control_worker);
194+
INIT_WORK(&work->work, amdgpu_dm_crtc_vblank_control_worker);
195195
work->dm = dm;
196196
work->acrtc = acrtc;
197197
work->enable = enable;
@@ -209,15 +209,15 @@ static inline int dm_set_vblank(struct drm_crtc *crtc, bool enable)
209209

210210
int amdgpu_dm_crtc_enable_vblank(struct drm_crtc *crtc)
211211
{
212-
return dm_set_vblank(crtc, true);
212+
return amdgpu_dm_crtc_set_vblank(crtc, true);
213213
}
214214

215215
void amdgpu_dm_crtc_disable_vblank(struct drm_crtc *crtc)
216216
{
217-
dm_set_vblank(crtc, false);
217+
amdgpu_dm_crtc_set_vblank(crtc, false);
218218
}
219219

220-
static void dm_crtc_destroy_state(struct drm_crtc *crtc,
220+
static void amdgpu_dm_crtc_destroy_state(struct drm_crtc *crtc,
221221
struct drm_crtc_state *state)
222222
{
223223
struct dm_crtc_state *cur = to_dm_crtc_state(state);
@@ -233,7 +233,7 @@ static void dm_crtc_destroy_state(struct drm_crtc *crtc,
233233
kfree(state);
234234
}
235235

236-
static struct drm_crtc_state *dm_crtc_duplicate_state(struct drm_crtc *crtc)
236+
static struct drm_crtc_state *amdgpu_dm_crtc_duplicate_state(struct drm_crtc *crtc)
237237
{
238238
struct dm_crtc_state *state, *cur;
239239

@@ -273,12 +273,12 @@ static void amdgpu_dm_crtc_destroy(struct drm_crtc *crtc)
273273
kfree(crtc);
274274
}
275275

276-
static void dm_crtc_reset_state(struct drm_crtc *crtc)
276+
static void amdgpu_dm_crtc_reset_state(struct drm_crtc *crtc)
277277
{
278278
struct dm_crtc_state *state;
279279

280280
if (crtc->state)
281-
dm_crtc_destroy_state(crtc, crtc->state);
281+
amdgpu_dm_crtc_destroy_state(crtc, crtc->state);
282282

283283
state = kzalloc(sizeof(*state), GFP_KERNEL);
284284
if (WARN_ON(!state))
@@ -298,12 +298,12 @@ static int amdgpu_dm_crtc_late_register(struct drm_crtc *crtc)
298298

299299
/* Implemented only the options currently available for the driver */
300300
static const struct drm_crtc_funcs amdgpu_dm_crtc_funcs = {
301-
.reset = dm_crtc_reset_state,
301+
.reset = amdgpu_dm_crtc_reset_state,
302302
.destroy = amdgpu_dm_crtc_destroy,
303303
.set_config = drm_atomic_helper_set_config,
304304
.page_flip = drm_atomic_helper_page_flip,
305-
.atomic_duplicate_state = dm_crtc_duplicate_state,
306-
.atomic_destroy_state = dm_crtc_destroy_state,
305+
.atomic_duplicate_state = amdgpu_dm_crtc_duplicate_state,
306+
.atomic_destroy_state = amdgpu_dm_crtc_destroy_state,
307307
.set_crc_source = amdgpu_dm_crtc_set_crc_source,
308308
.verify_crc_source = amdgpu_dm_crtc_verify_crc_source,
309309
.get_crc_sources = amdgpu_dm_crtc_get_crc_sources,
@@ -316,11 +316,11 @@ static const struct drm_crtc_funcs amdgpu_dm_crtc_funcs = {
316316
#endif
317317
};
318318

319-
static void dm_crtc_helper_disable(struct drm_crtc *crtc)
319+
static void amdgpu_dm_crtc_helper_disable(struct drm_crtc *crtc)
320320
{
321321
}
322322

323-
static int count_crtc_active_planes(struct drm_crtc_state *new_crtc_state)
323+
static int amdgpu_dm_crtc_count_crtc_active_planes(struct drm_crtc_state *new_crtc_state)
324324
{
325325
struct drm_atomic_state *state = new_crtc_state->state;
326326
struct drm_plane *plane;
@@ -352,8 +352,8 @@ static int count_crtc_active_planes(struct drm_crtc_state *new_crtc_state)
352352
return num_active;
353353
}
354354

355-
static void dm_update_crtc_active_planes(struct drm_crtc *crtc,
356-
struct drm_crtc_state *new_crtc_state)
355+
static void amdgpu_dm_crtc_update_crtc_active_planes(struct drm_crtc *crtc,
356+
struct drm_crtc_state *new_crtc_state)
357357
{
358358
struct dm_crtc_state *dm_new_crtc_state =
359359
to_dm_crtc_state(new_crtc_state);
@@ -364,18 +364,18 @@ static void dm_update_crtc_active_planes(struct drm_crtc *crtc,
364364
return;
365365

366366
dm_new_crtc_state->active_planes =
367-
count_crtc_active_planes(new_crtc_state);
367+
amdgpu_dm_crtc_count_crtc_active_planes(new_crtc_state);
368368
}
369369

370-
static bool dm_crtc_helper_mode_fixup(struct drm_crtc *crtc,
370+
static bool amdgpu_dm_crtc_helper_mode_fixup(struct drm_crtc *crtc,
371371
const struct drm_display_mode *mode,
372372
struct drm_display_mode *adjusted_mode)
373373
{
374374
return true;
375375
}
376376

377-
static int dm_crtc_helper_atomic_check(struct drm_crtc *crtc,
378-
struct drm_atomic_state *state)
377+
static int amdgpu_dm_crtc_helper_atomic_check(struct drm_crtc *crtc,
378+
struct drm_atomic_state *state)
379379
{
380380
struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state,
381381
crtc);
@@ -386,7 +386,7 @@ static int dm_crtc_helper_atomic_check(struct drm_crtc *crtc,
386386

387387
trace_amdgpu_dm_crtc_atomic_check(crtc_state);
388388

389-
dm_update_crtc_active_planes(crtc, crtc_state);
389+
amdgpu_dm_crtc_update_crtc_active_planes(crtc, crtc_state);
390390

391391
if (WARN_ON(unlikely(!dm_crtc_state->stream &&
392392
amdgpu_dm_crtc_modeset_required(crtc_state, NULL, dm_crtc_state->stream)))) {
@@ -429,9 +429,9 @@ static int dm_crtc_helper_atomic_check(struct drm_crtc *crtc,
429429
}
430430

431431
static const struct drm_crtc_helper_funcs amdgpu_dm_crtc_helper_funcs = {
432-
.disable = dm_crtc_helper_disable,
433-
.atomic_check = dm_crtc_helper_atomic_check,
434-
.mode_fixup = dm_crtc_helper_mode_fixup,
432+
.disable = amdgpu_dm_crtc_helper_disable,
433+
.atomic_check = amdgpu_dm_crtc_helper_atomic_check,
434+
.mode_fixup = amdgpu_dm_crtc_helper_mode_fixup,
435435
.get_scanout_position = amdgpu_crtc_get_scanout_position,
436436
};
437437

0 commit comments

Comments
 (0)