mirror of
https://github.com/Ysurac/openmptcprouter.git
synced 2025-03-09 15:40:20 +00:00
Add a directory by kernel instead of a common root, add qnap-301w and rpi4 kernel 6.1 suppport
This commit is contained in:
parent
e910436a7a
commit
46837ec4c0
9459 changed files with 362648 additions and 116345 deletions
|
|
@ -0,0 +1,63 @@
|
|||
From 4b3cbe839ed1de39cfc8ad138959f60e474ffc7e Mon Sep 17 00:00:00 2001
|
||||
From: Maxime Ripard <maxime@cerno.tech>
|
||||
Date: Wed, 23 Nov 2022 16:25:56 +0100
|
||||
Subject: [PATCH 497/726] drm/vc4: txp: Reorder the variable assignments
|
||||
|
||||
The current order of variable assignments is unneccessarily complex,
|
||||
let's make it simpler.
|
||||
|
||||
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-14-051a0bb60a16@cerno.tech
|
||||
---
|
||||
drivers/gpu/drm/vc4/vc4_txp.c | 15 ++++++---------
|
||||
1 file changed, 6 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/drivers/gpu/drm/vc4/vc4_txp.c b/drivers/gpu/drm/vc4/vc4_txp.c
|
||||
index bd181b5a7b52..b00c6fae972f 100644
|
||||
--- a/drivers/gpu/drm/vc4/vc4_txp.c
|
||||
+++ b/drivers/gpu/drm/vc4/vc4_txp.c
|
||||
@@ -490,7 +490,6 @@ static int vc4_txp_bind(struct device *dev, struct device *master, void *data)
|
||||
struct drm_device *drm = dev_get_drvdata(master);
|
||||
struct vc4_crtc *vc4_crtc;
|
||||
struct vc4_txp *txp;
|
||||
- struct drm_crtc *crtc;
|
||||
struct drm_encoder *encoder;
|
||||
int ret, irq;
|
||||
|
||||
@@ -501,18 +500,16 @@ static int vc4_txp_bind(struct device *dev, struct device *master, void *data)
|
||||
txp = drmm_kzalloc(drm, sizeof(*txp), GFP_KERNEL);
|
||||
if (!txp)
|
||||
return -ENOMEM;
|
||||
- vc4_crtc = &txp->base;
|
||||
- crtc = &vc4_crtc->base;
|
||||
-
|
||||
- vc4_crtc->pdev = pdev;
|
||||
- vc4_crtc->data = &vc4_txp_crtc_data;
|
||||
- vc4_crtc->feeds_txp = true;
|
||||
|
||||
txp->pdev = pdev;
|
||||
-
|
||||
txp->regs = vc4_ioremap_regs(pdev, 0);
|
||||
if (IS_ERR(txp->regs))
|
||||
return PTR_ERR(txp->regs);
|
||||
+
|
||||
+ vc4_crtc = &txp->base;
|
||||
+ vc4_crtc->pdev = pdev;
|
||||
+ vc4_crtc->data = &vc4_txp_crtc_data;
|
||||
+ vc4_crtc->feeds_txp = true;
|
||||
vc4_crtc->regset.base = txp->regs;
|
||||
vc4_crtc->regset.regs = txp_regs;
|
||||
vc4_crtc->regset.nregs = ARRAY_SIZE(txp_regs);
|
||||
@@ -533,7 +530,7 @@ static int vc4_txp_bind(struct device *dev, struct device *master, void *data)
|
||||
return ret;
|
||||
|
||||
encoder = &txp->connector.encoder;
|
||||
- encoder->possible_crtcs = drm_crtc_mask(crtc);
|
||||
+ encoder->possible_crtcs = drm_crtc_mask(&vc4_crtc->base);
|
||||
|
||||
ret = devm_request_irq(dev, irq, vc4_txp_interrupt, 0,
|
||||
dev_name(dev), txp);
|
||||
--
|
||||
2.33.1
|
||||
|
||||
Loading…
Add table
Add a link
Reference in a new issue