Commit 2563391e57 ("drm/amd/display: DML2.1 resynchronization") blew
away the compiler warning fix from commit 2fde4fdddc
("drm/amd/display: Avoid -Wenum-float-conversion in
add_margin_and_round_to_dfs_grainularity()"), causing the warning to
reappear.
drivers/gpu/drm/amd/amdgpu/../display/dc/dml2/dml21/src/dml2_dpmm/dml2_dpmm_dcn4.c:183:58: error: arithmetic between enumeration type 'enum dentist_divider_range' and floating-point type 'double' [-Werror,-Wenum-float-conversion]
183 | divider = (unsigned int)(DFS_DIVIDER_RANGE_SCALE_FACTOR * (vco_freq_khz / clock_khz));
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~
1 error generated.
Apply the fix again to resolve the warning.
Re-apply again after commit be4e350931 ("drm/amd/display: DML21 Reintegration For Various Fixes")
This should be making its way back to the original DML trees this time. (Alex)
Fixes: be4e350931 ("drm/amd/display: DML21 Reintegration For Various Fixes")
Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/3841
Signed-off-by: Nathan Chancellor <nathan@kernel.org>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
As the hw supports up to 4 surfaces, increase the maximum number of
surfaces to prevent the DC error when trying to use more than three
planes.
[drm:dc_state_add_plane [amdgpu]] *ERROR* Surface: can not attach plane_state 000000003e2cb82c! Maximum is: 3
Link: https://gitlab.freedesktop.org/drm/amd/-/issues/3693
Signed-off-by: Melissa Wen <mwen@igalia.com>
Reviewed-by: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Signed-off-by: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
[WHY & HOW]
commit 7fb363c575 ("drm/amd/display: Let drm_crtc_vblank_on/off manage interrupts")
lets drm_crtc_vblank_* to manage interrupts in amdgpu_dm_crtc_set_vblank,
and amdgpu_irq_get/put do not need to be called here. Part of that
patch got lost somehow, so fix it up.
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Leo Li <sunpeng.li@amd.com>
Signed-off-by: Alex Hung <alex.hung@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drm-misc-fixes for v6.13-rc4:
- udma-buf fixes related to sealing.
- dma-buf build warning fix when debugfs is not enabled.
- Assorted drm/panel fixes.
- Correct error return in drm_dp_tunnel_mgr_create.
- Fix even more divide by zero in drm_mode_vrefresh.
- Fix FBDEV dependencies in Kconfig.
- Documentation fix for drm_sched_fini.
- IVPU NULL pointer, memory leak and WARN fix.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/d0763051-87b7-483e-89e0-a9f993383450@linux.intel.com
# New commits in x86/tdx:
6f5c71cc42 ("x86/virt/tdx: Require the module to assert it has the NO_RBP_MOD mitigation")
fae43b24a6 ("x86/virt/tdx: Switch to use auto-generated global metadata reading code")
6bfb77f489 ("x86/virt/tdx: Use dedicated struct members for PAMT entry sizes")
04a7bc7316 ("x86/virt/tdx: Use auto-generated code to read global metadata")
c4e0862a62 ("x86/virt/tdx: Start to track all global metadata in one structure")
e8aa393b0a ("x86/virt/tdx: Rename 'struct tdx_tdmr_sysinfo' to reflect the spec better")
564ea84c8c ("x86/tdx: Dump attributes and TD_CTLS on boot")
cd9ce82173 ("x86/tdx: Disable unnecessary virtualization exceptions")
Signed-off-by: Ingo Molnar <mingo@kernel.org>
# New commits in x86/sev:
21fc6178e9 ("x86/sev/docs: Document the SNP Reverse Map Table (RMP)")
8ae3291f77 ("x86/sev: Add full support for a segmented RMP table")
0f14af0d1d ("x86/sev: Treat the contiguous RMP table as a single RMP segment")
ac517965a5 ("x86/sev: Map only the RMP table entries instead of the full RMP range")
e2f3d40df8 ("x86/sev: Move the SNP probe routine out of the way")
4972808d6f ("x86/sev: Require the RMPREAD instruction after Zen4")
0cbc025841 ("x86/sev: Add support for the RMPREAD instruction")
3e43c60eb3 ("x86/sev: Prepare for using the RMPREAD instruction to access the RMP")
Signed-off-by: Ingo Molnar <mingo@kernel.org>
# New commits in x86/mm:
dd4059634d ("x86/mtrr: Rename mtrr_overwrite_state() to guest_force_mtrr_state()")
9d93db0d18 ("x86/mm/selftests: Fix typo in lam.c")
6db2526c1d ("x86/mm/tlb: Only trim the mm_cpumask once a second")
953753db88 ("x86/mm/tlb: Also remove local CPU from mm_cpumask if stale")
2815a56e4b ("x86/mm/tlb: Add tracepoint for TLB flush IPI to stale CPU")
209954cbc7 ("x86/mm/tlb: Update mm_cpumask lazily")
Signed-off-by: Ingo Molnar <mingo@kernel.org>
# New commits in x86/misc:
6a5abeea9c ("x86/mtrr: Rename mtrr_overwrite_state() to guest_force_mtrr_state()")
Signed-off-by: Ingo Molnar <mingo@kernel.org>
# New commits in x86/cache:
faf6ef6737 ("x86/resctrl: Document the new "mba_MBps_event" file")
8e931105ac ("x86/resctrl: Add write option to "mba_MBps_event" file")
f5cd0e316f ("x86/resctrl: Add "mba_MBps_event" file to CTRL_MON directories")
141cb5c482 ("x86/resctrl: Make mba_sc use total bandwidth if local is not supported")
2c272fadb5 ("x86/resctrl: Compute memory bandwidth for all supported events")
481d363748 ("x86/resctrl: Modify update_mba_bw() to use per CTRL_MON group event")
3b49c37a2f ("x86/resctrl: Prepare for per-CTRL_MON group mba_MBps control")
2937f9c361 ("x86/resctrl: Introduce resctrl_file_fflags_init() to initialize fflags")
135eef38d7 ("x86/resctrl: Use kthread_run_on_cpu()")
Signed-off-by: Ingo Molnar <mingo@kernel.org>
# New commits in x86/boot:
35aafa1d41 ("x86/boot/64: Fix spurious undefined reference when CONFIG_X86_5LEVEL=n, on GCC-12")
a3eaa2be70 ("x86/sysfs: Constify 'struct bin_attribute'")
5a82223e07 ("x86/kexec: Mark relocate_kernel page as ROX instead of RWX")
93e489ad7a ("x86/kexec: Clean up register usage in relocate_kernel()")
b7155dfd49 ("x86/kexec: Eliminate writes through kernel mapping of relocate_kernel page")
b3adabae8a ("x86/kexec: Drop page_list argument from relocate_kernel()")
8dbec5c77b ("x86/kexec: Add data section to relocate_kernel")
cb33ff9e06 ("x86/kexec: Move relocate_kernel to kernel .data section")
eeebbde571 ("x86/kexec: Invoke copy of relocate_kernel() instead of the original")
6a750b4c00 ("x86/kexec: Copy control page into place in machine_kexec_prepare()")
4b5bc2ec9a ("x86/kexec: Allocate PGD for x86_64 transition page tables separately")
9e5683e2d0 ("x86/kexec: Only swap pages for ::preserve_context mode")
46d4e205e2 ("x86/kexec: Use named labels in swap_pages in relocate_kernel_64.S")
207bdf7f72 ("x86/kexec: Clean up and document register use in relocate_kernel_64.S")
faf0ed4874 ("x86/boot: Reject absolute references in .head.text")
a6a4ae9c3f ("x86/boot: Move .head.text into its own output section")
35350eb689 ("x86/kernel: Move ENTRY_TEXT to the start of the image")
3b6f99a94b ("x86/boot: Disable UBSAN in early boot code")
0d9b9a328c ("x86/boot/64: Avoid intentional absolute symbol references in .head.text")
093562198e ("x86/boot/64: Determine VA/PA offset before entering C code")
09d35045cd ("x86/sev: Avoid WARN()s and panic()s in early boot code")
Signed-off-by: Ingo Molnar <mingo@kernel.org>
# New commits in perf/core:
02c56362a7 ("uprobes: Guard against kmemdup() failing in dup_return_instance()")
d29e744c71 ("perf/x86: Relax privilege filter restriction on AMD IBS")
6057b90ecc ("perf/core: Export perf_exclude_event()")
8622e45b5d ("uprobes: Reuse return_instances between multiple uretprobes within task")
0cf981de76 ("uprobes: Ensure return_instance is detached from the list before freeing")
636666a1c7 ("uprobes: Decouple return_instance list traversal and freeing")
2ff913ab3f ("uprobes: Simplify session consumer tracking")
e0925f2dc4 ("uprobes: add speculative lockless VMA-to-inode-to-uprobe resolution")
83e3dc9a5d ("uprobes: simplify find_active_uprobe_rcu() VMA checks")
03a001b156 ("mm: introduce mmap_lock_speculate_{try_begin|retry}")
eb449bd969 ("mm: convert mm_lock_seq to a proper seqcount")
7528585290 ("mm/gup: Use raw_seqcount_try_begin()")
96450ead16 ("seqlock: add raw_seqcount_try_begin")
b4943b8bfc ("perf/x86/rapl: Add core energy counter support for AMD CPUs")
54d2759778 ("perf/x86/rapl: Move the cntr_mask to rapl_pmus struct")
bdc57ec705 ("perf/x86/rapl: Remove the global variable rapl_msrs")
abf03d9bd2 ("perf/x86/rapl: Modify the generic variable names to *_pkg*")
eeca4c6b25 ("perf/x86/rapl: Add arguments to the init and cleanup functions")
cd29d83a6d ("perf/x86/rapl: Make rapl_model struct global")
8bf1c86e5a ("perf/x86/rapl: Rename rapl_pmu variables")
1d5e2f637a ("perf/x86/rapl: Remove the cpu_to_rapl_pmu() function")
e4b4443477 ("x86/topology: Introduce topology_logical_core_id()")
2f2db34707 ("perf/x86/rapl: Remove the unused get_rapl_pmu_cpumask() function")
ae55e308bd ("perf/x86/intel/ds: Simplify the PEBS records processing for adaptive PEBS")
3c00ed344c ("perf/x86/intel/ds: Factor out functions for PEBS records processing")
7087bfb0ad ("perf/x86/intel/ds: Clarify adaptive PEBS processing")
faac6f105e ("perf/core: Check sample_type in perf_sample_save_brstack")
f226805bc5 ("perf/core: Check sample_type in perf_sample_save_callchain")
b9c44b9147 ("perf/core: Save raw sample data conditionally based on sample type")
Signed-off-by: Ingo Molnar <mingo@kernel.org>
# New commits in locking/core:
63a48181fb ("smp/scf: Evaluate local cond_func() before IPI side-effects")
d387ceb171 ("locking/lockdep: Enforce PROVE_RAW_LOCK_NESTING only if ARCH_SUPPORTS_RT")
Signed-off-by: Ingo Molnar <mingo@kernel.org>
# New commits in irq/core:
b4706d8149 ("genirq/kexec: Prevent redundant IRQ masking by checking state before shutdown")
bad6722e47 ("kexec: Consolidate machine_kexec_mask_interrupts() implementation")
429f49ad36 ("genirq: Reuse irq_thread_fn() for forced thread case")
6f8b79683d ("genirq: Move irq_thread_fn() further up in the code")
Signed-off-by: Ingo Molnar <mingo@kernel.org>
# New commits in locking/urgent:
4a07791457 ("locking/rtmutex: Make sure we wake anything on the wake_q when we release the lock->wait_lock")
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Currently if no comm can be found dlm_comm_seq() returns -EEXIST which
means entry already exists for a lookup it makes no sense to return
-EEXIST. We change it to -ENOENT. There is no user that will evaluate
the return value on a specific value so this should be fine.
Signed-off-by: Alexander Aring <aahringo@redhat.com>
Signed-off-by: David Teigland <teigland@redhat.com>
The return type of srcu_read_lock() is int and not bool. Whereas we
using the ret variable only to evaluate a bool type of
dlm_lowcomms_con_has_addr() to check if an address is already being set.
Fixes: 6f0b0b5d7a ("fs: dlm: remove dlm_node_addrs lookup list")
Signed-off-by: Alexander Aring <aahringo@redhat.com>
Signed-off-by: David Teigland <teigland@redhat.com>
