2019-09-19 14:43:19 +00:00
|
|
|
From 8b9843afd665a52df07cc804d6fcb624b22cd85e Mon Sep 17 00:00:00 2001
|
2019-07-09 18:32:28 +00:00
|
|
|
From: popcornmix <popcornmix@gmail.com>
|
|
|
|
|
Date: Sun, 17 Jun 2018 13:22:07 +0100
|
2019-09-19 14:43:19 +00:00
|
|
|
Subject: [PATCH 122/806] vc4_firmware_kms: fix build
|
2019-07-09 18:32:28 +00:00
|
|
|
|
|
|
|
|
---
|
|
|
|
|
drivers/gpu/drm/vc4/vc4_firmware_kms.c | 6 ++++--
|
|
|
|
|
1 file changed, 4 insertions(+), 2 deletions(-)
|
|
|
|
|
|
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
|
|
|
|
|
+++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
|
|
|
|
|
@@ -33,6 +33,8 @@
|
|
|
|
|
#define SMICS 0x0
|
|
|
|
|
#define SMICS_INTERRUPTS (BIT(9) | BIT(10) | BIT(11))
|
|
|
|
|
|
|
|
|
|
+#define vc4_crtc vc4_kms_crtc
|
|
|
|
|
+#define to_vc4_crtc to_vc4_kms_crtc
|
|
|
|
|
struct vc4_crtc {
|
|
|
|
|
struct drm_crtc base;
|
|
|
|
|
struct drm_encoder *encoder;
|
|
|
|
|
@@ -273,7 +275,7 @@ static int vc4_plane_atomic_check(struct
|
|
|
|
|
|
|
|
|
|
static void vc4_plane_destroy(struct drm_plane *plane)
|
|
|
|
|
{
|
|
|
|
|
- drm_plane_helper_disable(plane);
|
|
|
|
|
+ drm_plane_helper_disable(plane, NULL);
|
|
|
|
|
drm_plane_cleanup(plane);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@@ -591,7 +593,7 @@ static struct drm_connector *vc4_fkms_co
|
|
|
|
|
connector->interlace_allowed = 0;
|
|
|
|
|
connector->doublescan_allowed = 0;
|
|
|
|
|
|
|
|
|
|
- drm_mode_connector_attach_encoder(connector, encoder);
|
|
|
|
|
+ drm_connector_attach_encoder(connector, encoder);
|
|
|
|
|
|
|
|
|
|
return connector;
|
|
|
|
|
|
