diff options
author | Álvaro Fernández Rojas <noltari@gmail.com> | 2019-08-02 18:55:55 +0200 |
---|---|---|
committer | Álvaro Fernández Rojas <noltari@gmail.com> | 2019-08-02 18:55:55 +0200 |
commit | 00813d4dd976cc823fa089840ff2f4a10dd6cd0c (patch) | |
tree | 8f2c74a928c9ea0eceb64809d9039db824ae6663 /target/linux/brcm2708/patches-4.14/950-0186-drm-vc4-Add-missing-enable-disable-vblank-handlers-i.patch | |
parent | 19226502bf6393706defe7f049c587b32c9b4f33 (diff) | |
download | upstream-00813d4dd976cc823fa089840ff2f4a10dd6cd0c.tar.gz upstream-00813d4dd976cc823fa089840ff2f4a10dd6cd0c.tar.bz2 upstream-00813d4dd976cc823fa089840ff2f4a10dd6cd0c.zip |
brcm2708: remove linux 4.14 support
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Diffstat (limited to 'target/linux/brcm2708/patches-4.14/950-0186-drm-vc4-Add-missing-enable-disable-vblank-handlers-i.patch')
-rw-r--r-- | target/linux/brcm2708/patches-4.14/950-0186-drm-vc4-Add-missing-enable-disable-vblank-handlers-i.patch | 79 |
1 files changed, 0 insertions, 79 deletions
diff --git a/target/linux/brcm2708/patches-4.14/950-0186-drm-vc4-Add-missing-enable-disable-vblank-handlers-i.patch b/target/linux/brcm2708/patches-4.14/950-0186-drm-vc4-Add-missing-enable-disable-vblank-handlers-i.patch deleted file mode 100644 index a9ff9c8257..0000000000 --- a/target/linux/brcm2708/patches-4.14/950-0186-drm-vc4-Add-missing-enable-disable-vblank-handlers-i.patch +++ /dev/null @@ -1,79 +0,0 @@ -From d15f2c268d1e5e97fbda9b80b3b9fefe7de2ff44 Mon Sep 17 00:00:00 2001 -From: Eric Anholt <eric@anholt.net> -Date: Tue, 30 Jan 2018 14:21:02 -0800 -Subject: [PATCH 186/454] drm/vc4: Add missing enable/disable vblank handlers - in fkms. - -Fixes hang at boot in 4.14. - -Signed-off-by: Eric Anholt <eric@anholt.net> ---- - drivers/gpu/drm/vc4/vc4_crtc.c | 14 -------------- - drivers/gpu/drm/vc4/vc4_firmware_kms.c | 15 +++++++++++++++ - 2 files changed, 15 insertions(+), 14 deletions(-) - ---- a/drivers/gpu/drm/vc4/vc4_crtc.c -+++ b/drivers/gpu/drm/vc4/vc4_crtc.c -@@ -685,15 +685,8 @@ static void vc4_crtc_atomic_flush(struct - - static int vc4_enable_vblank(struct drm_crtc *crtc) - { -- struct drm_device *dev = crtc->dev; -- struct vc4_dev *vc4 = to_vc4_dev(dev); - struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc); - -- if (vc4->firmware_kms) { -- /* XXX: Can we mask the SMI interrupt? */ -- return 0; -- } -- - CRTC_WRITE(PV_INTEN, PV_INT_VFP_START); - - return 0; -@@ -701,15 +694,8 @@ static int vc4_enable_vblank(struct drm_ - - static void vc4_disable_vblank(struct drm_crtc *crtc) - { -- struct drm_device *dev = crtc->dev; -- struct vc4_dev *vc4 = to_vc4_dev(dev); - struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc); - -- if (vc4->firmware_kms) { -- /* XXX: Can we mask the SMI interrupt? */ -- return; -- } -- - CRTC_WRITE(PV_INTEN, 0); - } - ---- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c -+++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c -@@ -441,6 +441,19 @@ static int vc4_page_flip(struct drm_crtc - return drm_atomic_helper_page_flip(crtc, fb, event, flags, ctx); - } - -+static int vc4_fkms_enable_vblank(struct drm_crtc *crtc) -+{ -+ /* XXX: Need a way to enable/disable the interrupt, to avoid -+ * DRM warnings at boot time. -+ */ -+ -+ return 0; -+} -+ -+static void vc4_fkms_disable_vblank(struct drm_crtc *crtc) -+{ -+} -+ - static const struct drm_crtc_funcs vc4_crtc_funcs = { - .set_config = drm_atomic_helper_set_config, - .destroy = drm_crtc_cleanup, -@@ -451,6 +464,8 @@ static const struct drm_crtc_funcs vc4_c - .reset = drm_atomic_helper_crtc_reset, - .atomic_duplicate_state = drm_atomic_helper_crtc_duplicate_state, - .atomic_destroy_state = drm_atomic_helper_crtc_destroy_state, -+ .enable_vblank = vc4_fkms_enable_vblank, -+ .disable_vblank = vc4_fkms_disable_vblank, - }; - - static const struct drm_crtc_helper_funcs vc4_crtc_helper_funcs = { |