mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2024-11-22 04:56:15 +00:00
8c405cdccc
The patches were generated from the RPi repo with the following command: git format-patch v6.6.34..rpi-6.1.y Some patches needed rebasing and, as usual, the applied and reverted, wireless drivers, Github workflows, READMEs and defconfigs patches were removed. Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
241 lines
6.9 KiB
Diff
241 lines
6.9 KiB
Diff
From e667d11b9e6ee013b4d496b190816d3b63b4d703 Mon Sep 17 00:00:00 2001
|
|
From: Maxime Ripard <maxime@cerno.tech>
|
|
Date: Tue, 21 Feb 2023 14:38:32 +0100
|
|
Subject: [PATCH 0622/1085] drm/vc4: Add additional warn_on
|
|
|
|
Some code path in vc4 are conditional to a generation and cannot be
|
|
executed on others. Let's put a WARN_ON if that ever happens.
|
|
|
|
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
|
|
---
|
|
drivers/gpu/drm/vc4/vc4_hvs.c | 32 ++++++++++++++++++++++++++++++--
|
|
drivers/gpu/drm/vc4/vc4_kms.c | 6 ++++++
|
|
drivers/gpu/drm/vc4/vc4_plane.c | 19 +++++++++++++++++++
|
|
3 files changed, 55 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_hvs.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_hvs.c
|
|
@@ -417,12 +417,15 @@ static int vc4_hvs_upload_linear_kernel(
|
|
static void vc4_hvs_lut_load(struct vc4_hvs *hvs,
|
|
struct vc4_crtc *vc4_crtc)
|
|
{
|
|
- struct drm_device *drm = &hvs->vc4->base;
|
|
+ struct vc4_dev *vc4 = hvs->vc4;
|
|
+ struct drm_device *drm = &vc4->base;
|
|
struct drm_crtc *crtc = &vc4_crtc->base;
|
|
struct vc4_crtc_state *vc4_state = to_vc4_crtc_state(crtc->state);
|
|
int idx;
|
|
u32 i;
|
|
|
|
+ WARN_ON_ONCE(vc4->gen > VC4_GEN_5);
|
|
+
|
|
if (!drm_dev_enter(drm, &idx))
|
|
return;
|
|
|
|
@@ -758,6 +761,8 @@ u8 vc4_hvs_get_fifo_frame_count(struct v
|
|
u8 field = 0;
|
|
int idx;
|
|
|
|
+ WARN_ON_ONCE(vc4->gen > VC4_GEN_6);
|
|
+
|
|
if (!drm_dev_enter(drm, &idx))
|
|
return 0;
|
|
|
|
@@ -791,6 +796,8 @@ int vc4_hvs_get_fifo_from_output(struct
|
|
u32 reg;
|
|
int ret;
|
|
|
|
+ WARN_ON_ONCE(vc4->gen > VC4_GEN_6);
|
|
+
|
|
switch (vc4->gen) {
|
|
case VC4_GEN_4:
|
|
return output;
|
|
@@ -880,6 +887,8 @@ static int vc4_hvs_init_channel(struct v
|
|
u32 dispctrl;
|
|
int idx;
|
|
|
|
+ WARN_ON_ONCE(vc4->gen > VC4_GEN_5);
|
|
+
|
|
if (!drm_dev_enter(drm, &idx))
|
|
return -ENODEV;
|
|
|
|
@@ -947,6 +956,8 @@ static int vc6_hvs_init_channel(struct v
|
|
u32 disp_ctrl1;
|
|
int idx;
|
|
|
|
+ WARN_ON_ONCE(vc4->gen != VC4_GEN_6);
|
|
+
|
|
if (!drm_dev_enter(drm, &idx))
|
|
return -ENODEV;
|
|
|
|
@@ -972,9 +983,12 @@ static int vc6_hvs_init_channel(struct v
|
|
|
|
static void __vc4_hvs_stop_channel(struct vc4_hvs *hvs, unsigned int chan)
|
|
{
|
|
- struct drm_device *drm = &hvs->vc4->base;
|
|
+ struct vc4_dev *vc4 = hvs->vc4;
|
|
+ struct drm_device *drm = &vc4->base;
|
|
int idx;
|
|
|
|
+ WARN_ON_ONCE(vc4->gen > VC4_GEN_5);
|
|
+
|
|
if (!drm_dev_enter(drm, &idx))
|
|
return;
|
|
|
|
@@ -1007,6 +1021,8 @@ static void __vc6_hvs_stop_channel(struc
|
|
struct drm_device *drm = &vc4->base;
|
|
int idx;
|
|
|
|
+ WARN_ON_ONCE(vc4->gen != VC4_GEN_6);
|
|
+
|
|
if (!drm_dev_enter(drm, &idx))
|
|
return;
|
|
|
|
@@ -1234,6 +1250,8 @@ void vc4_hvs_atomic_flush(struct drm_crt
|
|
bool found = false;
|
|
int idx;
|
|
|
|
+ WARN_ON_ONCE(vc4->gen > VC4_GEN_6);
|
|
+
|
|
if (!drm_dev_enter(dev, &idx)) {
|
|
vc4_crtc_send_vblank(crtc);
|
|
return;
|
|
@@ -1324,6 +1342,8 @@ void vc4_hvs_atomic_flush(struct drm_crt
|
|
if (crtc->state->color_mgmt_changed) {
|
|
u32 dispbkgndx = HVS_READ(SCALER_DISPBKGNDX(channel));
|
|
|
|
+ WARN_ON_ONCE(vc4->gen > VC4_GEN_5);
|
|
+
|
|
if (crtc->state->gamma_lut) {
|
|
if (vc4->gen == VC4_GEN_4) {
|
|
vc4_hvs_update_gamma_lut(hvs, vc4_crtc);
|
|
@@ -1363,6 +1383,8 @@ void vc4_hvs_mask_underrun(struct vc4_hv
|
|
u32 dispctrl;
|
|
int idx;
|
|
|
|
+ WARN_ON(vc4->gen > VC4_GEN_5);
|
|
+
|
|
if (!drm_dev_enter(drm, &idx))
|
|
return;
|
|
|
|
@@ -1383,6 +1405,8 @@ void vc4_hvs_unmask_underrun(struct vc4_
|
|
u32 dispctrl;
|
|
int idx;
|
|
|
|
+ WARN_ON(vc4->gen > VC4_GEN_5);
|
|
+
|
|
if (!drm_dev_enter(drm, &idx))
|
|
return;
|
|
|
|
@@ -1417,6 +1441,8 @@ static irqreturn_t vc4_hvs_irq_handler(i
|
|
u32 status;
|
|
u32 dspeislur;
|
|
|
|
+ WARN_ON(vc4->gen > VC4_GEN_5);
|
|
+
|
|
/*
|
|
* NOTE: We don't need to protect the register access using
|
|
* drm_dev_enter() there because the interrupt handler lifetime
|
|
@@ -1466,6 +1492,8 @@ static irqreturn_t vc6_hvs_eof_irq_handl
|
|
struct vc4_hvs *hvs = vc4->hvs;
|
|
unsigned int i;
|
|
|
|
+ WARN_ON(vc4->gen < VC4_GEN_6);
|
|
+
|
|
for (i = 0; i < HVS_NUM_CHANNELS; i++) {
|
|
if (!hvs->eof_irq[i].enabled)
|
|
continue;
|
|
--- a/drivers/gpu/drm/vc4/vc4_kms.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_kms.c
|
|
@@ -141,6 +141,8 @@ vc4_ctm_commit(struct vc4_dev *vc4, stru
|
|
if (vc4->firmware_kms)
|
|
return;
|
|
|
|
+ WARN_ON_ONCE(vc4->gen > VC4_GEN_5);
|
|
+
|
|
if (ctm_state->fifo) {
|
|
HVS_WRITE(SCALER_OLEDCOEF2,
|
|
VC4_SET_FIELD(vc4_ctm_s31_32_to_s0_9(ctm->matrix[0]),
|
|
@@ -216,6 +218,8 @@ static void vc4_hvs_pv_muxing_commit(str
|
|
struct drm_crtc *crtc;
|
|
unsigned int i;
|
|
|
|
+ WARN_ON_ONCE(vc4->gen != VC4_GEN_4);
|
|
+
|
|
for_each_new_crtc_in_state(state, crtc, crtc_state, i) {
|
|
struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc);
|
|
struct vc4_crtc_state *vc4_state = to_vc4_crtc_state(crtc_state);
|
|
@@ -259,6 +263,8 @@ static void vc5_hvs_pv_muxing_commit(str
|
|
unsigned int i;
|
|
u32 reg;
|
|
|
|
+ WARN_ON_ONCE(vc4->gen != VC4_GEN_5);
|
|
+
|
|
for_each_new_crtc_in_state(state, crtc, crtc_state, i) {
|
|
struct vc4_crtc_state *vc4_state = to_vc4_crtc_state(crtc_state);
|
|
struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc);
|
|
--- a/drivers/gpu/drm/vc4/vc4_plane.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_plane.c
|
|
@@ -555,8 +555,11 @@ static int vc4_plane_setup_clipping_and_
|
|
|
|
static void vc4_write_tpz(struct vc4_plane_state *vc4_state, u32 src, u32 dst)
|
|
{
|
|
+ struct vc4_dev *vc4 = to_vc4_dev(vc4_state->base.plane->dev);
|
|
u32 scale, recip;
|
|
|
|
+ WARN_ON_ONCE(vc4->gen > VC4_GEN_6);
|
|
+
|
|
scale = src / dst;
|
|
|
|
/* The specs note that while the reciprocal would be defined
|
|
@@ -581,10 +584,13 @@ static void vc4_write_tpz(struct vc4_pla
|
|
|
|
static void vc4_write_ppf(struct vc4_plane_state *vc4_state, u32 src, u32 dst, u32 xy, int channel, int chroma_offset)
|
|
{
|
|
+ struct vc4_dev *vc4 = to_vc4_dev(vc4_state->base.plane->dev);
|
|
u32 scale = src / dst;
|
|
s32 offset, offset2;
|
|
s32 phase;
|
|
|
|
+ WARN_ON_ONCE(vc4->gen > VC4_GEN_6);
|
|
+
|
|
/* Start the phase at 1/2 pixel from the 1st pixel at src_x.
|
|
1/4 pixel for YUV, plus the offset for chroma siting */
|
|
if (channel) {
|
|
@@ -801,8 +807,11 @@ static size_t vc6_upm_size(const struct
|
|
static void vc4_write_scaling_parameters(struct drm_plane_state *state,
|
|
int channel)
|
|
{
|
|
+ struct vc4_dev *vc4 = to_vc4_dev(state->plane->dev);
|
|
struct vc4_plane_state *vc4_state = to_vc4_plane_state(state);
|
|
|
|
+ WARN_ON_ONCE(vc4->gen > VC4_GEN_6);
|
|
+
|
|
/* Ch0 H-PPF Word 0: Scaling Parameters */
|
|
if (vc4_state->x_scaling[channel] == VC4_SCALING_PPF) {
|
|
vc4_write_ppf(vc4_state,
|
|
@@ -1040,6 +1049,11 @@ static const u32 colorspace_coeffs[2][DR
|
|
|
|
static u32 vc4_hvs4_get_alpha_blend_mode(struct drm_plane_state *state)
|
|
{
|
|
+ struct drm_device *dev = state->state->dev;
|
|
+ struct vc4_dev *vc4 = to_vc4_dev(dev);
|
|
+
|
|
+ WARN_ON_ONCE(vc4->gen != VC4_GEN_4);
|
|
+
|
|
if (!state->fb->format->has_alpha)
|
|
return VC4_SET_FIELD(SCALER_POS2_ALPHA_MODE_FIXED,
|
|
SCALER_POS2_ALPHA_MODE);
|
|
@@ -1061,6 +1075,11 @@ static u32 vc4_hvs4_get_alpha_blend_mode
|
|
|
|
static u32 vc4_hvs5_get_alpha_blend_mode(struct drm_plane_state *state)
|
|
{
|
|
+ struct drm_device *dev = state->state->dev;
|
|
+ struct vc4_dev *vc4 = to_vc4_dev(dev);
|
|
+
|
|
+ WARN_ON_ONCE(vc4->gen != VC4_GEN_5 && vc4->gen != VC4_GEN_6);
|
|
+
|
|
if (!state->fb->format->has_alpha)
|
|
return VC4_SET_FIELD(SCALER5_CTL2_ALPHA_MODE_FIXED,
|
|
SCALER5_CTL2_ALPHA_MODE);
|