aboutsummaryrefslogtreecommitdiffstats
path: root/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3241-drm-amdgpu-rename-amdgpu_get_crtc_scanoutpos.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3241-drm-amdgpu-rename-amdgpu_get_crtc_scanoutpos.patch')
-rw-r--r--meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3241-drm-amdgpu-rename-amdgpu_get_crtc_scanoutpos.patch150
1 files changed, 150 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3241-drm-amdgpu-rename-amdgpu_get_crtc_scanoutpos.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3241-drm-amdgpu-rename-amdgpu_get_crtc_scanoutpos.patch
new file mode 100644
index 00000000..0d2282ba
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3241-drm-amdgpu-rename-amdgpu_get_crtc_scanoutpos.patch
@@ -0,0 +1,150 @@
+From 174df35758444256ab47303c0a5154b5ed6c0a56 Mon Sep 17 00:00:00 2001
+From: Samuel Li <Samuel.Li@amd.com>
+Date: Fri, 19 Jan 2018 15:53:16 -0500
+Subject: [PATCH 3241/4131] drm/amdgpu: rename amdgpu_get_crtc_scanoutpos
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+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>
+---
+ drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 14 +++++++-------
+ drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 4 ++--
+ drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 8 ++++----
+ drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 10 +++++-----
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 6 +++---
+ drivers/gpu/drm/amd/display/dc/dc_stream.h | 2 +-
+ 6 files changed, 22 insertions(+), 22 deletions(-)
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
+index cdc735f..4d143a7 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
+@@ -89,9 +89,9 @@ static void amdgpu_display_flip_work_func(struct work_struct *__work)
+ * targeted by the flip
+ */
+ if (amdgpu_crtc->enabled &&
+- (amdgpu_get_crtc_scanoutpos(adev->ddev, work->crtc_id, 0,
+- &vpos, &hpos, NULL, NULL,
+- &crtc->hwmode)
++ (amdgpu_display_get_crtc_scanoutpos(adev->ddev, work->crtc_id, 0,
++ &vpos, &hpos, NULL, NULL,
++ &crtc->hwmode)
+ & (DRM_SCANOUTPOS_VALID | DRM_SCANOUTPOS_IN_VBLANK)) ==
+ (DRM_SCANOUTPOS_VALID | DRM_SCANOUTPOS_IN_VBLANK) &&
+ (int)(work->target_vblank -
+@@ -807,10 +807,10 @@ bool amdgpu_display_crtc_scaling_mode_fixup(struct drm_crtc *crtc,
+ * unknown small number of scanlines wrt. real scanout position.
+ *
+ */
+-int amdgpu_get_crtc_scanoutpos(struct drm_device *dev, unsigned int pipe,
+- unsigned int flags, int *vpos, int *hpos,
+- ktime_t *stime, ktime_t *etime,
+- const struct drm_display_mode *mode)
++int amdgpu_display_get_crtc_scanoutpos(struct drm_device *dev,
++ unsigned int pipe, unsigned int flags, int *vpos,
++ int *hpos, ktime_t *stime, ktime_t *etime,
++ const struct drm_display_mode *mode)
+ {
+ u32 vbl = 0, position = 0;
+ int vbl_start, vbl_end, vtotal, ret = 0;
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+index 552c065..616f0bf 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+@@ -823,8 +823,8 @@ amdgpu_get_crtc_scanout_position(struct drm_device *dev, unsigned int pipe,
+ ktime_t *stime, ktime_t *etime,
+ const struct drm_display_mode *mode)
+ {
+- return amdgpu_get_crtc_scanoutpos(dev, pipe, 0, vpos, hpos,
+- stime, etime, mode);
++ return amdgpu_display_get_crtc_scanoutpos(dev, pipe, 0, vpos, hpos,
++ stime, etime, mode);
+ }
+
+ static struct drm_driver kms_driver = {
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
+index 5f7059e..7fbeb58 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
+@@ -1029,11 +1029,11 @@ u32 amdgpu_get_vblank_counter_kms(struct drm_device *dev, unsigned int pipe)
+ */
+ do {
+ count = amdgpu_display_vblank_get_counter(adev, pipe);
+- /* Ask amdgpu_get_crtc_scanoutpos to return vpos as
+- * distance to start of vblank, instead of regular
+- * vertical scanout pos.
++ /* Ask amdgpu_display_get_crtc_scanoutpos to return
++ * vpos as distance to start of vblank, instead of
++ * regular vertical scanout pos.
+ */
+- stat = amdgpu_get_crtc_scanoutpos(
++ stat = amdgpu_display_get_crtc_scanoutpos(
+ dev, pipe, GET_DISTANCE_TO_VBLANKSTART,
+ &vpos, &hpos, NULL, NULL,
+ &adev->mode_info.crtcs[pipe]->base.hwmode);
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
+index b9cbf37..3e0fd34 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
+@@ -618,7 +618,7 @@ struct amdgpu_mst_connector {
+ #define ENCODER_MODE_IS_DP(em) (((em) == ATOM_ENCODER_MODE_DP) || \
+ ((em) == ATOM_ENCODER_MODE_DP_MST))
+
+-/* Driver internal use only flags of amdgpu_get_crtc_scanoutpos() */
++/* Driver internal use only flags of amdgpu_display_get_crtc_scanoutpos() */
+ #define DRM_SCANOUTPOS_VALID (1 << 0)
+ #define DRM_SCANOUTPOS_IN_VBLANK (1 << 1)
+ #define DRM_SCANOUTPOS_ACCURATE (1 << 2)
+@@ -642,10 +642,10 @@ bool amdgpu_display_ddc_probe(struct amdgpu_connector *amdgpu_connector,
+
+ void amdgpu_encoder_set_active_device(struct drm_encoder *encoder);
+
+-int amdgpu_get_crtc_scanoutpos(struct drm_device *dev, unsigned int pipe,
+- unsigned int flags, int *vpos, int *hpos,
+- ktime_t *stime, ktime_t *etime,
+- const struct drm_display_mode *mode);
++int amdgpu_display_get_crtc_scanoutpos(struct drm_device *dev,
++ unsigned int pipe, unsigned int flags, int *vpos,
++ int *hpos, ktime_t *stime, ktime_t *etime,
++ const struct drm_display_mode *mode);
+
+ int amdgpu_display_framebuffer_init(struct drm_device *dev,
+ struct amdgpu_framebuffer *rfb,
+diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+index 8a1cd64..a20fb5d 100644
+--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
++++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+@@ -4254,9 +4254,9 @@ static void amdgpu_dm_do_flip(struct drm_crtc *crtc,
+ * targeted by the flip
+ */
+ while ((acrtc->enabled &&
+- (amdgpu_get_crtc_scanoutpos(adev->ddev, acrtc->crtc_id, 0,
+- &vpos, &hpos, NULL, NULL,
+- &crtc->hwmode)
++ (amdgpu_display_get_crtc_scanoutpos(adev->ddev, acrtc->crtc_id,
++ 0, &vpos, &hpos, NULL,
++ NULL, &crtc->hwmode)
+ & (DRM_SCANOUTPOS_VALID | DRM_SCANOUTPOS_IN_VBLANK)) ==
+ (DRM_SCANOUTPOS_VALID | DRM_SCANOUTPOS_IN_VBLANK) &&
+ (int)(target_vblank -
+diff --git a/drivers/gpu/drm/amd/display/dc/dc_stream.h b/drivers/gpu/drm/amd/display/dc/dc_stream.h
+index be3eb57f..c9e5fe8 100644
+--- a/drivers/gpu/drm/amd/display/dc/dc_stream.h
++++ b/drivers/gpu/drm/amd/display/dc/dc_stream.h
+@@ -152,7 +152,7 @@ struct dc_stream_state *dc_get_stream_at_index(struct dc *dc, uint8_t i);
+ uint32_t dc_stream_get_vblank_counter(const struct dc_stream_state *stream);
+
+ /* TODO: Return parsed values rather than direct register read
+- * This has a dependency on the caller (amdgpu_get_crtc_scanoutpos)
++ * This has a dependency on the caller (amdgpu_display_get_crtc_scanoutpos)
+ * being refactored properly to be dce-specific
+ */
+ bool dc_stream_get_scanoutpos(const struct dc_stream_state *stream,
+--
+2.7.4
+
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-04-30 23:18:34 +0000