Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
- net/core/fib_rules.c | 2 +-
+ net/core/fib_rules.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/net/core/fib_rules.c b/net/core/fib_rules.c
-index 9bb321df0869..76c3f602ee15 100644
--- a/net/core/fib_rules.c
+++ b/net/core/fib_rules.c
-@@ -928,7 +928,7 @@ static void notify_rule_change(int event, struct fib_rule *rule,
+@@ -928,7 +928,7 @@ static void notify_rule_change(int event
{
struct net *net;
struct sk_buff *skb;
net = ops->fro_net;
skb = nlmsg_new(fib_rule_nlmsg_size(ops, rule), GFP_KERNEL);
---
-2.30.2
-
+++ /dev/null
-From 39ed53cac0d479b2791b0069233d7126b3cf5e69 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 14 May 2021 07:47:34 -0400
-Subject: drm/amd/display: Fix overlay validation by considering cursors
-
-From: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
-
-[ Upstream commit 33f409e60eb0c59a4d0d06a62ab4642a988e17f7 ]
-
-A few weeks ago, we saw a two cursor issue in a ChromeOS system. We
-fixed it in the commit:
-
- drm/amd/display: Fix two cursor duplication when using overlay
- (read the commit message for more details)
-
-After this change, we noticed that some IGT subtests related to
-kms_plane and kms_plane_scaling started to fail. After investigating
-this issue, we noticed that all subtests that fail have a primary plane
-covering the overlay plane, which is currently rejected by amdgpu dm.
-Fail those IGT tests highlight that our verification was too broad and
-compromises the overlay usage in our drive. This patch fixes this issue
-by ensuring that we only reject commits where the primary plane is not
-fully covered by the overlay when the cursor hardware is enabled. With
-this fix, all IGT tests start to pass again, which means our overlay
-support works as expected.
-
-Cc: Tianci.Yin <tianci.yin@amd.com>
-Cc: Harry Wentland <harry.wentland@amd.com>
-Cc: Nicholas Choi <nicholas.choi@amd.com>
-Cc: Bhawanpreet Lakha <bhawanpreet.lakha@amd.com>
-Cc: Nicholas Kazlauskas <Nicholas.Kazlauskas@amd.com>
-Cc: Mark Yacoub <markyacoub@google.com>
-Cc: Daniel Wheeler <daniel.wheeler@amd.com>
-
-Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
-Signed-off-by: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
-Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
-index fbbb1bde6b06..4792228ed481 100644
---- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
-+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
-@@ -8616,7 +8616,7 @@ static int validate_overlay(struct drm_atomic_state *state)
- int i;
- struct drm_plane *plane;
- struct drm_plane_state *old_plane_state, *new_plane_state;
-- struct drm_plane_state *primary_state, *overlay_state = NULL;
-+ struct drm_plane_state *primary_state, *cursor_state, *overlay_state = NULL;
-
- /* Check if primary plane is contained inside overlay */
- for_each_oldnew_plane_in_state_reverse(state, plane, old_plane_state, new_plane_state, i) {
-@@ -8646,6 +8646,14 @@ static int validate_overlay(struct drm_atomic_state *state)
- if (!primary_state->crtc)
- return 0;
-
-+ /* check if cursor plane is enabled */
-+ cursor_state = drm_atomic_get_plane_state(state, overlay_state->crtc->cursor);
-+ if (IS_ERR(cursor_state))
-+ return PTR_ERR(cursor_state);
-+
-+ if (drm_atomic_plane_disabling(plane->state, cursor_state))
-+ return 0;
-+
- /* Perform the bounds check to ensure the overlay plane covers the primary */
- if (primary_state->crtc_x < overlay_state->crtc_x ||
- primary_state->crtc_y < overlay_state->crtc_y ||
---
-2.30.2
-
net-ipconfig-don-t-override-command-line-hostnames-o.patch
drm-amd-display-allow-bandwidth-validation-for-0-str.patch
drm-amdgpu-refine-amdgpu_fru_get_product_info.patch
-drm-amd-display-fix-overlay-validation-by-considerin.patch
drm-amd-display-fix-potential-memory-leak-in-dmub-hw.patch
drm-amd-amdgpu-save-psp-ring-wptr-to-avoid-attack.patch
rtnetlink-fix-missing-error-code-in-rtnl_bridge_noti.patch
+++ /dev/null
-From 7739f4d290c08f5007df2795a04ca2631e95511d Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 14 May 2021 07:47:34 -0400
-Subject: drm/amd/display: Fix overlay validation by considering cursors
-
-From: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
-
-[ Upstream commit 33f409e60eb0c59a4d0d06a62ab4642a988e17f7 ]
-
-A few weeks ago, we saw a two cursor issue in a ChromeOS system. We
-fixed it in the commit:
-
- drm/amd/display: Fix two cursor duplication when using overlay
- (read the commit message for more details)
-
-After this change, we noticed that some IGT subtests related to
-kms_plane and kms_plane_scaling started to fail. After investigating
-this issue, we noticed that all subtests that fail have a primary plane
-covering the overlay plane, which is currently rejected by amdgpu dm.
-Fail those IGT tests highlight that our verification was too broad and
-compromises the overlay usage in our drive. This patch fixes this issue
-by ensuring that we only reject commits where the primary plane is not
-fully covered by the overlay when the cursor hardware is enabled. With
-this fix, all IGT tests start to pass again, which means our overlay
-support works as expected.
-
-Cc: Tianci.Yin <tianci.yin@amd.com>
-Cc: Harry Wentland <harry.wentland@amd.com>
-Cc: Nicholas Choi <nicholas.choi@amd.com>
-Cc: Bhawanpreet Lakha <bhawanpreet.lakha@amd.com>
-Cc: Nicholas Kazlauskas <Nicholas.Kazlauskas@amd.com>
-Cc: Mark Yacoub <markyacoub@google.com>
-Cc: Daniel Wheeler <daniel.wheeler@amd.com>
-
-Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
-Signed-off-by: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
-Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
-index b63f55ea8758..69023b4b0a8b 100644
---- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
-+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
-@@ -9349,7 +9349,7 @@ static int validate_overlay(struct drm_atomic_state *state)
- int i;
- struct drm_plane *plane;
- struct drm_plane_state *old_plane_state, *new_plane_state;
-- struct drm_plane_state *primary_state, *overlay_state = NULL;
-+ struct drm_plane_state *primary_state, *cursor_state, *overlay_state = NULL;
-
- /* Check if primary plane is contained inside overlay */
- for_each_oldnew_plane_in_state_reverse(state, plane, old_plane_state, new_plane_state, i) {
-@@ -9379,6 +9379,14 @@ static int validate_overlay(struct drm_atomic_state *state)
- if (!primary_state->crtc)
- return 0;
-
-+ /* check if cursor plane is enabled */
-+ cursor_state = drm_atomic_get_plane_state(state, overlay_state->crtc->cursor);
-+ if (IS_ERR(cursor_state))
-+ return PTR_ERR(cursor_state);
-+
-+ if (drm_atomic_plane_disabling(plane->state, cursor_state))
-+ return 0;
-+
- /* Perform the bounds check to ensure the overlay plane covers the primary */
- if (primary_state->crtc_x < overlay_state->crtc_x ||
- primary_state->crtc_y < overlay_state->crtc_y ||
---
-2.30.2
-
net-ipconfig-don-t-override-command-line-hostnames-o.patch
drm-amd-display-allow-bandwidth-validation-for-0-str.patch
drm-amdgpu-refine-amdgpu_fru_get_product_info.patch
-drm-amd-display-fix-overlay-validation-by-considerin.patch
drm-amd-display-fix-potential-memory-leak-in-dmub-hw.patch
drm-amd-amdgpu-save-psp-ring-wptr-to-avoid-attack.patch
rtnetlink-fix-missing-error-code-in-rtnl_bridge_noti.patch
+++ /dev/null
-From dbb1acb6f60755032c544a902f5dbc0b04b0aa81 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 14 May 2021 07:47:34 -0400
-Subject: drm/amd/display: Fix overlay validation by considering cursors
-
-From: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
-
-[ Upstream commit 33f409e60eb0c59a4d0d06a62ab4642a988e17f7 ]
-
-A few weeks ago, we saw a two cursor issue in a ChromeOS system. We
-fixed it in the commit:
-
- drm/amd/display: Fix two cursor duplication when using overlay
- (read the commit message for more details)
-
-After this change, we noticed that some IGT subtests related to
-kms_plane and kms_plane_scaling started to fail. After investigating
-this issue, we noticed that all subtests that fail have a primary plane
-covering the overlay plane, which is currently rejected by amdgpu dm.
-Fail those IGT tests highlight that our verification was too broad and
-compromises the overlay usage in our drive. This patch fixes this issue
-by ensuring that we only reject commits where the primary plane is not
-fully covered by the overlay when the cursor hardware is enabled. With
-this fix, all IGT tests start to pass again, which means our overlay
-support works as expected.
-
-Cc: Tianci.Yin <tianci.yin@amd.com>
-Cc: Harry Wentland <harry.wentland@amd.com>
-Cc: Nicholas Choi <nicholas.choi@amd.com>
-Cc: Bhawanpreet Lakha <bhawanpreet.lakha@amd.com>
-Cc: Nicholas Kazlauskas <Nicholas.Kazlauskas@amd.com>
-Cc: Mark Yacoub <markyacoub@google.com>
-Cc: Daniel Wheeler <daniel.wheeler@amd.com>
-
-Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
-Signed-off-by: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
-Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
-index 6e31e899192c..29657844bac1 100644
---- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
-+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
-@@ -7272,7 +7272,7 @@ static int validate_overlay(struct drm_atomic_state *state)
- int i;
- struct drm_plane *plane;
- struct drm_plane_state *old_plane_state, *new_plane_state;
-- struct drm_plane_state *primary_state, *overlay_state = NULL;
-+ struct drm_plane_state *primary_state, *cursor_state, *overlay_state = NULL;
-
- /* Check if primary plane is contained inside overlay */
- for_each_oldnew_plane_in_state_reverse(state, plane, old_plane_state, new_plane_state, i) {
-@@ -7302,6 +7302,14 @@ static int validate_overlay(struct drm_atomic_state *state)
- if (!primary_state->crtc)
- return 0;
-
-+ /* check if cursor plane is enabled */
-+ cursor_state = drm_atomic_get_plane_state(state, overlay_state->crtc->cursor);
-+ if (IS_ERR(cursor_state))
-+ return PTR_ERR(cursor_state);
-+
-+ if (drm_atomic_plane_disabling(plane->state, cursor_state))
-+ return 0;
-+
- /* Perform the bounds check to ensure the overlay plane covers the primary */
- if (primary_state->crtc_x < overlay_state->crtc_x ||
- primary_state->crtc_y < overlay_state->crtc_y ||
---
-2.30.2
-
nvme-loop-check-for-nvme_loop_q_live-in-nvme_loop_de.patch
net-ipconfig-don-t-override-command-line-hostnames-o.patch
drm-amd-display-allow-bandwidth-validation-for-0-str.patch
-drm-amd-display-fix-overlay-validation-by-considerin.patch
rtnetlink-fix-missing-error-code-in-rtnl_bridge_noti.patch
net-x25-return-the-correct-errno-code.patch
net-return-the-correct-errno-code.patch
projects / thirdparty / kernel / stable-queue.git / commitdiff
