Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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>

authored by

Rodrigo Siqueira and committed by
Alex Deucher
6ce4f9ee 0d93f395

+24 -24
+24 -24
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c
··· 96 96 dm_state->freesync_config.state == VRR_STATE_ACTIVE_FIXED; 97 97 } 98 98 99 - static void vblank_control_worker(struct work_struct *work) 99 + static void amdgpu_dm_crtc_vblank_control_worker(struct work_struct *work) 100 100 { 101 101 struct vblank_control_work *vblank_work = 102 102 container_of(work, struct vblank_control_work, work); ··· 151 151 kfree(vblank_work); 152 152 } 153 153 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) 155 155 { 156 156 struct amdgpu_crtc *acrtc = to_amdgpu_crtc(crtc); 157 157 struct amdgpu_device *adev = drm_to_adev(crtc->dev); ··· 191 191 if (!work) 192 192 return -ENOMEM; 193 193 194 - INIT_WORK(&work->work, vblank_control_worker); 194 + INIT_WORK(&work->work, amdgpu_dm_crtc_vblank_control_worker); 195 195 work->dm = dm; 196 196 work->acrtc = acrtc; 197 197 work->enable = enable; ··· 209 209 210 210 int amdgpu_dm_crtc_enable_vblank(struct drm_crtc *crtc) 211 211 { 212 - return dm_set_vblank(crtc, true); 212 + return amdgpu_dm_crtc_set_vblank(crtc, true); 213 213 } 214 214 215 215 void amdgpu_dm_crtc_disable_vblank(struct drm_crtc *crtc) 216 216 { 217 - dm_set_vblank(crtc, false); 217 + amdgpu_dm_crtc_set_vblank(crtc, false); 218 218 } 219 219 220 - static void dm_crtc_destroy_state(struct drm_crtc *crtc, 220 + static void amdgpu_dm_crtc_destroy_state(struct drm_crtc *crtc, 221 221 struct drm_crtc_state *state) 222 222 { 223 223 struct dm_crtc_state *cur = to_dm_crtc_state(state); ··· 233 233 kfree(state); 234 234 } 235 235 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) 237 237 { 238 238 struct dm_crtc_state *state, *cur; 239 239 ··· 273 273 kfree(crtc); 274 274 } 275 275 276 - static void dm_crtc_reset_state(struct drm_crtc *crtc) 276 + static void amdgpu_dm_crtc_reset_state(struct drm_crtc *crtc) 277 277 { 278 278 struct dm_crtc_state *state; 279 279 280 280 if (crtc->state) 281 - dm_crtc_destroy_state(crtc, crtc->state); 281 + amdgpu_dm_crtc_destroy_state(crtc, crtc->state); 282 282 283 283 state = kzalloc(sizeof(*state), GFP_KERNEL); 284 284 if (WARN_ON(!state)) ··· 298 298 299 299 /* Implemented only the options currently available for the driver */ 300 300 static const struct drm_crtc_funcs amdgpu_dm_crtc_funcs = { 301 - .reset = dm_crtc_reset_state, 301 + .reset = amdgpu_dm_crtc_reset_state, 302 302 .destroy = amdgpu_dm_crtc_destroy, 303 303 .set_config = drm_atomic_helper_set_config, 304 304 .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, 307 307 .set_crc_source = amdgpu_dm_crtc_set_crc_source, 308 308 .verify_crc_source = amdgpu_dm_crtc_verify_crc_source, 309 309 .get_crc_sources = amdgpu_dm_crtc_get_crc_sources, ··· 316 316 #endif 317 317 }; 318 318 319 - static void dm_crtc_helper_disable(struct drm_crtc *crtc) 319 + static void amdgpu_dm_crtc_helper_disable(struct drm_crtc *crtc) 320 320 { 321 321 } 322 322 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) 324 324 { 325 325 struct drm_atomic_state *state = new_crtc_state->state; 326 326 struct drm_plane *plane; ··· 352 352 return num_active; 353 353 } 354 354 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) 357 357 { 358 358 struct dm_crtc_state *dm_new_crtc_state = 359 359 to_dm_crtc_state(new_crtc_state); ··· 364 364 return; 365 365 366 366 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); 368 368 } 369 369 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, 371 371 const struct drm_display_mode *mode, 372 372 struct drm_display_mode *adjusted_mode) 373 373 { 374 374 return true; 375 375 } 376 376 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) 379 379 { 380 380 struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state, 381 381 crtc); ··· 386 386 387 387 trace_amdgpu_dm_crtc_atomic_check(crtc_state); 388 388 389 - dm_update_crtc_active_planes(crtc, crtc_state); 389 + amdgpu_dm_crtc_update_crtc_active_planes(crtc, crtc_state); 390 390 391 391 if (WARN_ON(unlikely(!dm_crtc_state->stream && 392 392 amdgpu_dm_crtc_modeset_required(crtc_state, NULL, dm_crtc_state->stream)))) { ··· 429 429 } 430 430 431 431 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, 435 435 .get_scanout_position = amdgpu_crtc_get_scanout_position, 436 436 }; 437 437