Skip to content

Commit 15c04e1

Browse files
popcornmixpopcornmix
committed
drm/vc4: Disable the 2pixel/clock odd timings workaround for interlaced
Whilst BCM2712 does fix using odd horizontal timings, it doesn't work with interlaced modes. Drop the workaround for interlaced modes and revert to the same behaviour as BCM2711. #6281 Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
1 parent 272b818 commit 15c04e1

File tree

4 files changed

+30
-4
lines changed

4 files changed

+30
-4
lines changed

‎drivers/gpu/drm/vc4/vc4_crtc.c

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,9 @@ static void vc4_crtc_config_pv(struct drm_crtc *crtc, struct drm_encoder *encode
361361
bool is_dsi1 = vc4_encoder->type == VC4_ENCODER_TYPE_DSI1;
362362
bool is_vec = vc4_encoder->type == VC4_ENCODER_TYPE_VEC;
363363
u32 format = is_dsi1 ? PV_CONTROL_FORMAT_DSIV_24 : PV_CONTROL_FORMAT_24;
364-
u8 ppc = pv_data->pixels_per_clock;
364+
u8 ppc = (mode->flags & DRM_MODE_FLAG_INTERLACE) ?
365+
pv_data->pixels_per_clock_int :
366+
pv_data->pixels_per_clock;
365367

366368
u16 vert_bp = mode->crtc_vtotal - mode->crtc_vsync_end;
367369
u16 vert_sync = mode->crtc_vsync_end - mode->crtc_vsync_start;
@@ -426,7 +428,8 @@ static void vc4_crtc_config_pv(struct drm_crtc *crtc, struct drm_encoder *encode
426428
*/
427429
CRTC_WRITE(PV_V_CONTROL,
428430
PV_VCONTROL_CONTINUOUS |
429-
(vc4->gen >= VC4_GEN_6_C ? PV_VCONTROL_ODD_TIMING : 0) |
431+
(vc4->gen >= VC4_GEN_6_C && ppc == 1 ?
432+
PV_VCONTROL_ODD_TIMING : 0) |
430433
(is_dsi ? PV_VCONTROL_DSI : 0) |
431434
PV_VCONTROL_INTERLACE |
432435
(odd_field_first
@@ -438,7 +441,8 @@ static void vc4_crtc_config_pv(struct drm_crtc *crtc, struct drm_encoder *encode
438441
} else {
439442
CRTC_WRITE(PV_V_CONTROL,
440443
PV_VCONTROL_CONTINUOUS |
441-
(vc4->gen >= VC4_GEN_6_C ? PV_VCONTROL_ODD_TIMING : 0) |
444+
(vc4->gen >= VC4_GEN_6_C && ppc == 1 ?
445+
PV_VCONTROL_ODD_TIMING : 0) |
442446
(is_dsi ? PV_VCONTROL_DSI : 0));
443447
CRTC_WRITE(PV_VSYNCD_EVEN, 0);
444448
}
@@ -1205,6 +1209,7 @@ const struct vc4_pv_data bcm2835_pv0_data = {
12051209
},
12061210
.fifo_depth = 64,
12071211
.pixels_per_clock = 1,
1212+
.pixels_per_clock_int = 1,
12081213
.encoder_types = {
12091214
[PV_CONTROL_CLK_SELECT_DSI] = VC4_ENCODER_TYPE_DSI0,
12101215
[PV_CONTROL_CLK_SELECT_DPI_SMI_HDMI] = VC4_ENCODER_TYPE_DPI,
@@ -1220,6 +1225,7 @@ const struct vc4_pv_data bcm2835_pv1_data = {
12201225
},
12211226
.fifo_depth = 64,
12221227
.pixels_per_clock = 1,
1228+
.pixels_per_clock_int = 1,
12231229
.encoder_types = {
12241230
[PV_CONTROL_CLK_SELECT_DSI] = VC4_ENCODER_TYPE_DSI1,
12251231
[PV_CONTROL_CLK_SELECT_DPI_SMI_HDMI] = VC4_ENCODER_TYPE_SMI,
@@ -1235,6 +1241,7 @@ const struct vc4_pv_data bcm2835_pv2_data = {
12351241
},
12361242
.fifo_depth = 64,
12371243
.pixels_per_clock = 1,
1244+
.pixels_per_clock_int = 1,
12381245
.encoder_types = {
12391246
[PV_CONTROL_CLK_SELECT_DPI_SMI_HDMI] = VC4_ENCODER_TYPE_HDMI0,
12401247
[PV_CONTROL_CLK_SELECT_VEC] = VC4_ENCODER_TYPE_VEC,
@@ -1250,6 +1257,7 @@ const struct vc4_pv_data bcm2711_pv0_data = {
12501257
},
12511258
.fifo_depth = 64,
12521259
.pixels_per_clock = 1,
1260+
.pixels_per_clock_int = 1,
12531261
.encoder_types = {
12541262
[0] = VC4_ENCODER_TYPE_DSI0,
12551263
[1] = VC4_ENCODER_TYPE_DPI,
@@ -1265,6 +1273,7 @@ const struct vc4_pv_data bcm2711_pv1_data = {
12651273
},
12661274
.fifo_depth = 64,
12671275
.pixels_per_clock = 1,
1276+
.pixels_per_clock_int = 1,
12681277
.encoder_types = {
12691278
[0] = VC4_ENCODER_TYPE_DSI1,
12701279
[1] = VC4_ENCODER_TYPE_SMI,
@@ -1280,6 +1289,7 @@ const struct vc4_pv_data bcm2711_pv2_data = {
12801289
},
12811290
.fifo_depth = 256,
12821291
.pixels_per_clock = 2,
1292+
.pixels_per_clock_int = 2,
12831293
.encoder_types = {
12841294
[0] = VC4_ENCODER_TYPE_HDMI0,
12851295
},
@@ -1294,6 +1304,7 @@ const struct vc4_pv_data bcm2711_pv3_data = {
12941304
},
12951305
.fifo_depth = 64,
12961306
.pixels_per_clock = 1,
1307+
.pixels_per_clock_int = 1,
12971308
.encoder_types = {
12981309
[PV_CONTROL_CLK_SELECT_VEC] = VC4_ENCODER_TYPE_VEC,
12991310
},
@@ -1308,6 +1319,7 @@ const struct vc4_pv_data bcm2711_pv4_data = {
13081319
},
13091320
.fifo_depth = 64,
13101321
.pixels_per_clock = 2,
1322+
.pixels_per_clock_int = 2,
13111323
.encoder_types = {
13121324
[0] = VC4_ENCODER_TYPE_HDMI1,
13131325
},
@@ -1321,6 +1333,7 @@ const struct vc4_pv_data bcm2712_pv0_data = {
13211333
},
13221334
.fifo_depth = 64,
13231335
.pixels_per_clock = 1,
1336+
.pixels_per_clock_int = 2,
13241337
.encoder_types = {
13251338
[0] = VC4_ENCODER_TYPE_HDMI0,
13261339
},
@@ -1334,6 +1347,7 @@ const struct vc4_pv_data bcm2712_pv1_data = {
13341347
},
13351348
.fifo_depth = 64,
13361349
.pixels_per_clock = 1,
1350+
.pixels_per_clock_int = 2,
13371351
.encoder_types = {
13381352
[0] = VC4_ENCODER_TYPE_HDMI1,
13391353
},

‎drivers/gpu/drm/vc4/vc4_drv.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -547,6 +547,8 @@ struct vc4_pv_data {
547547

548548
/* Number of pixels output per clock period */
549549
u8 pixels_per_clock;
550+
/* Number of pixels output per clock period when in an interlaced mode */
551+
u8 pixels_per_clock_int;
550552

551553
enum vc4_encoder_type encoder_types[4];
552554
};

‎drivers/gpu/drm/vc4/vc4_hdmi.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1709,7 +1709,9 @@ static int vc4_hdmi_encoder_atomic_check(struct drm_encoder *encoder,
17091709
unsigned long long tmds_char_rate = mode->clock * 1000;
17101710
unsigned long long tmds_bit_rate;
17111711

1712-
if (vc4_hdmi->variant->unsupported_odd_h_timings) {
1712+
if (vc4_hdmi->variant->unsupported_odd_h_timings ||
1713+
(vc4_hdmi->variant->unsupported_int_odd_h_timings &&
1714+
(mode->flags & DRM_MODE_FLAG_INTERLACE))) {
17131715
if (mode->flags & DRM_MODE_FLAG_DBLCLK) {
17141716
/* Only try to fixup DBLCLK modes to get 480i and 576i
17151717
* working.
@@ -3323,6 +3325,7 @@ static const struct vc4_hdmi_variant bcm2711_hdmi0_variant = {
33233325
PHY_LANE_CK,
33243326
},
33253327
.unsupported_odd_h_timings = true,
3328+
.unsupported_int_odd_h_timings = true,
33263329
.external_irq_controller = true,
33273330

33283331
.init_resources = vc5_hdmi_init_resources,
@@ -3352,6 +3355,7 @@ static const struct vc4_hdmi_variant bcm2711_hdmi1_variant = {
33523355
PHY_LANE_2,
33533356
},
33543357
.unsupported_odd_h_timings = true,
3358+
.unsupported_int_odd_h_timings = true,
33553359
.external_irq_controller = true,
33563360

33573361
.init_resources = vc5_hdmi_init_resources,
@@ -3381,6 +3385,7 @@ static const struct vc4_hdmi_variant bcm2712_hdmi0_variant = {
33813385
PHY_LANE_CK,
33823386
},
33833387
.unsupported_odd_h_timings = false,
3388+
.unsupported_int_odd_h_timings = true,
33843389
.external_irq_controller = true,
33853390

33863391
.init_resources = vc5_hdmi_init_resources,
@@ -3408,6 +3413,7 @@ static const struct vc4_hdmi_variant bcm2712_hdmi1_variant = {
34083413
PHY_LANE_CK,
34093414
},
34103415
.unsupported_odd_h_timings = false,
3416+
.unsupported_int_odd_h_timings = true,
34113417
.external_irq_controller = true,
34123418

34133419
.init_resources = vc5_hdmi_init_resources,

‎drivers/gpu/drm/vc4/vc4_hdmi.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,10 @@ struct vc4_hdmi_variant {
4646

4747
/* The BCM2711 cannot deal with odd horizontal pixel timings */
4848
bool unsupported_odd_h_timings;
49+
/* The BCM2712 can handle odd horizontal pixel timings, but not in
50+
* interlaced modes
51+
*/
52+
bool unsupported_int_odd_h_timings;
4953

5054
/*
5155
* The BCM2711 CEC/hotplug IRQ controller is shared between the

0 commit comments

Comments
 (0)