diff options
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 2 | ||||
-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 |
6 files changed, 6 insertions, 6 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c index 465d9a443f41..8b4e99ebc229 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | |||
@@ -355,7 +355,7 @@ static const char *hpd_names[6] = { | |||
355 | "HPD6", | 355 | "HPD6", |
356 | }; | 356 | }; |
357 | 357 | ||
358 | void amdgpu_print_display_setup(struct drm_device *dev) | 358 | void amdgpu_display_print_display_setup(struct drm_device *dev) |
359 | { | 359 | { |
360 | struct drm_connector *connector; | 360 | struct drm_connector *connector; |
361 | struct amdgpu_connector *amdgpu_connector; | 361 | struct amdgpu_connector *amdgpu_connector; |
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h index f94cf3845041..1f0c238d1e30 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | |||
@@ -662,7 +662,7 @@ bool amdgpu_fbdev_robj_is_fb(struct amdgpu_device *adev, struct amdgpu_bo *robj) | |||
662 | int amdgpu_align_pitch(struct amdgpu_device *adev, int width, int bpp, bool tiled); | 662 | int amdgpu_align_pitch(struct amdgpu_device *adev, int width, int bpp, bool tiled); |
663 | 663 | ||
664 | /* amdgpu_display.c */ | 664 | /* amdgpu_display.c */ |
665 | void amdgpu_print_display_setup(struct drm_device *dev); | 665 | void amdgpu_display_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_display_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); |
diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c index a5d401add93d..fa8bf0088ddf 100644 --- a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c +++ b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | |||
@@ -2841,7 +2841,7 @@ static int dce_v10_0_sw_init(void *handle) | |||
2841 | } | 2841 | } |
2842 | 2842 | ||
2843 | if (amdgpu_atombios_get_connector_info_from_object_table(adev)) | 2843 | if (amdgpu_atombios_get_connector_info_from_object_table(adev)) |
2844 | amdgpu_print_display_setup(adev->ddev); | 2844 | amdgpu_display_print_display_setup(adev->ddev); |
2845 | else | 2845 | else |
2846 | return -EINVAL; | 2846 | return -EINVAL; |
2847 | 2847 | ||
diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c index 90900f76d6d6..b8baa7380130 100644 --- a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c +++ b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | |||
@@ -2957,7 +2957,7 @@ static int dce_v11_0_sw_init(void *handle) | |||
2957 | } | 2957 | } |
2958 | 2958 | ||
2959 | if (amdgpu_atombios_get_connector_info_from_object_table(adev)) | 2959 | if (amdgpu_atombios_get_connector_info_from_object_table(adev)) |
2960 | amdgpu_print_display_setup(adev->ddev); | 2960 | amdgpu_display_print_display_setup(adev->ddev); |
2961 | else | 2961 | else |
2962 | return -EINVAL; | 2962 | return -EINVAL; |
2963 | 2963 | ||
diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c index 9d4eeebcb5ab..91b91a6e320e 100644 --- a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c +++ b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | |||
@@ -2711,7 +2711,7 @@ static int dce_v6_0_sw_init(void *handle) | |||
2711 | 2711 | ||
2712 | ret = amdgpu_atombios_get_connector_info_from_object_table(adev); | 2712 | ret = amdgpu_atombios_get_connector_info_from_object_table(adev); |
2713 | if (ret) | 2713 | if (ret) |
2714 | amdgpu_print_display_setup(adev->ddev); | 2714 | amdgpu_display_print_display_setup(adev->ddev); |
2715 | else | 2715 | else |
2716 | return -EINVAL; | 2716 | return -EINVAL; |
2717 | 2717 | ||
diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c index 6fb31aa76567..1386424e6bcd 100644 --- a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c +++ b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | |||
@@ -2741,7 +2741,7 @@ static int dce_v8_0_sw_init(void *handle) | |||
2741 | } | 2741 | } |
2742 | 2742 | ||
2743 | if (amdgpu_atombios_get_connector_info_from_object_table(adev)) | 2743 | if (amdgpu_atombios_get_connector_info_from_object_table(adev)) |
2744 | amdgpu_print_display_setup(adev->ddev); | 2744 | amdgpu_display_print_display_setup(adev->ddev); |
2745 | else | 2745 | else |
2746 | return -EINVAL; | 2746 | return -EINVAL; |
2747 | 2747 | ||