aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Li <Samuel.Li@amd.com>2018-01-19 15:36:43 -0500
committerAlex Deucher <alexander.deucher@amd.com>2018-02-19 14:18:27 -0500
commit0c16443a1b4b532a23465d7004be4ddf87df6b71 (patch)
tree7d69cb2a9a5e947fc20db5510090151cf8ca60f2
parent166140fb24638da93013aa909c0268d2a7b9e759 (diff)
drm/amdgpu: rename amdgpu_crtc_scaling_mode_fixup
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.c6
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h6
-rw-r--r--drivers/gpu/drm/amd/amdgpu/dce_v10_0.c2
-rw-r--r--drivers/gpu/drm/amd/amdgpu/dce_v11_0.c2
-rw-r--r--drivers/gpu/drm/amd/amdgpu/dce_v6_0.c2
-rw-r--r--drivers/gpu/drm/amd/amdgpu/dce_v8_0.c2
6 files changed, 10 insertions, 10 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
index 3470e9cf673b..05891988605c 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
@@ -668,9 +668,9 @@ static bool amdgpu_display_is_hdtv_mode(const struct drm_display_mode *mode)
668 return false; 668 return false;
669} 669}
670 670
671bool amdgpu_crtc_scaling_mode_fixup(struct drm_crtc *crtc, 671bool amdgpu_display_crtc_scaling_mode_fixup(struct drm_crtc *crtc,
672 const struct drm_display_mode *mode, 672 const struct drm_display_mode *mode,
673 struct drm_display_mode *adjusted_mode) 673 struct drm_display_mode *adjusted_mode)
674{ 674{
675 struct drm_device *dev = crtc->dev; 675 struct drm_device *dev = crtc->dev;
676 struct drm_encoder *encoder; 676 struct drm_encoder *encoder;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
index 4fa1f6180fb3..e85bcb1ea239 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
@@ -646,9 +646,9 @@ int amdgpufb_remove(struct drm_device *dev, struct drm_framebuffer *fb);
646 646
647void amdgpu_enc_destroy(struct drm_encoder *encoder); 647void amdgpu_enc_destroy(struct drm_encoder *encoder);
648void amdgpu_copy_fb(struct drm_device *dev, struct drm_gem_object *dst_obj); 648void amdgpu_copy_fb(struct drm_device *dev, struct drm_gem_object *dst_obj);
649bool amdgpu_crtc_scaling_mode_fixup(struct drm_crtc *crtc, 649bool amdgpu_display_crtc_scaling_mode_fixup(struct drm_crtc *crtc,
650 const struct drm_display_mode *mode, 650 const struct drm_display_mode *mode,
651 struct drm_display_mode *adjusted_mode); 651 struct drm_display_mode *adjusted_mode);
652void amdgpu_panel_mode_fixup(struct drm_encoder *encoder, 652void amdgpu_panel_mode_fixup(struct drm_encoder *encoder,
653 struct drm_display_mode *adjusted_mode); 653 struct drm_display_mode *adjusted_mode);
654int amdgpu_crtc_idx_to_irq_type(struct amdgpu_device *adev, int crtc); 654int amdgpu_crtc_idx_to_irq_type(struct amdgpu_device *adev, int crtc);
diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
index ad5e74af3a12..865e8ca09225 100644
--- a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
@@ -2676,7 +2676,7 @@ static bool dce_v10_0_crtc_mode_fixup(struct drm_crtc *crtc,
2676 amdgpu_crtc->connector = NULL; 2676 amdgpu_crtc->connector = NULL;
2677 return false; 2677 return false;
2678 } 2678 }
2679 if (!amdgpu_crtc_scaling_mode_fixup(crtc, mode, adjusted_mode)) 2679 if (!amdgpu_display_crtc_scaling_mode_fixup(crtc, mode, adjusted_mode))
2680 return false; 2680 return false;
2681 if (amdgpu_atombios_crtc_prepare_pll(crtc, adjusted_mode)) 2681 if (amdgpu_atombios_crtc_prepare_pll(crtc, adjusted_mode))
2682 return false; 2682 return false;
diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
index dbf9d75d0491..fe887280a746 100644
--- a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
@@ -2779,7 +2779,7 @@ static bool dce_v11_0_crtc_mode_fixup(struct drm_crtc *crtc,
2779 amdgpu_crtc->connector = NULL; 2779 amdgpu_crtc->connector = NULL;
2780 return false; 2780 return false;
2781 } 2781 }
2782 if (!amdgpu_crtc_scaling_mode_fixup(crtc, mode, adjusted_mode)) 2782 if (!amdgpu_display_crtc_scaling_mode_fixup(crtc, mode, adjusted_mode))
2783 return false; 2783 return false;
2784 if (amdgpu_atombios_crtc_prepare_pll(crtc, adjusted_mode)) 2784 if (amdgpu_atombios_crtc_prepare_pll(crtc, adjusted_mode))
2785 return false; 2785 return false;
diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
index 416141736b16..3436de3fc722 100644
--- a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
@@ -2562,7 +2562,7 @@ static bool dce_v6_0_crtc_mode_fixup(struct drm_crtc *crtc,
2562 amdgpu_crtc->connector = NULL; 2562 amdgpu_crtc->connector = NULL;
2563 return false; 2563 return false;
2564 } 2564 }
2565 if (!amdgpu_crtc_scaling_mode_fixup(crtc, mode, adjusted_mode)) 2565 if (!amdgpu_display_crtc_scaling_mode_fixup(crtc, mode, adjusted_mode))
2566 return false; 2566 return false;
2567 if (amdgpu_atombios_crtc_prepare_pll(crtc, adjusted_mode)) 2567 if (amdgpu_atombios_crtc_prepare_pll(crtc, adjusted_mode))
2568 return false; 2568 return false;
diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
index ff29f309a722..6f44146cd4c2 100644
--- a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
@@ -2587,7 +2587,7 @@ static bool dce_v8_0_crtc_mode_fixup(struct drm_crtc *crtc,
2587 amdgpu_crtc->connector = NULL; 2587 amdgpu_crtc->connector = NULL;
2588 return false; 2588 return false;
2589 } 2589 }
2590 if (!amdgpu_crtc_scaling_mode_fixup(crtc, mode, adjusted_mode)) 2590 if (!amdgpu_display_crtc_scaling_mode_fixup(crtc, mode, adjusted_mode))
2591 return false; 2591 return false;
2592 if (amdgpu_atombios_crtc_prepare_pll(crtc, adjusted_mode)) 2592 if (amdgpu_atombios_crtc_prepare_pll(crtc, adjusted_mode))
2593 return false; 2593 return false;