cb1b656027
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.34 Remove upstreamed patches: generic/backport-6.12/421-01-v6.16-spi-bcm63xx-spi-fix-shared-reset.patch [1] generic/backport-6.12/421-02-v6.16-spi-bcm63xx-hsspi-fix-shared-reset.patch [2] generic/backport-6.12/610-06-v6.16-net-dsa-b53-do-not-enable-RGMII-delay-on-bcm63xx.patch [3] generic/backport-6.12/610-08-v6.16-net-dsa-b53-allow-RGMII-for-bcm63xx-RGMII-ports.patch [4] generic/backport-6.12/610-09-v6.16-net-dsa-b53-do-not-touch-DLL_IQQD-on-bcm53115.patch [5] generic/backport-6.12/611-v6.16-net-dsa-tag_brcm-legacy-fix-pskb_may_pull-length.patch [6] Manually rebased patches: bcm27xx/patches-6.12/950-0665-drm-vc4-tests-Drop-drm-parameter-for-vc4_find_crtc_f.patch [7] [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.34&id=408ca1d1803b223d615f9021055f9ccb4f4863ea [2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.34&id=2a98786e258718ff93ef6d6bd26a9a39076e0cb7 [3] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.34&id=6d1c93a5c6b0ae87bb7001d8d6fdef3b3be9c6c6 [4] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.34&id=1aa31695bf0dc1ee3e6c559c14db7fd05b6bb102 [5] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.34&id=b2fc08d276797e529cacad6fa9d704a7367090b5 [6] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.34&id=2c32fc56c05aa69439fdfd5e0b25f57e2a158627 [7] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.34&id=aba86d49e5ac3700295ab8c417436abacc19cc32 Signed-off-by: Shiji Yang <yangshiji66@outlook.com> Link: https://github.com/openwrt/openwrt/pull/19184 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
63 lines
2.1 KiB
Diff
63 lines
2.1 KiB
Diff
From 90fccf2582eec4442abbf1c47dfab4da24e6de39 Mon Sep 17 00:00:00 2001
|
|
From: Maxime Ripard <maxime@cerno.tech>
|
|
Date: Fri, 24 Mar 2023 09:58:15 +0100
|
|
Subject: [PATCH] drm/vc4: tests: Drop drm parameter for
|
|
vc4_find_crtc_for_encoder
|
|
|
|
The DRM device pointer and the DRM encoder pointer are redundant, since
|
|
the latter is attached to the former and we can just follow the
|
|
drm_encoder->dev pointer.
|
|
|
|
Let's remove the drm_device pointer argument.
|
|
|
|
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
|
|
---
|
|
drivers/gpu/drm/vc4/tests/vc4_mock.h | 2 +-
|
|
drivers/gpu/drm/vc4/tests/vc4_mock_output.c | 4 ++--
|
|
drivers/gpu/drm/vc4/tests/vc4_test_pv_muxing.c | 2 +-
|
|
3 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
--- a/drivers/gpu/drm/vc4/tests/vc4_mock.h
|
|
+++ b/drivers/gpu/drm/vc4/tests/vc4_mock.h
|
|
@@ -7,9 +7,9 @@
|
|
|
|
static inline
|
|
struct drm_crtc *vc4_find_crtc_for_encoder(struct kunit *test,
|
|
- struct drm_device *drm,
|
|
struct drm_encoder *encoder)
|
|
{
|
|
+ struct drm_device *drm = encoder->dev;
|
|
struct drm_crtc *crtc;
|
|
|
|
KUNIT_ASSERT_EQ(test, hweight32(encoder->possible_crtcs), 1);
|
|
--- a/drivers/gpu/drm/vc4/tests/vc4_mock_output.c
|
|
+++ b/drivers/gpu/drm/vc4/tests/vc4_mock_output.c
|
|
@@ -78,7 +78,7 @@ int vc4_mock_atomic_add_output(struct ku
|
|
if (!encoder)
|
|
return -ENODEV;
|
|
|
|
- crtc = vc4_find_crtc_for_encoder(test, drm, encoder);
|
|
+ crtc = vc4_find_crtc_for_encoder(test, encoder);
|
|
if (!crtc)
|
|
return -ENODEV;
|
|
|
|
@@ -122,7 +122,7 @@ int vc4_mock_atomic_del_output(struct ku
|
|
if (!encoder)
|
|
return -ENODEV;
|
|
|
|
- crtc = vc4_find_crtc_for_encoder(test, drm, encoder);
|
|
+ crtc = vc4_find_crtc_for_encoder(test, encoder);
|
|
if (!crtc)
|
|
return -ENODEV;
|
|
|
|
--- a/drivers/gpu/drm/vc4/tests/vc4_test_pv_muxing.c
|
|
+++ b/drivers/gpu/drm/vc4/tests/vc4_test_pv_muxing.c
|
|
@@ -131,7 +131,7 @@ get_vc4_crtc_state_for_encoder(struct ku
|
|
encoder = vc4_find_encoder_by_type(drm, type);
|
|
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, encoder);
|
|
|
|
- crtc = vc4_find_crtc_for_encoder(test, drm, encoder);
|
|
+ crtc = vc4_find_crtc_for_encoder(test, encoder);
|
|
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, crtc);
|
|
|
|
new_crtc_state = drm_atomic_get_new_crtc_state(state, crtc);
|