20ea6adbf1
Build system: x86_64 Build-tested: bcm2708, bcm2709, bcm2710, bcm2711 Run-tested: bcm2708/RPiB+, bcm2709/RPi3B, bcm2710/RPi3B, bcm2711/RPi4B Signed-off-by: Marty Jones <mj8263788@gmail.com> Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
45 lines
1.5 KiB
Diff
45 lines
1.5 KiB
Diff
From 407b0fcd8becc2c948bbe3337db0cf2a45f19949 Mon Sep 17 00:00:00 2001
|
|
From: Maxime Ripard <maxime@cerno.tech>
|
|
Date: Thu, 21 Apr 2022 11:13:00 +0200
|
|
Subject: [PATCH] drm/vc4: kms: Register a different
|
|
drm_mode_config_funcs on BCM2711
|
|
|
|
On the BCM2711, our current definition of drm_mode_config_funcs uses the
|
|
custom vc4_fb_create().
|
|
|
|
However, that function relies on the buffer allocation path that was
|
|
relying on the GPU, and is no longer relevant.
|
|
|
|
Let's create another drm_mode_config_funcs structure that we will
|
|
register on the BCM2711.
|
|
|
|
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
|
|
---
|
|
drivers/gpu/drm/vc4/vc4_kms.c | 8 +++++++-
|
|
1 file changed, 7 insertions(+), 1 deletion(-)
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_kms.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_kms.c
|
|
@@ -992,6 +992,12 @@ static const struct drm_mode_config_func
|
|
.fb_create = vc4_fb_create,
|
|
};
|
|
|
|
+static const struct drm_mode_config_funcs vc5_mode_funcs = {
|
|
+ .atomic_check = vc4_atomic_check,
|
|
+ .atomic_commit = drm_atomic_helper_commit,
|
|
+ .fb_create = drm_gem_fb_create,
|
|
+};
|
|
+
|
|
int vc4_kms_load(struct drm_device *dev)
|
|
{
|
|
struct vc4_dev *vc4 = to_vc4_dev(dev);
|
|
@@ -1026,7 +1032,7 @@ int vc4_kms_load(struct drm_device *dev)
|
|
dev->mode_config.max_height = 2048;
|
|
}
|
|
|
|
- dev->mode_config.funcs = &vc4_mode_funcs;
|
|
+ dev->mode_config.funcs = vc4->is_vc5 ? &vc5_mode_funcs : &vc4_mode_funcs;
|
|
dev->mode_config.helper_private = &vc4_mode_config_helpers;
|
|
dev->mode_config.preferred_depth = 24;
|
|
dev->mode_config.async_page_flip = true;
|