2e715fb4fc
Add support for BCM2712 (Raspberry Pi 5).
3bb5880ab3
Patches were generated from the diff between linux kernel branch linux-6.1.y
and rpi-6.1.y from raspberry pi kernel source:
- git format-patch linux-6.1.y...rpi-6.1.y
Build system: x86_64
Build-tested: bcm2708, bcm2709, bcm2710, bcm2711
Run-tested: bcm2710/RPi3B, bcm2711/RPi4B
Signed-off-by: Marty Jones <mj8263788@gmail.com>
[Remove applied and reverted patches, squash patches and config commits]
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
63 lines
2.4 KiB
Diff
63 lines
2.4 KiB
Diff
From 70e906d3c688491e181446afa27bea32ce241d6a 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
|
|
@@ -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 = container_of(encoder, struct vc4_dummy_output, encoder.base);
|
|
@@ -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
|
|
@@ -132,7 +132,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);
|