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>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
index 3470e9cf673be88f97df546833afb8731250ef4c..05891988605ce3c16a7cce3c4f8fa2860bee1a6d 100644 (file)
--- 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)
                return false;
 }
 
-bool amdgpu_crtc_scaling_mode_fixup(struct drm_crtc *crtc,
-                                   const struct drm_display_mode *mode,
-                                   struct drm_display_mode *adjusted_mode)
+bool amdgpu_display_crtc_scaling_mode_fixup(struct drm_crtc *crtc,
+                                       const struct drm_display_mode *mode,
+                                       struct drm_display_mode *adjusted_mode)
 {
        struct drm_device *dev = crtc->dev;
        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 4fa1f6180fb38a11afb252d03a41ccc435dfd772..e85bcb1ea2393f02f45f16e2405f7a36b3cfab5c 100644 (file)
--- 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);
 
 void amdgpu_enc_destroy(struct drm_encoder *encoder);
 void amdgpu_copy_fb(struct drm_device *dev, struct drm_gem_object *dst_obj);
-bool amdgpu_crtc_scaling_mode_fixup(struct drm_crtc *crtc,
-                                       const struct drm_display_mode *mode,
-                                       struct drm_display_mode *adjusted_mode);
+bool amdgpu_display_crtc_scaling_mode_fixup(struct drm_crtc *crtc,
+                               const struct drm_display_mode *mode,
+                               struct drm_display_mode *adjusted_mode);
 void amdgpu_panel_mode_fixup(struct drm_encoder *encoder,
                             struct drm_display_mode *adjusted_mode);
 int 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 ad5e74af3a1298de4c48854987e0baafc8744df5..865e8ca0922542336ce65a27a55e8f8da2514e2d 100644 (file)
--- 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,
                amdgpu_crtc->connector = NULL;
                return false;
        }
-       if (!amdgpu_crtc_scaling_mode_fixup(crtc, mode, adjusted_mode))
+       if (!amdgpu_display_crtc_scaling_mode_fixup(crtc, mode, adjusted_mode))
                return false;
        if (amdgpu_atombios_crtc_prepare_pll(crtc, adjusted_mode))
                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 dbf9d75d04913e35b8f8090a7f7c5f664a3817cc..fe887280a74612b70e862f90119a41630003c4e8 100644 (file)
--- 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,
                amdgpu_crtc->connector = NULL;
                return false;
        }
-       if (!amdgpu_crtc_scaling_mode_fixup(crtc, mode, adjusted_mode))
+       if (!amdgpu_display_crtc_scaling_mode_fixup(crtc, mode, adjusted_mode))
                return false;
        if (amdgpu_atombios_crtc_prepare_pll(crtc, adjusted_mode))
                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 416141736b1673e601baf9ce3cd46f9a9208b2a0..3436de3fc722587e2bc7ec5270b78abc0252961d 100644 (file)
--- 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,
                amdgpu_crtc->connector = NULL;
                return false;
        }
-       if (!amdgpu_crtc_scaling_mode_fixup(crtc, mode, adjusted_mode))
+       if (!amdgpu_display_crtc_scaling_mode_fixup(crtc, mode, adjusted_mode))
                return false;
        if (amdgpu_atombios_crtc_prepare_pll(crtc, adjusted_mode))
                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 ff29f309a7224bdcec61dae20e96ca948bc323a1..6f44146cd4c2970e1aab07505a3a3fc1151d6a92 100644 (file)
--- 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,
                amdgpu_crtc->connector = NULL;
                return false;
        }
-       if (!amdgpu_crtc_scaling_mode_fixup(crtc, mode, adjusted_mode))
+       if (!amdgpu_display_crtc_scaling_mode_fixup(crtc, mode, adjusted_mode))
                return false;
        if (amdgpu_atombios_crtc_prepare_pll(crtc, adjusted_mode))
                return false;