Skip to content

Commit 3cfb5bc

Browse files
airliedairlied
committed
Merge tag 'du-next-20220707' of git://linuxtv.org/pinchartl/media into drm-next
Miscellaneous R-Car DU fixes and enhancements Signed-off-by: Dave Airlie <airlied@redhat.com> From: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Link: https://patchwork.freedesktop.org/patch/msgid/YtIEWkE0nk/8nhUc@pendragon.ideasonboard.com
2 parents 891ce1c + 676ad8e commit 3cfb5bc

24 files changed

Lines changed: 64 additions & 37 deletions

‎drivers/gpu/drm/rcar-du/rcar_cmm.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// SPDX-License-Identifier: GPL-2.0+
22
/*
3-
* rcar_cmm.c -- R-Car Display Unit Color Management Module
3+
* R-Car Display Unit Color Management Module
44
*
55
* Copyright (C) 2019 Jacopo Mondi <jacopo+renesas@jmondi.org>
66
*/

‎drivers/gpu/drm/rcar-du/rcar_cmm.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* SPDX-License-Identifier: GPL-2.0+ */
22
/*
3-
* rcar_cmm.h -- R-Car Display Unit Color Management Module
3+
* R-Car Display Unit Color Management Module
44
*
55
* Copyright (C) 2019 Jacopo Mondi <jacopo+renesas@jmondi.org>
66
*/

‎drivers/gpu/drm/rcar-du/rcar_du_crtc.c‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// SPDX-License-Identifier: GPL-2.0+
22
/*
3-
* rcar_du_crtc.c -- R-Car Display Unit CRTCs
3+
* R-Car Display Unit CRTCs
44
*
55
* Copyright (C) 2013-2015 Renesas Electronics Corporation
66
*
@@ -300,6 +300,11 @@ static void rcar_du_crtc_set_display_timing(struct rcar_du_crtc *rcrtc)
300300
| DSMR_DIPM_DISP | DSMR_CSPM;
301301
rcar_du_crtc_write(rcrtc, DSMR, dsmr);
302302

303+
/*
304+
* When the CMM is enabled, an additional offset of 25 pixels must be
305+
* subtracted from the HDS (horizontal display start) and HDE
306+
* (horizontal display end) registers.
307+
*/
303308
hdse_offset = 19;
304309
if (rcrtc->group->cmms_mask & BIT(rcrtc->index % 2))
305310
hdse_offset += 25;

‎drivers/gpu/drm/rcar-du/rcar_du_crtc.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* SPDX-License-Identifier: GPL-2.0+ */
22
/*
3-
* rcar_du_crtc.h -- R-Car Display Unit CRTCs
3+
* R-Car Display Unit CRTCs
44
*
55
* Copyright (C) 2013-2015 Renesas Electronics Corporation
66
*

‎drivers/gpu/drm/rcar-du/rcar_du_drv.c‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// SPDX-License-Identifier: GPL-2.0+
22
/*
3-
* rcar_du_drv.c -- R-Car Display Unit DRM driver
3+
* R-Car Display Unit DRM driver
44
*
55
* Copyright (C) 2013-2015 Renesas Electronics Corporation
66
*
@@ -55,6 +55,7 @@ static const struct rcar_du_device_info rzg1_du_r8a7743_info = {
5555
},
5656
},
5757
.num_lvds = 1,
58+
.num_rpf = 4,
5859
};
5960

6061
static const struct rcar_du_device_info rzg1_du_r8a7745_info = {
@@ -77,6 +78,7 @@ static const struct rcar_du_device_info rzg1_du_r8a7745_info = {
7778
.port = 1,
7879
},
7980
},
81+
.num_rpf = 4,
8082
};
8183

8284
static const struct rcar_du_device_info rzg1_du_r8a77470_info = {
@@ -104,6 +106,7 @@ static const struct rcar_du_device_info rzg1_du_r8a77470_info = {
104106
.port = 2,
105107
},
106108
},
109+
.num_rpf = 4,
107110
};
108111

109112
static const struct rcar_du_device_info rcar_du_r8a774a1_info = {
@@ -133,6 +136,7 @@ static const struct rcar_du_device_info rcar_du_r8a774a1_info = {
133136
},
134137
},
135138
.num_lvds = 1,
139+
.num_rpf = 5,
136140
.dpll_mask = BIT(1),
137141
};
138142

@@ -163,6 +167,7 @@ static const struct rcar_du_device_info rcar_du_r8a774b1_info = {
163167
},
164168
},
165169
.num_lvds = 1,
170+
.num_rpf = 5,
166171
.dpll_mask = BIT(1),
167172
};
168173

@@ -190,6 +195,7 @@ static const struct rcar_du_device_info rcar_du_r8a774c0_info = {
190195
},
191196
},
192197
.num_lvds = 2,
198+
.num_rpf = 4,
193199
.lvds_clk_mask = BIT(1) | BIT(0),
194200
};
195201

@@ -220,6 +226,7 @@ static const struct rcar_du_device_info rcar_du_r8a774e1_info = {
220226
},
221227
},
222228
.num_lvds = 1,
229+
.num_rpf = 5,
223230
.dpll_mask = BIT(1),
224231
};
225232

@@ -272,6 +279,7 @@ static const struct rcar_du_device_info rcar_du_r8a7790_info = {
272279
},
273280
},
274281
.num_lvds = 2,
282+
.num_rpf = 4,
275283
};
276284

277285
/* M2-W (r8a7791) and M2-N (r8a7793) are identical */
@@ -297,6 +305,7 @@ static const struct rcar_du_device_info rcar_du_r8a7791_info = {
297305
},
298306
},
299307
.num_lvds = 1,
308+
.num_rpf = 4,
300309
};
301310

