mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2025-02-27 00:10:29 +00:00
49 lines
2 KiB
Diff
49 lines
2 KiB
Diff
From 2589982b9f08efd9189e99e38a6f4b5513f5939a Mon Sep 17 00:00:00 2001
|
|
From: graysky <graysky@archlinux.us>
|
|
Date: Mon, 21 Jun 2021 11:00:12 -0400
|
|
Subject: [PATCH 2/3] Revert "drm/vc4: Make vc4_crtc_get_encoder public"
|
|
|
|
This reverts commit c83ce1fc7f167297c3ec32b14134fcc61e16e8df.
|
|
---
|
|
drivers/gpu/drm/vc4/vc4_crtc.c | 8 ++++----
|
|
drivers/gpu/drm/vc4/vc4_drv.h | 5 -----
|
|
2 files changed, 4 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c
|
|
index cea2cb87973c..a0b5503928df 100644
|
|
--- a/drivers/gpu/drm/vc4/vc4_crtc.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_crtc.c
|
|
@@ -279,10 +279,10 @@ static u32 vc4_crtc_get_fifo_full_level_bits(struct vc4_crtc *vc4_crtc,
|
|
* allows drivers to push pixels to more than one encoder from the
|
|
* same CRTC.
|
|
*/
|
|
-struct drm_encoder *vc4_get_crtc_encoder(struct drm_crtc *crtc,
|
|
- struct drm_atomic_state *state,
|
|
- struct drm_connector_state *(*get_state)(struct drm_atomic_state *state,
|
|
- struct drm_connector *connector))
|
|
+static struct drm_encoder *vc4_get_crtc_encoder(struct drm_crtc *crtc,
|
|
+ struct drm_atomic_state *state,
|
|
+ struct drm_connector_state *(*get_state)(struct drm_atomic_state *state,
|
|
+ struct drm_connector *connector))
|
|
{
|
|
struct drm_connector *connector;
|
|
struct drm_connector_list_iter conn_iter;
|
|
diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h
|
|
index 4cb0d95c1b7b..9a00e14c7615 100644
|
|
--- a/drivers/gpu/drm/vc4/vc4_drv.h
|
|
+++ b/drivers/gpu/drm/vc4/vc4_drv.h
|
|
@@ -523,11 +523,6 @@ vc4_crtc_to_vc4_pv_data(const struct vc4_crtc *crtc)
|
|
return container_of(data, struct vc4_pv_data, base);
|
|
}
|
|
|
|
-struct drm_encoder *vc4_get_crtc_encoder(struct drm_crtc *crtc,
|
|
- struct drm_atomic_state *state,
|
|
- struct drm_connector_state *(*get_state)(struct drm_atomic_state *state,
|
|
- struct drm_connector *connector));
|
|
-
|
|
struct vc4_crtc_state {
|
|
struct drm_crtc_state base;
|
|
/* Dlist area for this CRTC configuration. */
|
|
--
|
|
2.32.0
|
|
|