8c405cdccc
The patches were generated from the RPi repo with the following command: git format-patch v6.6.34..rpi-6.1.y Some patches needed rebasing and, as usual, the applied and reverted, wireless drivers, Github workflows, READMEs and defconfigs patches were removed. Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
64 lines
2.4 KiB
Diff
64 lines
2.4 KiB
Diff
From 78b4af90e7cbbeb34685ea1973e21c9a3be8bbc8 Mon Sep 17 00:00:00 2001
|
|
From: Maxime Ripard <maxime@cerno.tech>
|
|
Date: Fri, 24 Mar 2023 09:58:15 +0100
|
|
Subject: [PATCH 0624/1085] 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
|
|
@@ -77,7 +77,7 @@ int vc4_mock_atomic_add_output(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);
|
|
|
|
output = encoder_to_vc4_dummy_output(encoder);
|
|
@@ -115,7 +115,7 @@ int vc4_mock_atomic_del_output(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);
|
|
|
|
crtc_state = drm_atomic_get_crtc_state(state, crtc);
|
|
--- 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);
|