mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-20 06:08:08 +00:00
793f8ab62c
Add kernel patches for version 6.1. Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
117 lines
3.7 KiB
Diff
117 lines
3.7 KiB
Diff
From 0058bbeb9f6223b9760aba662ccba5d25290e4bd Mon Sep 17 00:00:00 2001
|
|
From: Maxime Ripard <maxime@cerno.tech>
|
|
Date: Wed, 23 Nov 2022 16:26:02 +0100
|
|
Subject: [PATCH] drm/vc4: crtc: Provide a CRTC name
|
|
|
|
It's fairly hard to figure out the instance of the CRTC affected by an
|
|
atomic change using the default name.
|
|
|
|
Since we can provide our own to the CRTC initialization functions, let's
|
|
do so to make the debugging sessions easier.
|
|
|
|
Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>
|
|
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
|
|
Link: https://patchwork.freedesktop.org/patch/msgid/20221123-rpi-kunit-tests-v1-20-051a0bb60a16@cerno.tech
|
|
---
|
|
drivers/gpu/drm/vc4/vc4_crtc.c | 10 +++++++++-
|
|
drivers/gpu/drm/vc4/vc4_drv.h | 2 ++
|
|
drivers/gpu/drm/vc4/vc4_txp.c | 1 +
|
|
3 files changed, 12 insertions(+), 1 deletion(-)
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_crtc.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_crtc.c
|
|
@@ -1173,6 +1173,7 @@ static const struct drm_crtc_helper_func
|
|
|
|
static const struct vc4_pv_data bcm2835_pv0_data = {
|
|
.base = {
|
|
+ .name = "pixelvalve-0",
|
|
.debugfs_name = "crtc0_regs",
|
|
.hvs_available_channels = BIT(0),
|
|
.hvs_output = 0,
|
|
@@ -1187,6 +1188,7 @@ static const struct vc4_pv_data bcm2835_
|
|
|
|
static const struct vc4_pv_data bcm2835_pv1_data = {
|
|
.base = {
|
|
+ .name = "pixelvalve-1",
|
|
.debugfs_name = "crtc1_regs",
|
|
.hvs_available_channels = BIT(2),
|
|
.hvs_output = 2,
|
|
@@ -1201,6 +1203,7 @@ static const struct vc4_pv_data bcm2835_
|
|
|
|
static const struct vc4_pv_data bcm2835_pv2_data = {
|
|
.base = {
|
|
+ .name = "pixelvalve-2",
|
|
.debugfs_name = "crtc2_regs",
|
|
.hvs_available_channels = BIT(1),
|
|
.hvs_output = 1,
|
|
@@ -1215,6 +1218,7 @@ static const struct vc4_pv_data bcm2835_
|
|
|
|
static const struct vc4_pv_data bcm2711_pv0_data = {
|
|
.base = {
|
|
+ .name = "pixelvalve-0",
|
|
.debugfs_name = "crtc0_regs",
|
|
.hvs_available_channels = BIT(0),
|
|
.hvs_output = 0,
|
|
@@ -1229,6 +1233,7 @@ static const struct vc4_pv_data bcm2711_
|
|
|
|
static const struct vc4_pv_data bcm2711_pv1_data = {
|
|
.base = {
|
|
+ .name = "pixelvalve-1",
|
|
.debugfs_name = "crtc1_regs",
|
|
.hvs_available_channels = BIT(0) | BIT(1) | BIT(2),
|
|
.hvs_output = 3,
|
|
@@ -1243,6 +1248,7 @@ static const struct vc4_pv_data bcm2711_
|
|
|
|
static const struct vc4_pv_data bcm2711_pv2_data = {
|
|
.base = {
|
|
+ .name = "pixelvalve-2",
|
|
.debugfs_name = "crtc2_regs",
|
|
.hvs_available_channels = BIT(0) | BIT(1) | BIT(2),
|
|
.hvs_output = 4,
|
|
@@ -1256,6 +1262,7 @@ static const struct vc4_pv_data bcm2711_
|
|
|
|
static const struct vc4_pv_data bcm2711_pv3_data = {
|
|
.base = {
|
|
+ .name = "pixelvalve-3",
|
|
.debugfs_name = "crtc3_regs",
|
|
.hvs_available_channels = BIT(1),
|
|
.hvs_output = 1,
|
|
@@ -1269,6 +1276,7 @@ static const struct vc4_pv_data bcm2711_
|
|
|
|
static const struct vc4_pv_data bcm2711_pv4_data = {
|
|
.base = {
|
|
+ .name = "pixelvalve-4",
|
|
.debugfs_name = "crtc4_regs",
|
|
.hvs_available_channels = BIT(0) | BIT(1) | BIT(2),
|
|
.hvs_output = 5,
|
|
@@ -1348,7 +1356,7 @@ int vc4_crtc_init(struct drm_device *drm
|
|
vc4_crtc->feeds_txp = feeds_txp;
|
|
spin_lock_init(&vc4_crtc->irq_lock);
|
|
ret = drmm_crtc_init_with_planes(drm, crtc, primary_plane, NULL,
|
|
- crtc_funcs, NULL);
|
|
+ crtc_funcs, data->name);
|
|
if (ret)
|
|
return ret;
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_drv.h
|
|
+++ b/drivers/gpu/drm/vc4/vc4_drv.h
|
|
@@ -478,6 +478,8 @@ to_vc4_encoder(const struct drm_encoder
|
|
}
|
|
|
|
struct vc4_crtc_data {
|
|
+ const char *name;
|
|
+
|
|
const char *debugfs_name;
|
|
|
|
/* Bitmask of channels (FIFOs) of the HVS that the output can source from */
|
|
--- a/drivers/gpu/drm/vc4/vc4_txp.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_txp.c
|
|
@@ -480,6 +480,7 @@ static irqreturn_t vc4_txp_interrupt(int
|
|
}
|
|
|
|
static const struct vc4_crtc_data vc4_txp_crtc_data = {
|
|
+ .name = "txp",
|
|
.debugfs_name = "txp_regs",
|
|
.hvs_available_channels = BIT(2),
|
|
.hvs_output = 2,
|