aboutsummaryrefslogtreecommitdiffstats
path: root/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3242-drm-amdgpu-rename-amdgpu_crtc_idx_to_irq_type.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3242-drm-amdgpu-rename-amdgpu_crtc_idx_to_irq_type.patch')
-rw-r--r--meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3242-drm-amdgpu-rename-amdgpu_crtc_idx_to_irq_type.patch198
1 files changed, 198 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3242-drm-amdgpu-rename-amdgpu_crtc_idx_to_irq_type.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3242-drm-amdgpu-rename-amdgpu_crtc_idx_to_irq_type.patch
new file mode 100644
index 00000000..b0472e87
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3242-drm-amdgpu-rename-amdgpu_crtc_idx_to_irq_type.patch
@@ -0,0 +1,198 @@
+From 0d716ecf3f02e9d5532fb579e3a477184f66c531 Mon Sep 17 00:00:00 2001
+From: Samuel Li <Samuel.Li@amd.com>
+Date: Fri, 19 Jan 2018 16:06:41 -0500
+Subject: [PATCH 3242/4131] drm/amdgpu: rename amdgpu_crtc_idx_to_irq_type
+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 | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 4 ++--
+ drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 2 +-
+ drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 5 +++--
+ drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 6 ++++--
+ drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 6 ++++--
+ drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 6 ++++--
+ drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 3 ++-
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 +-
+ 9 files changed, 22 insertions(+), 14 deletions(-)
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
+index 4d143a7..e879201 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
+@@ -902,7 +902,7 @@ int amdgpu_display_get_crtc_scanoutpos(struct drm_device *dev,
+ return ret;
+ }
+
+-int amdgpu_crtc_idx_to_irq_type(struct amdgpu_device *adev, int crtc)
++int amdgpu_display_crtc_idx_to_irq_type(struct amdgpu_device *adev, int crtc)
+ {
+ if (crtc < 0 || crtc >= adev->mode_info.num_crtc)
+ return AMDGPU_CRTC_IRQ_NONE;
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
+index 7fbeb58..a49bd2e 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
+@@ -1074,7 +1074,7 @@ u32 amdgpu_get_vblank_counter_kms(struct drm_device *dev, unsigned int pipe)
+ int amdgpu_enable_vblank_kms(struct drm_device *dev, unsigned int pipe)
+ {
+ struct amdgpu_device *adev = dev->dev_private;
+- int idx = amdgpu_crtc_idx_to_irq_type(adev, pipe);
++ int idx = amdgpu_display_crtc_idx_to_irq_type(adev, pipe);
+
+ return amdgpu_irq_get(adev, &adev->crtc_irq, idx);
+ }
+@@ -1090,7 +1090,7 @@ int amdgpu_enable_vblank_kms(struct drm_device *dev, unsigned int pipe)
+ void amdgpu_disable_vblank_kms(struct drm_device *dev, unsigned int pipe)
+ {
+ struct amdgpu_device *adev = dev->dev_private;
+- int idx = amdgpu_crtc_idx_to_irq_type(adev, pipe);
++ int idx = amdgpu_display_crtc_idx_to_irq_type(adev, pipe);
+
+ amdgpu_irq_put(adev, &adev->crtc_irq, idx);
+ }
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
+index 3e0fd34..2320283 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
+@@ -667,7 +667,7 @@ bool amdgpu_display_crtc_scaling_mode_fixup(struct drm_crtc *crtc,
+ 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);
++int amdgpu_display_crtc_idx_to_irq_type(struct amdgpu_device *adev, int crtc);
+
+ /* fbdev layer */
+ int amdgpu_fbdev_init(struct amdgpu_device *adev);
+diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
+index 865e8ca0..c7d1ef0 100644
+--- a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
++++ b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
+@@ -2537,7 +2537,8 @@ static void dce_v10_0_crtc_dpms(struct drm_crtc *crtc, int mode)
+ amdgpu_atombios_crtc_blank(crtc, ATOM_DISABLE);
+ dce_v10_0_vga_enable(crtc, false);
+ /* Make sure VBLANK and PFLIP interrupts are still enabled */
+- type = amdgpu_crtc_idx_to_irq_type(adev, amdgpu_crtc->crtc_id);
++ type = amdgpu_display_crtc_idx_to_irq_type(adev,
++ amdgpu_crtc->crtc_id);
+ amdgpu_irq_update(adev, &adev->crtc_irq, type);
+ amdgpu_irq_update(adev, &adev->pageflip_irq, type);
+ drm_crtc_vblank_on(crtc);
+@@ -3249,7 +3250,7 @@ static int dce_v10_0_crtc_irq(struct amdgpu_device *adev,
+ {
+ unsigned crtc = entry->src_id - 1;
+ uint32_t disp_int = RREG32(interrupt_status_offsets[crtc].reg);
+- unsigned irq_type = amdgpu_crtc_idx_to_irq_type(adev, crtc);
++ unsigned int irq_type = amdgpu_display_crtc_idx_to_irq_type(adev, crtc);
+
+ switch (entry->src_data[0]) {
+ case 0: /* vblank */
+diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
+index fe88728..99bc1f36 100644
+--- a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
++++ b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
+@@ -2612,7 +2612,8 @@ static void dce_v11_0_crtc_dpms(struct drm_crtc *crtc, int mode)
+ amdgpu_atombios_crtc_blank(crtc, ATOM_DISABLE);
+ dce_v11_0_vga_enable(crtc, false);
+ /* Make sure VBLANK and PFLIP interrupts are still enabled */
+- type = amdgpu_crtc_idx_to_irq_type(adev, amdgpu_crtc->crtc_id);
++ type = amdgpu_display_crtc_idx_to_irq_type(adev,
++ amdgpu_crtc->crtc_id);
+ amdgpu_irq_update(adev, &adev->crtc_irq, type);
+ amdgpu_irq_update(adev, &adev->pageflip_irq, type);
+ drm_crtc_vblank_on(crtc);
+@@ -3368,7 +3369,8 @@ static int dce_v11_0_crtc_irq(struct amdgpu_device *adev,
+ {
+ unsigned crtc = entry->src_id - 1;
+ uint32_t disp_int = RREG32(interrupt_status_offsets[crtc].reg);
+- unsigned irq_type = amdgpu_crtc_idx_to_irq_type(adev, crtc);
++ unsigned int irq_type = amdgpu_display_crtc_idx_to_irq_type(adev,
++ crtc);
+
+ switch (entry->src_data[0]) {
+ case 0: /* vblank */
+diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
+index 3436de3..24de4aa 100644
+--- a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
++++ b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
+@@ -2425,7 +2425,8 @@ static void dce_v6_0_crtc_dpms(struct drm_crtc *crtc, int mode)
+ amdgpu_atombios_crtc_enable(crtc, ATOM_ENABLE);
+ amdgpu_atombios_crtc_blank(crtc, ATOM_DISABLE);
+ /* Make sure VBLANK and PFLIP interrupts are still enabled */
+- type = amdgpu_crtc_idx_to_irq_type(adev, amdgpu_crtc->crtc_id);
++ type = amdgpu_display_crtc_idx_to_irq_type(adev,
++ amdgpu_crtc->crtc_id);
+ amdgpu_irq_update(adev, &adev->crtc_irq, type);
+ amdgpu_irq_update(adev, &adev->pageflip_irq, type);
+ drm_crtc_vblank_on(crtc);
+@@ -2966,7 +2967,8 @@ static int dce_v6_0_crtc_irq(struct amdgpu_device *adev,
+ {
+ unsigned crtc = entry->src_id - 1;
+ uint32_t disp_int = RREG32(interrupt_status_offsets[crtc].reg);
+- unsigned irq_type = amdgpu_crtc_idx_to_irq_type(adev, crtc);
++ unsigned int irq_type = amdgpu_display_crtc_idx_to_irq_type(adev,
++ crtc);
+
+ switch (entry->src_data[0]) {
+ case 0: /* vblank */
+diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
+index 6f44146..823a8c3 100644
+--- a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
++++ b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
+@@ -2441,7 +2441,8 @@ static void dce_v8_0_crtc_dpms(struct drm_crtc *crtc, int mode)
+ amdgpu_atombios_crtc_blank(crtc, ATOM_DISABLE);
+ dce_v8_0_vga_enable(crtc, false);
+ /* Make sure VBLANK and PFLIP interrupts are still enabled */
+- type = amdgpu_crtc_idx_to_irq_type(adev, amdgpu_crtc->crtc_id);
++ type = amdgpu_display_crtc_idx_to_irq_type(adev,
++ amdgpu_crtc->crtc_id);
+ amdgpu_irq_update(adev, &adev->crtc_irq, type);
+ amdgpu_irq_update(adev, &adev->pageflip_irq, type);
+ drm_crtc_vblank_on(crtc);
+@@ -3063,7 +3064,8 @@ static int dce_v8_0_crtc_irq(struct amdgpu_device *adev,
+ {
+ unsigned crtc = entry->src_id - 1;
+ uint32_t disp_int = RREG32(interrupt_status_offsets[crtc].reg);
+- unsigned irq_type = amdgpu_crtc_idx_to_irq_type(adev, crtc);
++ unsigned int irq_type = amdgpu_display_crtc_idx_to_irq_type(adev,
++ crtc);
+
+ switch (entry->src_data[0]) {
+ case 0: /* vblank */
+diff --git a/drivers/gpu/drm/amd/amdgpu/dce_virtual.c b/drivers/gpu/drm/amd/amdgpu/dce_virtual.c
+index 540eaf7..da19393 100644
+--- a/drivers/gpu/drm/amd/amdgpu/dce_virtual.c
++++ b/drivers/gpu/drm/amd/amdgpu/dce_virtual.c
+@@ -149,7 +149,8 @@ static void dce_virtual_crtc_dpms(struct drm_crtc *crtc, int mode)
+ case DRM_MODE_DPMS_ON:
+ amdgpu_crtc->enabled = true;
+ /* Make sure VBLANK interrupts are still enabled */
+- type = amdgpu_crtc_idx_to_irq_type(adev, amdgpu_crtc->crtc_id);
++ type = amdgpu_display_crtc_idx_to_irq_type(adev,
++ amdgpu_crtc->crtc_id);
+ amdgpu_irq_update(adev, &adev->crtc_irq, type);
+ drm_crtc_vblank_on(crtc);
+ break;
+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 a20fb5d..b59e7c5 100644
+--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
++++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+@@ -4030,7 +4030,7 @@ static void manage_dm_interrupts(struct amdgpu_device *adev,
+ * constant is the same as PFLIP
+ */
+ int irq_type =
+- amdgpu_crtc_idx_to_irq_type(
++ amdgpu_display_crtc_idx_to_irq_type(
+ adev,
+ acrtc->crtc_id);
+
+--
+2.7.4
+
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-05-01 04:37:59 +0000