77e97abf12
Also removes random module and switches to new bcm2711 thermal driver. Boot tested on RPi 4B v1.1 4G. Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
51 lines
1.4 KiB
Diff
51 lines
1.4 KiB
Diff
From c017882242d671cf81256301a3e9a6fc9eefdc13 Mon Sep 17 00:00:00 2001
|
|
From: Maxime Ripard <maxime@cerno.tech>
|
|
Date: Mon, 13 Jan 2020 13:39:32 +0100
|
|
Subject: [PATCH] drm/vc4: crtc: Turn static const variable into a
|
|
define
|
|
|
|
The hvs_latency_pix variable doesn't need to be a variable and can just be
|
|
defined.
|
|
|
|
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
|
|
---
|
|
drivers/gpu/drm/vc4/vc4_crtc.c | 8 +++++---
|
|
1 file changed, 5 insertions(+), 3 deletions(-)
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_crtc.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_crtc.c
|
|
@@ -44,6 +44,8 @@
|
|
#include "vc4_drv.h"
|
|
#include "vc4_regs.h"
|
|
|
|
+#define HVS_FIFO_LATENCY_PIX 6
|
|
+
|
|
#define CRTC_WRITE(offset, val) writel(val, vc4_crtc->regs + (offset))
|
|
#define CRTC_READ(offset) readl(vc4_crtc->regs + (offset))
|
|
|
|
@@ -227,21 +229,21 @@ vc4_crtc_update_gamma_lut(struct drm_crt
|
|
vc4_crtc_lut_load(crtc);
|
|
}
|
|
|
|
+
|
|
static u32 vc4_get_fifo_full_level(u32 format)
|
|
{
|
|
static const u32 fifo_len_bytes = 64;
|
|
- static const u32 hvs_latency_pix = 6;
|
|
|
|
switch (format) {
|
|
case PV_CONTROL_FORMAT_DSIV_16:
|
|
case PV_CONTROL_FORMAT_DSIC_16:
|
|
- return fifo_len_bytes - 2 * hvs_latency_pix;
|
|
+ return fifo_len_bytes - 2 * HVS_FIFO_LATENCY_PIX;
|
|
case PV_CONTROL_FORMAT_DSIV_18:
|
|
return fifo_len_bytes - 14;
|
|
case PV_CONTROL_FORMAT_24:
|
|
case PV_CONTROL_FORMAT_DSIV_24:
|
|
default:
|
|
- return fifo_len_bytes - 3 * hvs_latency_pix;
|
|
+ return fifo_len_bytes - 3 * HVS_FIFO_LATENCY_PIX;
|
|
}
|
|
}
|
|
|