diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux-4.19/linux-yocto-4.19.8/0035-drm-amdgpu-move-display-definitions-into-amdgpu_disp.patch')
-rw-r--r-- | meta-amd-bsp/recipes-kernel/linux-4.19/linux-yocto-4.19.8/0035-drm-amdgpu-move-display-definitions-into-amdgpu_disp.patch | 228 |
1 files changed, 228 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux-4.19/linux-yocto-4.19.8/0035-drm-amdgpu-move-display-definitions-into-amdgpu_disp.patch b/meta-amd-bsp/recipes-kernel/linux-4.19/linux-yocto-4.19.8/0035-drm-amdgpu-move-display-definitions-into-amdgpu_disp.patch new file mode 100644 index 00000000..2c818d60 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux-4.19/linux-yocto-4.19.8/0035-drm-amdgpu-move-display-definitions-into-amdgpu_disp.patch @@ -0,0 +1,228 @@ +From 17026af46f5c9aa9c45b98d65fbee7fb69b32858 Mon Sep 17 00:00:00 2001 +From: Huang Rui <ray.huang@amd.com> +Date: Thu, 9 Aug 2018 09:50:12 -0500 +Subject: [PATCH 0035/2940] drm/amdgpu: move display definitions into + amdgpu_display header +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Demangle amdgpu.h. + +Signed-off-by: Huang Rui <ray.huang@amd.com> +Acked-by: Christian König <christian.koenig@amd.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 13 ------------- + drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_display.h | 15 +++++++++++++++ + drivers/gpu/drm/amd/amdgpu/amdgpu_encoders.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 1 + + drivers/gpu/drm/amd/amdgpu/atombios_encoders.c | 1 + + drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 1 + + drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 1 + + drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 1 + + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 1 + + 13 files changed, 26 insertions(+), 13 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h +index 5726c56fc5d1..2473037e9550 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h +@@ -758,7 +758,6 @@ int amdgpu_cs_wait_ioctl(struct drm_device *dev, void *data, struct drm_file *fi + int amdgpu_cs_wait_fences_ioctl(struct drm_device *dev, void *data, + struct drm_file *filp); + +- + /* VRAM scratch page for HDP bug, default vram page */ + struct amdgpu_vram_scratch { + struct amdgpu_bo *robj; +@@ -1259,24 +1258,12 @@ int emu_soc_asic_init(struct amdgpu_device *adev); + #define amdgpu_vm_copy_pte(adev, ib, pe, src, count) ((adev)->vm_manager.vm_pte_funcs->copy_pte((ib), (pe), (src), (count))) + #define amdgpu_vm_write_pte(adev, ib, pe, value, count, incr) ((adev)->vm_manager.vm_pte_funcs->write_pte((ib), (pe), (value), (count), (incr))) + #define amdgpu_vm_set_pte_pde(adev, ib, pe, addr, count, incr, flags) ((adev)->vm_manager.vm_pte_funcs->set_pte_pde((ib), (pe), (addr), (count), (incr), (flags))) +-#define amdgpu_display_vblank_get_counter(adev, crtc) (adev)->mode_info.funcs->vblank_get_counter((adev), (crtc)) +-#define amdgpu_display_backlight_set_level(adev, e, l) (adev)->mode_info.funcs->backlight_set_level((e), (l)) +-#define amdgpu_display_backlight_get_level(adev, e) (adev)->mode_info.funcs->backlight_get_level((e)) +-#define amdgpu_display_hpd_sense(adev, h) (adev)->mode_info.funcs->hpd_sense((adev), (h)) +-#define amdgpu_display_hpd_set_polarity(adev, h) (adev)->mode_info.funcs->hpd_set_polarity((adev), (h)) +-#define amdgpu_display_hpd_get_gpio_reg(adev) (adev)->mode_info.funcs->hpd_get_gpio_reg((adev)) +-#define amdgpu_display_bandwidth_update(adev) (adev)->mode_info.funcs->bandwidth_update((adev)) +-#define amdgpu_display_page_flip(adev, crtc, base, async) (adev)->mode_info.funcs->page_flip((adev), (crtc), (base), (async)) +-#define amdgpu_display_page_flip_get_scanoutpos(adev, crtc, vbl, pos) (adev)->mode_info.funcs->page_flip_get_scanoutpos((adev), (crtc), (vbl), (pos)) +-#define amdgpu_display_add_encoder(adev, e, s, c) (adev)->mode_info.funcs->add_encoder((adev), (e), (s), (c)) +-#define amdgpu_display_add_connector(adev, ci, sd, ct, ib, coi, h, r) (adev)->mode_info.funcs->add_connector((adev), (ci), (sd), (ct), (ib), (coi), (h), (r)) + + /* Common functions */ + int amdgpu_device_gpu_recover(struct amdgpu_device *adev, + struct amdgpu_job* job, bool force); + void amdgpu_device_pci_config_reset(struct amdgpu_device *adev); + bool amdgpu_device_need_post(struct amdgpu_device *adev); +-void amdgpu_display_update_priority(struct amdgpu_device *adev); + + void amdgpu_cs_report_moved_bytes(struct amdgpu_device *adev, u64 num_bytes, + u64 num_vis_bytes); +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c +index f008804f0b97..7f0afc526419 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c +@@ -31,6 +31,7 @@ + #include <drm/drm_crtc_helper.h> + #include "amdgpu.h" + #include "amdgpu_pm.h" ++#include "amdgpu_display.h" + #include "amd_acpi.h" + #include "atom.h" + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c +index bf872f694f50..e02781b37e73 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c +@@ -29,6 +29,7 @@ + #include "amdgpu_atombios.h" + #include "amdgpu_atomfirmware.h" + #include "amdgpu_i2c.h" ++#include "amdgpu_display.h" + + #include "atom.h" + #include "atom-bits.h" +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c +index c770d73352a7..69ad6ec0a4f3 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c +@@ -34,6 +34,7 @@ + #include "atombios_dp.h" + #include "amdgpu_connectors.h" + #include "amdgpu_i2c.h" ++#include "amdgpu_display.h" + + #include <linux/pm_runtime.h> + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.h +index f66e3e3fef0a..06b922fe0d42 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.h ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.h +@@ -23,6 +23,21 @@ + #ifndef __AMDGPU_DISPLAY_H__ + #define __AMDGPU_DISPLAY_H__ + ++#define amdgpu_display_vblank_get_counter(adev, crtc) (adev)->mode_info.funcs->vblank_get_counter((adev), (crtc)) ++#define amdgpu_display_backlight_set_level(adev, e, l) (adev)->mode_info.funcs->backlight_set_level((e), (l)) ++#define amdgpu_display_backlight_get_level(adev, e) (adev)->mode_info.funcs->backlight_get_level((e)) ++#define amdgpu_display_hpd_sense(adev, h) (adev)->mode_info.funcs->hpd_sense((adev), (h)) ++#define amdgpu_display_hpd_set_polarity(adev, h) (adev)->mode_info.funcs->hpd_set_polarity((adev), (h)) ++#define amdgpu_display_hpd_get_gpio_reg(adev) (adev)->mode_info.funcs->hpd_get_gpio_reg((adev)) ++#define amdgpu_display_bandwidth_update(adev) (adev)->mode_info.funcs->bandwidth_update((adev)) ++#define amdgpu_display_page_flip(adev, crtc, base, async) (adev)->mode_info.funcs->page_flip((adev), (crtc), (base), (async)) ++#define amdgpu_display_page_flip_get_scanoutpos(adev, crtc, vbl, pos) (adev)->mode_info.funcs->page_flip_get_scanoutpos((adev), (crtc), (vbl), (pos)) ++#define amdgpu_display_add_encoder(adev, e, s, c) (adev)->mode_info.funcs->add_encoder((adev), (e), (s), (c)) ++#define amdgpu_display_add_connector(adev, ci, sd, ct, ib, coi, h, r) (adev)->mode_info.funcs->add_connector((adev), (ci), (sd), (ct), (ib), (coi), (h), (r)) ++ ++int amdgpu_display_freesync_ioctl(struct drm_device *dev, void *data, ++ struct drm_file *filp); ++void amdgpu_display_update_priority(struct amdgpu_device *adev); + uint32_t amdgpu_display_supported_domains(struct amdgpu_device *adev); + struct drm_framebuffer * + amdgpu_display_user_framebuffer_create(struct drm_device *dev, +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_encoders.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_encoders.c +index ae8fac34f7a5..ec78e2b2015c 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_encoders.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_encoders.c +@@ -28,6 +28,7 @@ + #include <drm/amdgpu_drm.h> + #include "amdgpu.h" + #include "amdgpu_connectors.h" ++#include "amdgpu_display.h" + #include "atom.h" + #include "atombios_encoders.h" + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +index 20645ea719b3..a1043b421e3e 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +@@ -38,6 +38,7 @@ + #include <linux/pm_runtime.h> + #include "amdgpu_amdkfd.h" + #include "amdgpu_gem.h" ++#include "amdgpu_display.h" + + /** + * amdgpu_driver_unload_kms - Main unload function for KMS. +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c +index 7b4e657a95c7..3e51e9c89f04 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c +@@ -27,6 +27,7 @@ + #include "amdgpu_drv.h" + #include "amdgpu_pm.h" + #include "amdgpu_dpm.h" ++#include "amdgpu_display.h" + #include "atom.h" + #include <linux/power_supply.h> + #include <linux/hwmon.h> +diff --git a/drivers/gpu/drm/amd/amdgpu/atombios_encoders.c b/drivers/gpu/drm/amd/amdgpu/atombios_encoders.c +index d702fb8e3427..60e2447e12c5 100644 +--- a/drivers/gpu/drm/amd/amdgpu/atombios_encoders.c ++++ b/drivers/gpu/drm/amd/amdgpu/atombios_encoders.c +@@ -28,6 +28,7 @@ + #include <drm/amdgpu_drm.h> + #include "amdgpu.h" + #include "amdgpu_connectors.h" ++#include "amdgpu_display.h" + #include "atom.h" + #include "atombios_encoders.h" + #include "atombios_dp.h" +diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c +index 308f9f238bc1..4313d6c6407d 100644 +--- a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c ++++ b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c +@@ -31,6 +31,7 @@ + #include "atombios_encoders.h" + #include "amdgpu_pll.h" + #include "amdgpu_connectors.h" ++#include "amdgpu_display.h" + #include "dce_v10_0.h" + + #include "dce/dce_10_0_d.h" +diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c +index 76dfb76f7900..e295cc18cae4 100644 +--- a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c ++++ b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c +@@ -31,6 +31,7 @@ + #include "atombios_encoders.h" + #include "amdgpu_pll.h" + #include "amdgpu_connectors.h" ++#include "amdgpu_display.h" + #include "dce_v11_0.h" + + #include "dce/dce_11_0_d.h" +diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c +index c9adc627305d..018dd62dc5b6 100644 +--- a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c ++++ b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c +@@ -30,6 +30,7 @@ + #include "atombios_encoders.h" + #include "amdgpu_pll.h" + #include "amdgpu_connectors.h" ++#include "amdgpu_display.h" + + #include "bif/bif_3_0_d.h" + #include "bif/bif_3_0_sh_mask.h" +diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c +index 50cd03beac7d..2bae3ad2bbf8 100644 +--- a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c ++++ b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c +@@ -31,6 +31,7 @@ + #include "atombios_encoders.h" + #include "amdgpu_pll.h" + #include "amdgpu_connectors.h" ++#include "amdgpu_display.h" + #include "dce_v8_0.h" + + #include "dce/dce_8_0_d.h" +-- +2.17.1 + |