c06fb25d1f
Some checks failed
Build Kernel / Build all affected Kernels (push) Has been cancelled
Build all core packages / Build all core packages for selected target (push) Has been cancelled
Build and Push prebuilt tools container / Build and Push all prebuilt containers (push) Has been cancelled
Build Toolchains / Build Toolchains for each target (push) Has been cancelled
Build host tools / Build host tools for linux and macos based systems (push) Has been cancelled
Coverity scan build / Coverity x86/64 build (push) Has been cancelled
65 lines
2.4 KiB
Diff
65 lines
2.4 KiB
Diff
From 00f28018b4efbe4a0c53b96cc22b86ce59f95b1f Mon Sep 17 00:00:00 2001
|
|
From: Maxime Ripard <maxime@cerno.tech>
|
|
Date: Fri, 14 Apr 2023 11:21:34 +0200
|
|
Subject: [PATCH 0628/1085] drm/vc4: fkms: Rename plane related functions
|
|
|
|
The name collide with the Full KMS functions that are going to be made
|
|
public.
|
|
|
|
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
|
|
---
|
|
drivers/gpu/drm/vc4/vc4_firmware_kms.c | 14 +++++++-------
|
|
1 file changed, 7 insertions(+), 7 deletions(-)
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
|
|
@@ -668,8 +668,8 @@ static int vc4_plane_to_mb(struct drm_pl
|
|
return 0;
|
|
}
|
|
|
|
-static int vc4_plane_atomic_check(struct drm_plane *plane,
|
|
- struct drm_atomic_state *state)
|
|
+static int vc4_fkms_plane_atomic_check(struct drm_plane *plane,
|
|
+ struct drm_atomic_state *state)
|
|
{
|
|
struct drm_plane_state *new_plane_state = drm_atomic_get_new_plane_state(state,
|
|
plane);
|
|
@@ -726,7 +726,7 @@ static int vc4_plane_atomic_async_check(
|
|
}
|
|
|
|
/* Called during init to allocate the plane's atomic state. */
|
|
-static void vc4_plane_reset(struct drm_plane *plane)
|
|
+static void vc4_fkms_plane_reset(struct drm_plane *plane)
|
|
{
|
|
struct vc4_plane_state *vc4_state;
|
|
|
|
@@ -786,7 +786,7 @@ static bool vc4_fkms_format_mod_supporte
|
|
}
|
|
}
|
|
|
|
-static struct drm_plane_state *vc4_plane_duplicate_state(struct drm_plane *plane)
|
|
+static struct drm_plane_state *vc4_fkms_plane_duplicate_state(struct drm_plane *plane)
|
|
{
|
|
struct vc4_plane_state *vc4_state;
|
|
|
|
@@ -807,8 +807,8 @@ static const struct drm_plane_funcs vc4_
|
|
.disable_plane = drm_atomic_helper_disable_plane,
|
|
.destroy = vc4_plane_destroy,
|
|
.set_property = NULL,
|
|
- .reset = vc4_plane_reset,
|
|
- .atomic_duplicate_state = vc4_plane_duplicate_state,
|
|
+ .reset = vc4_fkms_plane_reset,
|
|
+ .atomic_duplicate_state = vc4_fkms_plane_duplicate_state,
|
|
.atomic_destroy_state = drm_atomic_helper_plane_destroy_state,
|
|
.format_mod_supported = vc4_fkms_format_mod_supported,
|
|
};
|
|
@@ -816,7 +816,7 @@ static const struct drm_plane_funcs vc4_
|
|
static const struct drm_plane_helper_funcs vc4_plane_helper_funcs = {
|
|
.prepare_fb = drm_gem_plane_helper_prepare_fb,
|
|
.cleanup_fb = NULL,
|
|
- .atomic_check = vc4_plane_atomic_check,
|
|
+ .atomic_check = vc4_fkms_plane_atomic_check,
|
|
.atomic_update = vc4_plane_atomic_update,
|
|
.atomic_disable = vc4_plane_atomic_disable,
|
|
.atomic_async_check = vc4_plane_atomic_async_check,
|