diff options
author | Samuel Li <Samuel.Li@amd.com> | 2018-01-19 11:53:31 -0500 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2018-02-19 14:18:23 -0500 |
commit | 775a8364251644e8baaf9f11f028097b6f69a518 (patch) | |
tree | 1cbb0eb5f35b7e312455e9eca0caba76cde00d8d | |
parent | 0cd119323697b8068c2c9997901e7709c8d231aa (diff) |
drm/amdgpu: rename amdgpu_crtc_set_config
Add display to the name for consistency.
Signed-off-by: Samuel Li <Samuel.Li@amd.com>
Acked-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 4 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 4 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c index 6eb7e1f33ce5..465d9a443f41 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | |||
@@ -257,8 +257,8 @@ cleanup: | |||
257 | return r; | 257 | return r; |
258 | } | 258 | } |
259 | 259 | ||
260 | int amdgpu_crtc_set_config(struct drm_mode_set *set, | 260 | int amdgpu_display_crtc_set_config(struct drm_mode_set *set, |
261 | struct drm_modeset_acquire_ctx *ctx) | 261 | struct drm_modeset_acquire_ctx *ctx) |
262 | { | 262 | { |
263 | struct drm_device *dev; | 263 | struct drm_device *dev; |
264 | struct amdgpu_device *adev; | 264 | struct amdgpu_device *adev; |
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h index 1b51612c9f1d..f94cf3845041 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | |||
@@ -664,8 +664,8 @@ int amdgpu_align_pitch(struct amdgpu_device *adev, int width, int bpp, bool tile | |||
664 | /* amdgpu_display.c */ | 664 | /* amdgpu_display.c */ |
665 | void amdgpu_print_display_setup(struct drm_device *dev); | 665 | void amdgpu_print_display_setup(struct drm_device *dev); |
666 | int amdgpu_modeset_create_props(struct amdgpu_device *adev); | 666 | int amdgpu_modeset_create_props(struct amdgpu_device *adev); |
667 | int amdgpu_crtc_set_config(struct drm_mode_set *set, | 667 | int amdgpu_display_crtc_set_config(struct drm_mode_set *set, |
668 | struct drm_modeset_acquire_ctx *ctx); | 668 | struct drm_modeset_acquire_ctx *ctx); |
669 | int amdgpu_display_crtc_page_flip_target(struct drm_crtc *crtc, | 669 | int amdgpu_display_crtc_page_flip_target(struct drm_crtc *crtc, |
670 | struct drm_framebuffer *fb, | 670 | struct drm_framebuffer *fb, |
671 | struct drm_pending_vblank_event *event, | 671 | struct drm_pending_vblank_event *event, |
diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c index 751b52f14764..a5d401add93d 100644 --- a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c +++ b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | |||
@@ -2517,7 +2517,7 @@ static const struct drm_crtc_funcs dce_v10_0_crtc_funcs = { | |||
2517 | .cursor_set2 = dce_v10_0_crtc_cursor_set2, | 2517 | .cursor_set2 = dce_v10_0_crtc_cursor_set2, |
2518 | .cursor_move = dce_v10_0_crtc_cursor_move, | 2518 | .cursor_move = dce_v10_0_crtc_cursor_move, |
2519 | .gamma_set = dce_v10_0_crtc_gamma_set, | 2519 | .gamma_set = dce_v10_0_crtc_gamma_set, |
2520 | .set_config = amdgpu_crtc_set_config, | 2520 | .set_config = amdgpu_display_crtc_set_config, |
2521 | .destroy = dce_v10_0_crtc_destroy, | 2521 | .destroy = dce_v10_0_crtc_destroy, |
2522 | .page_flip_target = amdgpu_display_crtc_page_flip_target, | 2522 | .page_flip_target = amdgpu_display_crtc_page_flip_target, |
2523 | }; | 2523 | }; |
diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c index 6502e5f4dd60..90900f76d6d6 100644 --- a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c +++ b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | |||
@@ -2592,7 +2592,7 @@ static const struct drm_crtc_funcs dce_v11_0_crtc_funcs = { | |||
2592 | .cursor_set2 = dce_v11_0_crtc_cursor_set2, | 2592 | .cursor_set2 = dce_v11_0_crtc_cursor_set2, |
2593 | .cursor_move = dce_v11_0_crtc_cursor_move, | 2593 | .cursor_move = dce_v11_0_crtc_cursor_move, |
2594 | .gamma_set = dce_v11_0_crtc_gamma_set, | 2594 | .gamma_set = dce_v11_0_crtc_gamma_set, |
2595 | .set_config = amdgpu_crtc_set_config, | 2595 | .set_config = amdgpu_display_crtc_set_config, |
2596 | .destroy = dce_v11_0_crtc_destroy, | 2596 | .destroy = dce_v11_0_crtc_destroy, |
2597 | .page_flip_target = amdgpu_display_crtc_page_flip_target, | 2597 | .page_flip_target = amdgpu_display_crtc_page_flip_target, |
2598 | }; | 2598 | }; |
diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c index 433de9f2c51d..9d4eeebcb5ab 100644 --- a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c +++ b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | |||
@@ -2407,7 +2407,7 @@ static const struct drm_crtc_funcs dce_v6_0_crtc_funcs = { | |||
2407 | .cursor_set2 = dce_v6_0_crtc_cursor_set2, | 2407 | .cursor_set2 = dce_v6_0_crtc_cursor_set2, |
2408 | .cursor_move = dce_v6_0_crtc_cursor_move, | 2408 | .cursor_move = dce_v6_0_crtc_cursor_move, |
2409 | .gamma_set = dce_v6_0_crtc_gamma_set, | 2409 | .gamma_set = dce_v6_0_crtc_gamma_set, |
2410 | .set_config = amdgpu_crtc_set_config, | 2410 | .set_config = amdgpu_display_crtc_set_config, |
2411 | .destroy = dce_v6_0_crtc_destroy, | 2411 | .destroy = dce_v6_0_crtc_destroy, |
2412 | .page_flip_target = amdgpu_display_crtc_page_flip_target, | 2412 | .page_flip_target = amdgpu_display_crtc_page_flip_target, |
2413 | }; | 2413 | }; |
diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c index 0988751bfc8c..6fb31aa76567 100644 --- a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c +++ b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | |||
@@ -2421,7 +2421,7 @@ static const struct drm_crtc_funcs dce_v8_0_crtc_funcs = { | |||
2421 | .cursor_set2 = dce_v8_0_crtc_cursor_set2, | 2421 | .cursor_set2 = dce_v8_0_crtc_cursor_set2, |
2422 | .cursor_move = dce_v8_0_crtc_cursor_move, | 2422 | .cursor_move = dce_v8_0_crtc_cursor_move, |
2423 | .gamma_set = dce_v8_0_crtc_gamma_set, | 2423 | .gamma_set = dce_v8_0_crtc_gamma_set, |
2424 | .set_config = amdgpu_crtc_set_config, | 2424 | .set_config = amdgpu_display_crtc_set_config, |
2425 | .destroy = dce_v8_0_crtc_destroy, | 2425 | .destroy = dce_v8_0_crtc_destroy, |
2426 | .page_flip_target = amdgpu_display_crtc_page_flip_target, | 2426 | .page_flip_target = amdgpu_display_crtc_page_flip_target, |
2427 | }; | 2427 | }; |
diff --git a/drivers/gpu/drm/amd/amdgpu/dce_virtual.c b/drivers/gpu/drm/amd/amdgpu/dce_virtual.c index 7b037874bb54..0c3d2507662c 100644 --- a/drivers/gpu/drm/amd/amdgpu/dce_virtual.c +++ b/drivers/gpu/drm/amd/amdgpu/dce_virtual.c | |||
@@ -130,7 +130,7 @@ static const struct drm_crtc_funcs dce_virtual_crtc_funcs = { | |||
130 | .cursor_set2 = NULL, | 130 | .cursor_set2 = NULL, |
131 | .cursor_move = NULL, | 131 | .cursor_move = NULL, |
132 | .gamma_set = dce_virtual_crtc_gamma_set, | 132 | .gamma_set = dce_virtual_crtc_gamma_set, |
133 | .set_config = amdgpu_crtc_set_config, | 133 | .set_config = amdgpu_display_crtc_set_config, |
134 | .destroy = dce_virtual_crtc_destroy, | 134 | .destroy = dce_virtual_crtc_destroy, |
135 | .page_flip_target = amdgpu_display_crtc_page_flip_target, | 135 | .page_flip_target = amdgpu_display_crtc_page_flip_target, |
136 | }; | 136 | }; |