mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-25 08:21:14 +00:00
793f8ab62c
Add kernel patches for version 6.1. Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
117 lines
3.3 KiB
Diff
117 lines
3.3 KiB
Diff
From 037268376a9c4698eae418cff89e5cd188c0c73c Mon Sep 17 00:00:00 2001
|
|
From: Maxime Ripard <maxime@cerno.tech>
|
|
Date: Thu, 10 Nov 2022 12:57:53 +0100
|
|
Subject: [PATCH] drm/vc4: Move HVS state to main header
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
In order to introduce unit tests for the HVS state computation, we'll
|
|
need access to the vc4_hvs_state struct definition and its associated
|
|
helpers.
|
|
|
|
Let's move them in our driver header.
|
|
|
|
Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>
|
|
Reviewed-by: Maíra Canal <mcanal@igalia.com>
|
|
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
|
|
---
|
|
drivers/gpu/drm/vc4/vc4_drv.h | 23 +++++++++++++++++++++++
|
|
drivers/gpu/drm/vc4/vc4_kms.c | 25 +++----------------------
|
|
2 files changed, 26 insertions(+), 22 deletions(-)
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_drv.h
|
|
+++ b/drivers/gpu/drm/vc4/vc4_drv.h
|
|
@@ -360,6 +360,29 @@ struct vc4_hvs {
|
|
bool vc5_hdmi_enable_4096by2160;
|
|
};
|
|
|
|
+#define HVS_NUM_CHANNELS 3
|
|
+
|
|
+struct vc4_hvs_state {
|
|
+ struct drm_private_state base;
|
|
+ unsigned long core_clock_rate;
|
|
+
|
|
+ struct {
|
|
+ unsigned in_use: 1;
|
|
+ unsigned long fifo_load;
|
|
+ struct drm_crtc_commit *pending_commit;
|
|
+ } fifo_state[HVS_NUM_CHANNELS];
|
|
+};
|
|
+
|
|
+static inline struct vc4_hvs_state *
|
|
+to_vc4_hvs_state(const struct drm_private_state *priv)
|
|
+{
|
|
+ return container_of(priv, struct vc4_hvs_state, base);
|
|
+}
|
|
+
|
|
+struct vc4_hvs_state *vc4_hvs_get_global_state(struct drm_atomic_state *state);
|
|
+struct vc4_hvs_state *vc4_hvs_get_old_global_state(const struct drm_atomic_state *state);
|
|
+struct vc4_hvs_state *vc4_hvs_get_new_global_state(const struct drm_atomic_state *state);
|
|
+
|
|
struct vc4_plane {
|
|
struct drm_plane base;
|
|
};
|
|
--- a/drivers/gpu/drm/vc4/vc4_kms.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_kms.c
|
|
@@ -25,8 +25,6 @@
|
|
#include "vc4_drv.h"
|
|
#include "vc4_regs.h"
|
|
|
|
-#define HVS_NUM_CHANNELS 3
|
|
-
|
|
struct vc4_ctm_state {
|
|
struct drm_private_state base;
|
|
struct drm_color_ctm *ctm;
|
|
@@ -39,23 +37,6 @@ to_vc4_ctm_state(const struct drm_privat
|
|
return container_of(priv, struct vc4_ctm_state, base);
|
|
}
|
|
|
|
-struct vc4_hvs_state {
|
|
- struct drm_private_state base;
|
|
- unsigned long core_clock_rate;
|
|
-
|
|
- struct {
|
|
- unsigned in_use: 1;
|
|
- unsigned long fifo_load;
|
|
- struct drm_crtc_commit *pending_commit;
|
|
- } fifo_state[HVS_NUM_CHANNELS];
|
|
-};
|
|
-
|
|
-static struct vc4_hvs_state *
|
|
-to_vc4_hvs_state(const struct drm_private_state *priv)
|
|
-{
|
|
- return container_of(priv, struct vc4_hvs_state, base);
|
|
-}
|
|
-
|
|
struct vc4_load_tracker_state {
|
|
struct drm_private_state base;
|
|
u64 hvs_load;
|
|
@@ -194,7 +175,7 @@ vc4_ctm_commit(struct vc4_dev *vc4, stru
|
|
VC4_SET_FIELD(ctm_state->fifo, SCALER_OLEDOFFS_DISPFIFO));
|
|
}
|
|
|
|
-static struct vc4_hvs_state *
|
|
+struct vc4_hvs_state *
|
|
vc4_hvs_get_new_global_state(const struct drm_atomic_state *state)
|
|
{
|
|
struct vc4_dev *vc4 = to_vc4_dev(state->dev);
|
|
@@ -207,7 +188,7 @@ vc4_hvs_get_new_global_state(const struc
|
|
return to_vc4_hvs_state(priv_state);
|
|
}
|
|
|
|
-static struct vc4_hvs_state *
|
|
+struct vc4_hvs_state *
|
|
vc4_hvs_get_old_global_state(const struct drm_atomic_state *state)
|
|
{
|
|
struct vc4_dev *vc4 = to_vc4_dev(state->dev);
|
|
@@ -220,7 +201,7 @@ vc4_hvs_get_old_global_state(const struc
|
|
return to_vc4_hvs_state(priv_state);
|
|
}
|
|
|
|
-static struct vc4_hvs_state *
|
|
+struct vc4_hvs_state *
|
|
vc4_hvs_get_global_state(struct drm_atomic_state *state)
|
|
{
|
|
struct vc4_dev *vc4 = to_vc4_dev(state->dev);
|