mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-28 17:48:58 +00:00
7d7aa2fd92
This change makes the names of Broadcom targets consistent by using the common notation based on SoC/CPU ID (which is used internally anyway), bcmXXXX instead of brcmXXXX. This is even used for target TITLE in make menuconfig already, only the short target name used brcm so far. Despite, since subtargets range from bcm2708 to bcm2711, it seems appropriate to use bcm27xx instead of bcm2708 (again, as already done for BOARDNAME). This also renames the packages brcm2708-userland and brcm2708-gpu-fw. Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> Acked-by: Álvaro Fernández Rojas <noltari@gmail.com>
46 lines
1.6 KiB
Diff
46 lines
1.6 KiB
Diff
From c0041a9fe33d6031267d9f3e2372833908e97337 Mon Sep 17 00:00:00 2001
|
|
From: Eric Anholt <eric@anholt.net>
|
|
Date: Tue, 2 Apr 2019 13:29:00 -0700
|
|
Subject: [PATCH] drm/vc4: Fix vblank timestamping for firmwarekms.
|
|
|
|
The core doesn't expect a false return from the scanoutpos function in
|
|
normal usage, so we were doing the precise vblank timestamping path
|
|
and thus "immediate" vblank disables (even though firmwarekms can't
|
|
actually disable vblanks interrupts, sigh), and the kernel would get
|
|
confused when getting timestamp info when also turning vblanks back
|
|
on.
|
|
|
|
Signed-off-by: Eric Anholt <eric@anholt.net>
|
|
---
|
|
drivers/gpu/drm/vc4/vc4_crtc.c | 3 ---
|
|
drivers/gpu/drm/vc4/vc4_firmware_kms.c | 6 ++++++
|
|
2 files changed, 6 insertions(+), 3 deletions(-)
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_crtc.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_crtc.c
|
|
@@ -133,9 +133,6 @@ bool vc4_crtc_get_scanoutpos(struct drm_
|
|
int vblank_lines;
|
|
bool ret = false;
|
|
|
|
- if (vc4->firmware_kms)
|
|
- return 0;
|
|
-
|
|
/* preempt_disable_rt() should go right here in PREEMPT_RT patchset. */
|
|
|
|
/* Get optional system timestamp before query. */
|
|
--- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
|
|
@@ -673,6 +673,12 @@ static int vc4_fkms_bind(struct device *
|
|
|
|
vc4->firmware_kms = true;
|
|
|
|
+ /* firmware kms doesn't have precise a scanoutpos implementation, so
|
|
+ * we can't do the precise vblank timestamp mode.
|
|
+ */
|
|
+ drm->driver->get_scanout_position = NULL;
|
|
+ drm->driver->get_vblank_timestamp = NULL;
|
|
+
|
|
vc4_crtc = devm_kzalloc(dev, sizeof(*vc4_crtc), GFP_KERNEL);
|
|
if (!vc4_crtc)
|
|
return -ENOMEM;
|