From: Greg Kroah-Hartman Date: Sun, 3 Oct 2021 14:23:15 +0000 (+0200) Subject: 5.4-stable patches X-Git-Tag: v4.4.286~50 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d60a3f742b0cc643a0fa2c8655d856f2cedc24ea;p=thirdparty%2Fkernel%2Fstable-queue.git 5.4-stable patches added patches: drm-amd-display-pass-pci-deviceid-into-dc.patch x86-kvmclock-move-this_cpu_pvti-into-kvmclock.h.patch --- diff --git a/queue-5.4/drm-amd-display-pass-pci-deviceid-into-dc.patch b/queue-5.4/drm-amd-display-pass-pci-deviceid-into-dc.patch new file mode 100644 index 00000000000..008d0eb1c80 --- /dev/null +++ b/queue-5.4/drm-amd-display-pass-pci-deviceid-into-dc.patch @@ -0,0 +1,37 @@ +From d942856865c733ff60450de9691af796ad71d7bc Mon Sep 17 00:00:00 2001 +From: Charlene Liu +Date: Mon, 20 Sep 2021 14:30:02 -0400 +Subject: drm/amd/display: Pass PCI deviceid into DC + +From: Charlene Liu + +commit d942856865c733ff60450de9691af796ad71d7bc upstream. + +[why] +pci deviceid not passed to dal dc, without proper break, +dcn2.x falls into dcn3.x code path + +[how] +pass in pci deviceid, and break once dal_version initialized. + +Reviewed-by: Zhan Liu +Acked-by: Anson Jacob +Signed-off-by: Charlene Liu +Tested-by: Daniel Wheeler +Signed-off-by: Alex Deucher +Cc: stable@vger.kernel.org +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c ++++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +@@ -664,6 +664,7 @@ static int amdgpu_dm_init(struct amdgpu_ + + init_data.asic_id.pci_revision_id = adev->rev_id; + init_data.asic_id.hw_internal_rev = adev->external_rev_id; ++ init_data.asic_id.chip_id = adev->pdev->device; + + init_data.asic_id.vram_width = adev->gmc.vram_width; + /* TODO: initialize init_data.asic_id.vram_type here!!!! */ diff --git a/queue-5.4/series b/queue-5.4/series index cb02eee7ca0..18dad1e4f27 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -8,3 +8,5 @@ hwmon-w83792d-fix-null-pointer-dereference-by-removing-unnecessary-structure-fie hwmon-w83791d-fix-null-pointer-dereference-by-removing-unnecessary-structure-field.patch scsi-ufs-fix-illegal-offset-in-upiu-event-trace.patch mac80211-fix-use-after-free-in-ccmp-gcmp-rx.patch +x86-kvmclock-move-this_cpu_pvti-into-kvmclock.h.patch +drm-amd-display-pass-pci-deviceid-into-dc.patch diff --git a/queue-5.4/x86-kvmclock-move-this_cpu_pvti-into-kvmclock.h.patch b/queue-5.4/x86-kvmclock-move-this_cpu_pvti-into-kvmclock.h.patch new file mode 100644 index 00000000000..9e2f5e50c4b --- /dev/null +++ b/queue-5.4/x86-kvmclock-move-this_cpu_pvti-into-kvmclock.h.patch @@ -0,0 +1,69 @@ +From ad9af930680bb396c87582edc172b3a7cf2a3fbf Mon Sep 17 00:00:00 2001 +From: Zelin Deng +Date: Wed, 29 Sep 2021 13:13:48 +0800 +Subject: x86/kvmclock: Move this_cpu_pvti into kvmclock.h + +From: Zelin Deng + +commit ad9af930680bb396c87582edc172b3a7cf2a3fbf upstream. + +There're other modules might use hv_clock_per_cpu variable like ptp_kvm, +so move it into kvmclock.h and export the symbol to make it visiable to +other modules. + +Signed-off-by: Zelin Deng +Cc: +Message-Id: <1632892429-101194-2-git-send-email-zelin.deng@linux.alibaba.com> +Signed-off-by: Paolo Bonzini +Signed-off-by: Greg Kroah-Hartman +--- + arch/x86/include/asm/kvmclock.h | 14 ++++++++++++++ + arch/x86/kernel/kvmclock.c | 13 ++----------- + 2 files changed, 16 insertions(+), 11 deletions(-) + +--- a/arch/x86/include/asm/kvmclock.h ++++ b/arch/x86/include/asm/kvmclock.h +@@ -2,6 +2,20 @@ + #ifndef _ASM_X86_KVM_CLOCK_H + #define _ASM_X86_KVM_CLOCK_H + ++#include ++ + extern struct clocksource kvm_clock; + ++DECLARE_PER_CPU(struct pvclock_vsyscall_time_info *, hv_clock_per_cpu); ++ ++static inline struct pvclock_vcpu_time_info *this_cpu_pvti(void) ++{ ++ return &this_cpu_read(hv_clock_per_cpu)->pvti; ++} ++ ++static inline struct pvclock_vsyscall_time_info *this_cpu_hvclock(void) ++{ ++ return this_cpu_read(hv_clock_per_cpu); ++} ++ + #endif /* _ASM_X86_KVM_CLOCK_H */ +--- a/arch/x86/kernel/kvmclock.c ++++ b/arch/x86/kernel/kvmclock.c +@@ -50,18 +50,9 @@ early_param("no-kvmclock-vsyscall", pars + static struct pvclock_vsyscall_time_info + hv_clock_boot[HVC_BOOT_ARRAY_SIZE] __bss_decrypted __aligned(PAGE_SIZE); + static struct pvclock_wall_clock wall_clock __bss_decrypted; +-static DEFINE_PER_CPU(struct pvclock_vsyscall_time_info *, hv_clock_per_cpu); + static struct pvclock_vsyscall_time_info *hvclock_mem; +- +-static inline struct pvclock_vcpu_time_info *this_cpu_pvti(void) +-{ +- return &this_cpu_read(hv_clock_per_cpu)->pvti; +-} +- +-static inline struct pvclock_vsyscall_time_info *this_cpu_hvclock(void) +-{ +- return this_cpu_read(hv_clock_per_cpu); +-} ++DEFINE_PER_CPU(struct pvclock_vsyscall_time_info *, hv_clock_per_cpu); ++EXPORT_PER_CPU_SYMBOL_GPL(hv_clock_per_cpu); + + /* + * The wallclock is the time of day when we booted. Since then, some time may