提交 ed8086d0 编写于 作者: L Lyude Paul 提交者: Zheng Zengkai

drm/nouveau/acpi: Don't print error when we get -EINPROGRESS from pm_runtime

stable inclusion
from stable-v5.10.137
commit 55f558442742fb76349b4f1844f386b8f3ecb92c
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I60PLB

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=55f558442742fb76349b4f1844f386b8f3ecb92c

--------------------------------

commit 53c26181 upstream.

Since this isn't actually a failure.
Signed-off-by: NLyude Paul <lyude@redhat.com>
Reviewed-by: NDavid Airlie <airlied@linux.ie>
Fixes: 79e765ad ("drm/nouveau/drm/nouveau: Prevent handling ACPI HPD events too early")
Cc: <stable@vger.kernel.org> # v4.19+
Link: https://patchwork.freedesktop.org/patch/msgid/20220714174234.949259-2-lyude@redhat.comSigned-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
Reviewed-by: NWei Li <liwei391@huawei.com>
上级 fcfa7f68
......@@ -543,7 +543,7 @@ nouveau_display_acpi_ntfy(struct notifier_block *nb, unsigned long val,
* it's own hotplug events.
*/
pm_runtime_put_autosuspend(drm->dev->dev);
} else if (ret == 0) {
} else if (ret == 0 || ret == -EINPROGRESS) {
/* We've started resuming the GPU already, so
* it will handle scheduling a full reprobe
* itself
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册