You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
158 lines
4.4 KiB
Diff
158 lines
4.4 KiB
Diff
From 3747cef056a2b6def75521dc2fd9157b009715e2 Mon Sep 17 00:00:00 2001
|
|
From: Stefan Schake <stschake@gmail.com>
|
|
Date: Fri, 9 Mar 2018 01:53:36 +0100
|
|
Subject: [PATCH 346/454] drm/vc4: Move plane state to header
|
|
|
|
commit 823646983b5a31732ae82ffa60b74555857eb8a0 upstream.
|
|
|
|
We need to reference it from the CRTC to make a decision for enabling
|
|
background color fill.
|
|
|
|
Signed-off-by: Stefan Schake <stschake@gmail.com>
|
|
Signed-off-by: Eric Anholt <eric@anholt.net>
|
|
Reviewed-by: Eric Anholt <eric@anholt.net>
|
|
Link: https://patchwork.freedesktop.org/patch/msgid/1520556817-97297-4-git-send-email-stschake@gmail.com
|
|
---
|
|
drivers/gpu/drm/vc4/vc4_drv.h | 60 +++++++++++++++++++++++++++++++++
|
|
drivers/gpu/drm/vc4/vc4_plane.c | 60 ---------------------------------
|
|
2 files changed, 60 insertions(+), 60 deletions(-)
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_drv.h
|
|
+++ b/drivers/gpu/drm/vc4/vc4_drv.h
|
|
@@ -278,6 +278,66 @@ to_vc4_plane(struct drm_plane *plane)
|
|
return (struct vc4_plane *)plane;
|
|
}
|
|
|
|
+enum vc4_scaling_mode {
|
|
+ VC4_SCALING_NONE,
|
|
+ VC4_SCALING_TPZ,
|
|
+ VC4_SCALING_PPF,
|
|
+};
|
|
+
|
|
+struct vc4_plane_state {
|
|
+ struct drm_plane_state base;
|
|
+ /* System memory copy of the display list for this element, computed
|
|
+ * at atomic_check time.
|
|
+ */
|
|
+ u32 *dlist;
|
|
+ u32 dlist_size; /* Number of dwords allocated for the display list */
|
|
+ u32 dlist_count; /* Number of used dwords in the display list. */
|
|
+
|
|
+ /* Offset in the dlist to various words, for pageflip or
|
|
+ * cursor updates.
|
|
+ */
|
|
+ u32 pos0_offset;
|
|
+ u32 pos2_offset;
|
|
+ u32 ptr0_offset;
|
|
+
|
|
+ /* Offset where the plane's dlist was last stored in the
|
|
+ * hardware at vc4_crtc_atomic_flush() time.
|
|
+ */
|
|
+ u32 __iomem *hw_dlist;
|
|
+
|
|
+ /* Clipped coordinates of the plane on the display. */
|
|
+ int crtc_x, crtc_y, crtc_w, crtc_h;
|
|
+ /* Clipped area being scanned from in the FB. */
|
|
+ u32 src_x, src_y;
|
|
+
|
|
+ u32 src_w[2], src_h[2];
|
|
+
|
|
+ /* Scaling selection for the RGB/Y plane and the Cb/Cr planes. */
|
|
+ enum vc4_scaling_mode x_scaling[2], y_scaling[2];
|
|
+ bool is_unity;
|
|
+ bool is_yuv;
|
|
+
|
|
+ /* Offset to start scanning out from the start of the plane's
|
|
+ * BO.
|
|
+ */
|
|
+ u32 offsets[3];
|
|
+
|
|
+ /* Our allocation in LBM for temporary storage during scaling. */
|
|
+ struct drm_mm_node lbm;
|
|
+
|
|
+ /* Set when the plane has per-pixel alpha content or does not cover
|
|
+ * the entire screen. This is a hint to the CRTC that it might need
|
|
+ * to enable background color fill.
|
|
+ */
|
|
+ bool needs_bg_fill;
|
|
+};
|
|
+
|
|
+static inline struct vc4_plane_state *
|
|
+to_vc4_plane_state(struct drm_plane_state *state)
|
|
+{
|
|
+ return (struct vc4_plane_state *)state;
|
|
+}
|
|
+
|
|
enum vc4_encoder_type {
|
|
VC4_ENCODER_TYPE_NONE,
|
|
VC4_ENCODER_TYPE_HDMI,
|
|
--- a/drivers/gpu/drm/vc4/vc4_plane.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_plane.c
|
|
@@ -27,66 +27,6 @@
|
|
#include "vc4_drv.h"
|
|
#include "vc4_regs.h"
|
|
|
|
-enum vc4_scaling_mode {
|
|
- VC4_SCALING_NONE,
|
|
- VC4_SCALING_TPZ,
|
|
- VC4_SCALING_PPF,
|
|
-};
|
|
-
|
|
-struct vc4_plane_state {
|
|
- struct drm_plane_state base;
|
|
- /* System memory copy of the display list for this element, computed
|
|
- * at atomic_check time.
|
|
- */
|
|
- u32 *dlist;
|
|
- u32 dlist_size; /* Number of dwords allocated for the display list */
|
|
- u32 dlist_count; /* Number of used dwords in the display list. */
|
|
-
|
|
- /* Offset in the dlist to various words, for pageflip or
|
|
- * cursor updates.
|
|
- */
|
|
- u32 pos0_offset;
|
|
- u32 pos2_offset;
|
|
- u32 ptr0_offset;
|
|
-
|
|
- /* Offset where the plane's dlist was last stored in the
|
|
- * hardware at vc4_crtc_atomic_flush() time.
|
|
- */
|
|
- u32 __iomem *hw_dlist;
|
|
-
|
|
- /* Clipped coordinates of the plane on the display. */
|
|
- int crtc_x, crtc_y, crtc_w, crtc_h;
|
|
- /* Clipped area being scanned from in the FB. */
|
|
- u32 src_x, src_y;
|
|
-
|
|
- u32 src_w[2], src_h[2];
|
|
-
|
|
- /* Scaling selection for the RGB/Y plane and the Cb/Cr planes. */
|
|
- enum vc4_scaling_mode x_scaling[2], y_scaling[2];
|
|
- bool is_unity;
|
|
- bool is_yuv;
|
|
-
|
|
- /* Offset to start scanning out from the start of the plane's
|
|
- * BO.
|
|
- */
|
|
- u32 offsets[3];
|
|
-
|
|
- /* Our allocation in LBM for temporary storage during scaling. */
|
|
- struct drm_mm_node lbm;
|
|
-
|
|
- /* Set when the plane has per-pixel alpha content or does not cover
|
|
- * the entire screen. This is a hint to the CRTC that it might need
|
|
- * to enable background color fill.
|
|
- */
|
|
- bool needs_bg_fill;
|
|
-};
|
|
-
|
|
-static inline struct vc4_plane_state *
|
|
-to_vc4_plane_state(struct drm_plane_state *state)
|
|
-{
|
|
- return (struct vc4_plane_state *)state;
|
|
-}
|
|
-
|
|
static const struct hvs_format {
|
|
u32 drm; /* DRM_FORMAT_* */
|
|
u32 hvs; /* HVS_FORMAT_* */
|