qiurui
/
armbian-build
mirror of https://github.com/armbian/build.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

`meson`/`edge`: rewrite-kernel-patches, no changes

This commit is contained in:
Ricardo Pardini 2025-01-04 01:37:33 +00:00 committed by Igor
parent 2dc4900e3c
commit 6de6506c81
4 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
patch/kernel/archive/meson-6.10/0047-drm-meson-Use-24-bits-per-pixel-for-the-framebuffer-.patch
View File

@ -52,7 +52,7 @@ index 111111111111..222222222222 100644
struct meson_drm_soc_attr { struct meson_drm_soc_attr {
struct meson_drm_soc_limits limits; struct meson_drm_soc_limits limits;
const struct soc_device_attribute *attrs; const struct soc_device_attribute *attrs;
@@ -362,7 +386,7 @@ static int meson_drv_bind_master(struct device *dev, bool has_components) @@ -353,7 +377,7 @@ static int meson_drv_bind_master(struct device *dev, bool has_components)
if (ret) if (ret)
goto uninstall_irq; goto uninstall_irq;

4
patch/kernel/archive/meson-6.10/0048-drm-meson-Use-a-separate-list-of-supported-formats-f.patch
View File

@ -54,9 +54,9 @@ index 111111111111..222222222222 100644
+ unsigned int num_drm_formats; + unsigned int num_drm_formats;
+ const uint32_t *drm_formats; + const uint32_t *drm_formats;
const uint64_t *format_modifiers = format_modifiers_default; const uint64_t *format_modifiers = format_modifiers_default;
int ret;
meson_plane = devm_kzalloc(priv->drm->dev, sizeof(*meson_plane), @@ -549,10 +564,19 @@ int meson_plane_create(struct meson_drm *priv)
@@ -548,10 +563,19 @@ int meson_plane_create(struct meson_drm *priv)
else if (meson_vpu_is_compatible(priv, VPU_COMPATIBLE_G12A)) else if (meson_vpu_is_compatible(priv, VPU_COMPATIBLE_G12A))
format_modifiers = format_modifiers_afbc_g12a; format_modifiers = format_modifiers_afbc_g12a;

15
patch/kernel/archive/meson-6.10/0057-drm-meson-Meson8-Meson8b-Meson8m2-VCLK-HACK.patch
View File

@ -7,11 +7,11 @@ WiP
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
--- ---
drivers/gpu/drm/meson/meson_drv.c | 101 ++++++- drivers/gpu/drm/meson/meson_drv.c | 93 +++++-
drivers/gpu/drm/meson/meson_drv.h | 32 ++ drivers/gpu/drm/meson/meson_drv.h | 32 ++
drivers/gpu/drm/meson/meson_vclk.c | 146 ++++++++++ drivers/gpu/drm/meson/meson_vclk.c | 146 ++++++++++
drivers/gpu/drm/meson/meson_venc.c | 24 +- drivers/gpu/drm/meson/meson_venc.c | 24 +-
4 files changed, 293 insertions(+), 10 deletions(-) 4 files changed, 289 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/meson/meson_drv.c b/drivers/gpu/drm/meson/meson_drv.c diff --git a/drivers/gpu/drm/meson/meson_drv.c b/drivers/gpu/drm/meson/meson_drv.c
index 111111111111..222222222222 100644 index 111111111111..222222222222 100644
@ -123,8 +123,7 @@ index 111111111111..222222222222 100644
} }
priv->hhi = devm_regmap_init_mmio(dev, regs, priv->hhi = devm_regmap_init_mmio(dev, regs,
@@ -290,13 +368,13 @@ static int meson_drv_bind_master(struct device *dev, bool has_components) @@ -297,12 +375,12 @@ static int meson_drv_bind_master(struct device *dev, bool has_components)
priv->canvas = meson_canvas_get(dev); priv->canvas = meson_canvas_get(dev);
if (IS_ERR(priv->canvas)) { if (IS_ERR(priv->canvas)) {
ret = PTR_ERR(priv->canvas); ret = PTR_ERR(priv->canvas);
@ -139,7 +138,7 @@ index 111111111111..222222222222 100644
ret = meson_canvas_alloc(priv->canvas, &priv->canvas_id_vd1_0); ret = meson_canvas_alloc(priv->canvas, &priv->canvas_id_vd1_0);
if (ret) if (ret)
goto free_canvas_osd1; goto free_canvas_osd1;
@@ -425,6 +503,8 @@ static int meson_drv_bind_master(struct device *dev, bool has_components) @@ -416,6 +494,8 @@ static int meson_drv_bind_master(struct device *dev, bool has_components)
exit_afbcd: exit_afbcd:
if (priv->afbcd.ops) if (priv->afbcd.ops)
priv->afbcd.ops->exit(priv); priv->afbcd.ops->exit(priv);
@ -148,7 +147,7 @@ index 111111111111..222222222222 100644
free_canvas_vd1_2: free_canvas_vd1_2:
meson_canvas_free(priv->canvas, priv->canvas_id_vd1_2); meson_canvas_free(priv->canvas, priv->canvas_id_vd1_2);
free_canvas_vd1_1: free_canvas_vd1_1:
@@ -469,6 +549,8 @@ static void meson_drv_unbind(struct device *dev) @@ -468,6 +548,8 @@ static void meson_drv_unbind(struct device *dev)
if (priv->afbcd.ops) if (priv->afbcd.ops)
priv->afbcd.ops->exit(priv); priv->afbcd.ops->exit(priv);
@ -157,7 +156,7 @@ index 111111111111..222222222222 100644
} }
static const struct component_master_ops meson_drv_master_ops = { static const struct component_master_ops meson_drv_master_ops = {
@@ -483,6 +565,8 @@ static int __maybe_unused meson_drv_pm_suspend(struct device *dev) @@ -482,6 +564,8 @@ static int __maybe_unused meson_drv_pm_suspend(struct device *dev)
if (!priv) if (!priv)
return 0; return 0;
@ -166,7 +165,7 @@ index 111111111111..222222222222 100644
return drm_mode_config_helper_suspend(priv->drm); return drm_mode_config_helper_suspend(priv->drm);
} }
@@ -493,6 +577,7 @@ static int __maybe_unused meson_drv_pm_resume(struct device *dev) @@ -492,6 +576,7 @@ static int __maybe_unused meson_drv_pm_resume(struct device *dev)
if (!priv) if (!priv)
return 0; return 0;

4
patch/kernel/archive/meson-6.10/0058-drm-meson-Enable-support-for-Meson8-Meson8b-Meson8m2.patch
View File

@ -15,7 +15,7 @@ diff --git a/drivers/gpu/drm/meson/meson_drv.c b/drivers/gpu/drm/meson/meson_drv
index 111111111111..222222222222 100644 index 111111111111..222222222222 100644
--- a/drivers/gpu/drm/meson/meson_drv.c --- a/drivers/gpu/drm/meson/meson_drv.c
+++ b/drivers/gpu/drm/meson/meson_drv.c +++ b/drivers/gpu/drm/meson/meson_drv.c
@@ -660,6 +660,18 @@ static void meson_drv_remove(struct platform_device *pdev) @@ -659,6 +659,18 @@ static void meson_drv_remove(struct platform_device *pdev)
component_master_del(&pdev->dev, &meson_drv_master_ops); component_master_del(&pdev->dev, &meson_drv_master_ops);
} }
@ -34,7 +34,7 @@ index 111111111111..222222222222 100644
static struct meson_drm_match_data meson_drm_gxbb_data = { static struct meson_drm_match_data meson_drm_gxbb_data = {
.compat = VPU_COMPATIBLE_GXBB, .compat = VPU_COMPATIBLE_GXBB,
}; };
@@ -679,6 +691,12 @@ static struct meson_drm_match_data meson_drm_g12a_data = { @@ -678,6 +690,12 @@ static struct meson_drm_match_data meson_drm_g12a_data = {
}; };
static const struct of_device_id dt_match[] = { static const struct of_device_id dt_match[] = {