302311
static const struct rcar_du_device_info rcar_du_r8a7792_info = {
@@ -317,6 +326,7 @@ static const struct rcar_du_device_info rcar_du_r8a7792_info = {
317326
.port = 1,
318327
},
319328
},
329+
.num_rpf = 4,
320330
};
321331

322332
static const struct rcar_du_device_info rcar_du_r8a7794_info = {
@@ -340,6 +350,7 @@ static const struct rcar_du_device_info rcar_du_r8a7794_info = {
340350
.port = 1,
341351
},
342352
},
353+
.num_rpf = 4,
343354
};
344355

345356
static const struct rcar_du_device_info rcar_du_r8a7795_info = {
@@ -373,6 +384,7 @@ static const struct rcar_du_device_info rcar_du_r8a7795_info = {
373384
},
374385
},
375386
.num_lvds = 1,
387+
.num_rpf = 5,
376388
.dpll_mask = BIT(2) | BIT(1),
377389
};
378390

@@ -403,6 +415,7 @@ static const struct rcar_du_device_info rcar_du_r8a7796_info = {
403415
},
404416
},
405417
.num_lvds = 1,
418+
.num_rpf = 5,
406419
.dpll_mask = BIT(1),
407420
};
408421

@@ -433,6 +446,7 @@ static const struct rcar_du_device_info rcar_du_r8a77965_info = {
433446
},
434447
},
435448
.num_lvds = 1,
449+
.num_rpf = 5,
436450
.dpll_mask = BIT(1),
437451
};
438452

@@ -459,6 +473,7 @@ static const struct rcar_du_device_info rcar_du_r8a77970_info = {
459473
},
460474
},
461475
.num_lvds = 1,
476+
.num_rpf = 5,
462477
};
463478

464479
static const struct rcar_du_device_info rcar_du_r8a7799x_info = {
@@ -486,6 +501,7 @@ static const struct rcar_du_device_info rcar_du_r8a7799x_info = {
486501
},
487502
},
488503
.num_lvds = 2,
504+
.num_rpf = 5,
489505
.lvds_clk_mask = BIT(1) | BIT(0),
490506
};
491507

@@ -505,6 +521,7 @@ static const struct rcar_du_device_info rcar_du_r8a779a0_info = {
505521
.port = 1,
506522
},
507523
},
524+
.num_rpf = 5,
508525
.dsi_clk_mask = BIT(1) | BIT(0),
509526
};
510527

‎drivers/gpu/drm/rcar-du/rcar_du_drv.h‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* SPDX-License-Identifier: GPL-2.0+ */
22
/*
3-
* rcar_du_drv.h -- R-Car Display Unit DRM driver
3+
* R-Car Display Unit DRM driver
44
*
55
* Copyright (C) 2013-2015 Renesas Electronics Corporation
66
*
@@ -69,6 +69,7 @@ struct rcar_du_output_routing {
6969
* @channels_mask: bit mask of available DU channels
7070
* @routes: array of CRTC to output routes, indexed by output (RCAR_DU_OUTPUT_*)
7171
* @num_lvds: number of internal LVDS encoders
72+
* @num_rpf: number of RPFs in VSP
7273
* @dpll_mask: bit mask of DU channels equipped with a DPLL
7374
* @dsi_clk_mask: bitmask of channels that can use the DSI clock as dot clock
7475
* @lvds_clk_mask: bitmask of channels that can use the LVDS clock as dot clock
@@ -80,6 +81,7 @@ struct rcar_du_device_info {
8081
unsigned int channels_mask;
8182
struct rcar_du_output_routing routes[RCAR_DU_OUTPUT_MAX];
8283
unsigned int num_lvds;
84+
unsigned int num_rpf;
8385
unsigned int dpll_mask;
8486
unsigned int dsi_clk_mask;
8587
unsigned int lvds_clk_mask;

‎drivers/gpu/drm/rcar-du/rcar_du_encoder.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// SPDX-License-Identifier: GPL-2.0+
22
/*
3-
* rcar_du_encoder.c -- R-Car Display Unit Encoder
3+
* R-Car Display Unit Encoder
44
*
55
* Copyright (C) 2013-2014 Renesas Electronics Corporation
66
*

‎drivers/gpu/drm/rcar-du/rcar_du_encoder.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* SPDX-License-Identifier: GPL-2.0+ */
22
/*
3-
* rcar_du_encoder.h -- R-Car Display Unit Encoder
3+
* R-Car Display Unit Encoder
44
*
55
* Copyright (C) 2013-2014 Renesas Electronics Corporation
66
*

‎drivers/gpu/drm/rcar-du/rcar_du_group.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// SPDX-License-Identifier: GPL-2.0+
22
/*
3-
* rcar_du_group.c -- R-Car Display Unit Channels Pair
3+
* R-Car Display Unit Channels Pair
44
*
55
* Copyright (C) 2013-2015 Renesas Electronics Corporation
66
*

‎drivers/gpu/drm/rcar-du/rcar_du_group.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* SPDX-License-Identifier: GPL-2.0+ */
22
/*
3-
* rcar_du_group.c -- R-Car Display Unit Planes and CRTCs Group
3+
* R-Car Display Unit Planes and CRTCs Group
44
*
55
* Copyright (C) 2013-2014 Renesas Electronics Corporation
66
*

0 commit comments

Comments
 (0)