Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] master from torvalds:master #1769

Merged
merged 100 commits into from
Feb 7, 2025
Merged
Changes from 1 commit
Commits
Show all changes
100 commits
Select commit Hold shift + click to select a range
3c47c2c
nvmet: fix rw control endian access
keithbusch Jan 14, 2025
d68fc95
nvme-pci: remove redundant dma frees in hmb
francispravin5 Jan 16, 2025
dbf2bb1
nvme-pci: Add TUXEDO InfinityFlex to Samsung sleep quirk
Dec 16, 2024
11cb352
nvme-pci: Add TUXEDO IBP Gen9 to Samsung sleep quirk
Dec 16, 2024
d3d380e
nvme-fc: go straight to connecting state when initializing
igaw Jan 9, 2025
294b2b7
nvme: handle connectivity loss in nvme_set_queue_count
igaw Jan 9, 2025
ee59e38
nvme-fc: do not ignore connectivity loss during connecting
igaw Jan 9, 2025
93c66fb
powercap: call put_device() on an error path in powercap_register_con…
joehattori Jan 10, 2025
58f5c8d
nvmet: fix a memory leak in controller identify
sagigrimberg Jan 24, 2025
e0f63bc
drm/print: Include drm_device.h
guludo Jan 21, 2025
fd39c41
drm/ast: astdp: Fix timeout for enabling video signal
Jan 27, 2025
7bf6b49
nvmet: the result field in nvmet_alloc_ctrl_args is little endian
Jan 28, 2025
cc3d467
nvmet: add a missing endianess conversion in nvmet_execute_admin_connect
Jan 28, 2025
e1e17a1
firmware: iscsi_ibft: fix ISCSI_IBFT Kconfig entry
Mar 11, 2024
07e0d99
iscsi_ibft: Fix UBSAN shift-out-of-bounds warning in ibft_attr_show_n…
yukariatlas Jan 14, 2025
79fc672
drm/komeda: Add check for komeda_get_layer_fourcc_list()
Dec 19, 2024
6daaae5
gpu: drm_dp_cec: fix broken CEC adapter properties check
hverkuil Jan 29, 2025
2d1a2da
nvme: make nvme_tls_attrs_group static
keithbusch Jan 28, 2025
c8ed6cb
nvme-fc: use ctrl state getter
igaw Jan 28, 2025
a572593
md: Fix linear_set_limits()
bvanassche Jan 29, 2025
64b48ec
drivers/block/sunvdc.c: update the correct AIP call
sfrothwell Feb 3, 2025
fa80351
cpufreq/amd-pstate: Fix per-policy boost flag incorrect when fail
Jan 10, 2025
f3be8a9
accel/ivpu: Fix error handling in ivpu_boot()
jlawryno Jan 29, 2025
f2bc2af
accel/ivpu: Clear runtime_error after pm_runtime_resume_and_get() fails
jlawryno Jan 29, 2025
41a2d82
accel/ivpu: Fix error handling in recovery/reset
jlawryno Jan 29, 2025
4480604
drm/i915/hdcp: Fix Repeater authentication during topology change
surajk8 Dec 17, 2024
8dd5a5e
drm/i915/hdcp: Use correct function to check if encoder is HDMI
surajk8 Jan 17, 2025
cb5fab2
drm/i915/pmu: Fix zero delta busyness issue
unerlige Jan 23, 2025
fa6182c
drm/i915: Fix page cleanup on DMA remap failure
bgaff Jan 27, 2025
c7b4950
drm/i915: Drop 64bpp YUV formats from ICL+ SDR planes
vsyrjala Dec 18, 2024
5796526
drm/i915/guc: Debug print LRC state entries only if the context is pi…
dceraolo Jan 15, 2025
4466302
drm/i915/dp: fix the Adaptive sync Operation mode for SDP
aknautiyal Jan 30, 2025
985a44b
drm/i915/dp: Return min bpc supported by source instead of 0
aknautiyal Jan 31, 2025
3cf3ec9
drm/i915/backlight: Return immediately when scale() finds invalid par…
groeck Jan 21, 2025
457bf49
Merge tag 'nvme-6.14-2025-01-31' of git://git.infradead.org/nvme into…
axboe Feb 3, 2025
2255b40
drm/amdgpu: add a BO metadata flag to disable write compression for V…
Jan 24, 2025
8adbb2a
drm/amd/display: Fix out-of-bound accesses
Jan 17, 2025
e01f07c
drm/amd/display: Fix seamless boot sequence
LoAnChen Jan 17, 2025
588c200
drm/xe/oa: Preserve oa_ctrl unused bits
ashutoshx Jan 17, 2025
9f706fd
drm/xe/pf: Fix migration initialization
mwajdecz Jan 20, 2025
990d35e
drm/xe/oa: Set stream->pollin in xe_oa_buffer_check_unlocked
ashutoshx Jan 15, 2025
042c48b
drm/xe/devcoredump: Move exec queue snapshot to Contexts section
lucasdemarchi Jan 23, 2025
a9ab659
drm/xe: Fix and re-enable xe_print_blob_ascii85()
lucasdemarchi Jan 23, 2025
230b19b
drm/i915/dp: Iterate DSC BPP from high to low on all platforms
jnikula Jan 31, 2025
ecee4d0
accel/amdxdna: Add MODULE_FIRMWARE() declarations
superm1 Feb 4, 2025
d6179f6
gpio: pca953x: Improve interrupt support
Jun 6, 2024
820ccf8
drm/amd/display: Respect user's CONFIG_FRAME_WARN more for dml files
nathanchance Jan 31, 2025
f245b40
Revert "drm/amd/display: Use HW lock mgr for PSR1"
Feb 4, 2025
015b7da
gpio: sim: lock hog configfs items if present
Feb 3, 2025
5393f40
gpio: GPIO_GRGPIO should depend on OF
geertu Feb 5, 2025
59ff204
MAINTAINERS: Use my kernel.org address for ACPI GPIO work
westeri Feb 4, 2025
d364eee
cpufreq/amd-pstate: Remove the goto label in amd_pstate_update_limits
Feb 5, 2025
55db9b7
cpufreq/amd-pstate: Fix max_perf updation with schedutil
Feb 5, 2025
069504f
drm/i915/dp: Fix potential infinite loop in 128b/132b SST
jnikula Feb 4, 2025
90508a1
cpufreq: airoha: modify CONFIG_OF dependency
arndb Feb 3, 2025
0813fd2
cpufreq: prevent NULL dereference in cpufreq_online()
AboorvaDevarajan Feb 5, 2025
ab93048
ACPI: property: Fix return value for nval == 0 in acpi_data_prop_read()
andy-shev Feb 3, 2025
607ab6f
ACPI: resource: IRQ override for Eluktronics MECH-17
Kolgann Jan 27, 2025
7f5704b
ACPI: PRM: Remove unnecessary strict handler address checks
Jan 26, 2025
2c1ed90
Merge remote-tracking branch 'drm-misc/drm-misc-next-fixes' into drm-…
mripard Feb 6, 2025
3ace200
cpufreq/amd-pstate: Fix cpufreq_policy ref counting
Feb 5, 2025
b3cc5af
Merge tag 'amd-pstate-v6.14-2025-02-06' of ssh://gitolite.kernel.org/…
rafaeljw Feb 6, 2025
fdfd0ad
bcachefs docs: SubmittingPatches.rst
Feb 1, 2025
6b37037
bcachefs: fix incorrect pointer check in __bch2_subvolume_delete()
name2965 Jan 31, 2025
2ef995d
bcachefs: fix deadlock in journal_entry_open()
name2965 Feb 2, 2025
9e90335
bcachefs: Fix discard path journal flushing
Jan 27, 2025
3539880
bcachefs: Fix rcu imbalance in bch2_fs_btree_key_cache_exit()
Feb 3, 2025
4be214c
bcachefs: bch2_bkey_sectors_need_rebalance() now only depends on bch_…
Jan 26, 2025
f2e6f00
Merge tag 'amd-drm-fixes-6.14-2025-02-05' of https://gitlab.freedeskt…
airlied Feb 7, 2025
e92e11b
Merge tag 'drm-misc-fixes-2025-02-06' of https://gitlab.freedesktop.o…
airlied Feb 7, 2025
7fa68b9
Merge tag 'drm-xe-fixes-2025-02-06' of https://gitlab.freedesktop.org…
airlied Feb 7, 2025
4f6993b
Merge tag 'drm-intel-fixes-2025-02-06' of https://gitlab.freedesktop.…
airlied Feb 7, 2025
0fac3ed
fs/stat.c: avoid harmless garbage value problem in vfs_statx_path()
Jan 19, 2025
4e74872
vboxsf: fix building with GCC 15
listout Jan 21, 2025
e52e97f
statmount: let unset strings be empty
Jan 30, 2025
d9b3a3c
gfs2: use lockref_init for gl_lockref
Jan 30, 2025
34ad6fa
gfs2: switch to lockref_init(..., 1)
Jan 30, 2025
bb504b4
lockref: remove count argument of lockref_init
Jan 30, 2025
b06ddfe
Merge patch series "further lockref cleanups"
brauner Jan 30, 2025
9510140
fsnotify: use accessor to set FMODE_NONOTIFY_*
amir73il Feb 3, 2025
5eb9871
fs: fix adding security options to statmount.mnt_opt
Jan 29, 2025
2a42754
fsnotify: disable notification by default for all pseudo files
amir73il Feb 3, 2025
2cc0205
selftests: always check mask returned by statmount(2)
Jan 29, 2025
711f9b8
fsnotify: disable pre-content and permission events by default
amir73il Feb 3, 2025
ec6164a
Merge patch series "Fix for huge faults regression"
brauner Feb 4, 2025
091ee63
pidfs: improve ioctl handling
brauner Feb 4, 2025
37d11cf
vfs: sanity check the length passed to inode_set_cached_link()
mjguzik Feb 4, 2025
73195be
Merge branch 'pm-powercap'
rafaeljw Feb 7, 2025
3e3e377
Merge branches 'acpi-property' and 'acpi-resource'
rafaeljw Feb 7, 2025
96b531f
Merge tag 'md-6.14-20250206' of https://git.kernel.org/pub/scm/linux/…
axboe Feb 7, 2025
511121a
MAINTAINERS: Move Pavel to kernel.org address
pavelmachek Feb 5, 2025
1b3291f
MAINTAINERS: Remove myself
marcan Feb 6, 2025
94b481f
Merge tag 'bcachefs-2025-02-06.2' of git://evilpiepirate.org/bcachefs
torvalds Feb 7, 2025
8c67da5
Merge tag 'vfs-6.14-rc2.fixes' of git://git.kernel.org/pub/scm/linux/…
torvalds Feb 7, 2025
78b2a23
Merge tag 'gpio-fixes-for-v6.14-rc2' of git://git.kernel.org/pub/scm/…
torvalds Feb 7, 2025
0aa0282
Merge tag 'acpi-6.14-rc2' of git://git.kernel.org/pub/scm/linux/kerne…
torvalds Feb 7, 2025
1fa9970
Merge tag 'pm-6.14-rc2' of git://git.kernel.org/pub/scm/linux/kernel/…
torvalds Feb 7, 2025
a67d0a0
Merge tag 'block-6.14-20250207' of git://git.kernel.dk/linux
torvalds Feb 7, 2025
8aa0f49
Merge tag 'stable/for-linus-6.14-rc1-tag' of git://git.kernel.org/pub…
torvalds Feb 7, 2025
7ee983c
Merge tag 'drm-fixes-2025-02-08' of https://gitlab.freedesktop.org/dr…
torvalds Feb 7, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
accel/ivpu: Clear runtime_error after pm_runtime_resume_and_get() fails
pm_runtime_resume_and_get() sets dev->power.runtime_error that causes
all subsequent pm_runtime_get_sync() calls to fail.
Clear the runtime_error using pm_runtime_set_suspended(), so the driver
doesn't have to be reloaded to recover when the NPU fails to boot during
runtime resume.

Fixes: 7d4b4c7 ("accel/ivpu: Remove suspend_reschedule_counter")
Cc: [email protected] # v6.11+
Reviewed-by: Maciej Falkowski <[email protected]>
Reviewed-by: Jeffrey Hugo <[email protected]>
Signed-off-by: Jacek Lawrynowicz <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
  • Loading branch information
jlawryno committed Feb 3, 2025
commit f2bc2afe34c107a02ce829a4039e85514feafe55
5 changes: 4 additions & 1 deletion drivers/accel/ivpu/ivpu_pm.c
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,10 @@ int ivpu_rpm_get(struct ivpu_device *vdev)
int ret;

ret = pm_runtime_resume_and_get(vdev->drm.dev);
drm_WARN_ON(&vdev->drm, ret < 0);
if (ret < 0) {
ivpu_err(vdev, "Failed to resume NPU: %d\n", ret);
pm_runtime_set_suspended(vdev->drm.dev);
}

return ret;
}
Expand Down