Skip to content

Commit 236af7d

Browse files
misaka36misaka36
authored
kernel: bump 5.4 to 5.4.215 (#10205)
All patches automatically rebased. Signed-off-by: Liu Linhui <[email protected]>
1 parent 35f20da commit 236af7d

11 files changed

+67
-67
lines changed

‎include/kernel-5.4

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
LINUX_VERSION-5.4 = .214
2-
LINUX_KERNEL_HASH-5.4.214 = 9abc79b4808c827eb82f8a44313ce6d3ade255949989bb98c11acda7ca3bc5db
1+
LINUX_VERSION-5.4 = .215
2+
LINUX_KERNEL_HASH-5.4.215 = 2d2bf7c3a25297f2b4686aa50a7cdaac68b52fc4c81b2cd3dddfe9f592b34ebd

‎target/linux/layerscape/patches-5.4/805-display-0002-drm-rockchip-prepare-common-code-for-cdns-and-rk-dpi.patch

+37-37
Original file line numberDiff line numberDiff line change
@@ -164,8 +164,8 @@ Signed-off-by: Sandor Yu <[email protected]>
164164
edid->width_cm, edid->height_cm);
165165

166166
dp->sink_has_audio = drm_detect_monitor_audio(edid);
167-
@@ -279,7 +282,8 @@ static int cdn_dp_connector_mode_valid(s
168-
struct drm_display_mode *mode)
167+
@@ -280,7 +283,8 @@ cdn_dp_connector_mode_valid(struct drm_c
168+
struct drm_display_mode *mode)
169169
{
170170
struct cdn_dp_device *dp = connector_to_dp(connector);
171171
- struct drm_display_info *display_info = &dp->connector.display_info;
@@ -174,7 +174,7 @@ Signed-off-by: Sandor Yu <[email protected]>
174174
u32 requested, actual, rate, sink_max, source_max = 0;
175175
u8 lanes, bpc;
176176

177-
@@ -305,7 +309,7 @@ static int cdn_dp_connector_mode_valid(s
177+
@@ -306,7 +310,7 @@ cdn_dp_connector_mode_valid(struct drm_c
178178
sink_max = drm_dp_max_lane_count(dp->dpcd);
179179
lanes = min(source_max, sink_max);
180180

@@ -183,7 +183,7 @@ Signed-off-by: Sandor Yu <[email protected]>
183183
sink_max = drm_dp_max_link_rate(dp->dpcd);
184184
rate = min(source_max, sink_max);
185185

186-
@@ -315,7 +319,7 @@ static int cdn_dp_connector_mode_valid(s
186+
@@ -316,7 +320,7 @@ cdn_dp_connector_mode_valid(struct drm_c
187187
actual = actual * 8 / 10;
188188

189189
if (requested > actual) {
@@ -192,7 +192,7 @@ Signed-off-by: Sandor Yu <[email protected]>
192192
"requested=%d, actual=%d, clock=%d\n",
193193
requested, actual, mode->clock);
194194
return MODE_CLOCK_HIGH;
195-
@@ -335,28 +339,29 @@ static int cdn_dp_firmware_init(struct c
195+
@@ -336,28 +340,29 @@ static int cdn_dp_firmware_init(struct c
196196
const u32 *iram_data, *dram_data;
197197
const struct firmware *fw = dp->fw;
198198
const struct cdn_firmware_header *hdr;
@@ -228,7 +228,7 @@ Signed-off-by: Sandor Yu <[email protected]>
228228
}
229229

230230
static int cdn_dp_get_sink_capability(struct cdn_dp_device *dp)
231-
@@ -366,28 +371,29 @@ static int cdn_dp_get_sink_capability(st
231+
@@ -367,28 +372,29 @@ static int cdn_dp_get_sink_capability(st
232232
if (!cdn_dp_check_sink_connection(dp))
233233
return -ENODEV;
234234

@@ -264,7 +264,7 @@ Signed-off-by: Sandor Yu <[email protected]>
264264
ret);
265265
goto err_phy;
266266
}
267-
@@ -397,28 +403,28 @@ static int cdn_dp_enable_phy(struct cdn_
267+
@@ -398,28 +404,28 @@ static int cdn_dp_enable_phy(struct cdn_
268268
ret = cdn_dp_grf_write(dp, GRF_SOC_CON26,
269269
DPTX_HPD_SEL_MASK | DPTX_HPD_SEL);
270270
if (ret) {
@@ -299,7 +299,7 @@ Signed-off-by: Sandor Yu <[email protected]>
299299
ret);
300300
goto err_power_on;
301301
}
302-
@@ -428,7 +434,7 @@ static int cdn_dp_enable_phy(struct cdn_
302+
@@ -429,7 +435,7 @@ static int cdn_dp_enable_phy(struct cdn_
303303

304304
err_power_on:
305305
if (phy_power_off(port->phy))
@@ -308,7 +308,7 @@ Signed-off-by: Sandor Yu <[email protected]>
308308
else
309309
port->phy_enabled = false;
310310

311-
@@ -446,7 +452,8 @@ static int cdn_dp_disable_phy(struct cdn
311+
@@ -447,7 +453,8 @@ static int cdn_dp_disable_phy(struct cdn
312312
if (port->phy_enabled) {
313313
ret = phy_power_off(port->phy);
314314
if (ret) {
@@ -318,7 +318,7 @@ Signed-off-by: Sandor Yu <[email protected]>
318318
return ret;
319319
}
320320
}
321-
@@ -470,16 +477,16 @@ static int cdn_dp_disable(struct cdn_dp_
321+
@@ -471,16 +478,16 @@ static int cdn_dp_disable(struct cdn_dp_
322322
ret = cdn_dp_grf_write(dp, GRF_SOC_CON26,
323323
DPTX_HPD_SEL_MASK | DPTX_HPD_DEL);
324324
if (ret) {
@@ -339,7 +339,7 @@ Signed-off-by: Sandor Yu <[email protected]>
339339
if (!dp->connected) {
340340
kfree(dp->edid);
341341
dp->edid = NULL;
342-
@@ -492,11 +499,11 @@ static int cdn_dp_enable(struct cdn_dp_d
342+
@@ -493,11 +500,11 @@ static int cdn_dp_enable(struct cdn_dp_d
343343
{
344344
int ret, i, lanes;
345345
struct cdn_dp_port *port;
@@ -353,7 +353,7 @@ Signed-off-by: Sandor Yu <[email protected]>
353353
return -ENODEV;
354354
}
355355

356-
@@ -509,7 +516,7 @@ static int cdn_dp_enable(struct cdn_dp_d
356+
@@ -510,7 +517,7 @@ static int cdn_dp_enable(struct cdn_dp_d
357357

358358
ret = cdn_dp_firmware_init(dp);
359359
if (ret) {
@@ -362,7 +362,7 @@ Signed-off-by: Sandor Yu <[email protected]>
362362
goto err_clk_disable;
363363
}
364364

365-
@@ -543,8 +550,9 @@ static void cdn_dp_encoder_mode_set(stru
365+
@@ -544,8 +551,9 @@ static void cdn_dp_encoder_mode_set(stru
366366
struct drm_display_mode *adjusted)
367367
{
368368
struct cdn_dp_device *dp = encoder_to_dp(encoder);
@@ -374,7 +374,7 @@ Signed-off-by: Sandor Yu <[email protected]>
374374

375375
switch (display_info->bpc) {
376376
case 10:
377-
@@ -562,7 +570,7 @@ static void cdn_dp_encoder_mode_set(stru
377+
@@ -563,7 +571,7 @@ static void cdn_dp_encoder_mode_set(stru
378378
video->v_sync_polarity = !!(mode->flags & DRM_MODE_FLAG_NVSYNC);
379379
video->h_sync_polarity = !!(mode->flags & DRM_MODE_FLAG_NHSYNC);
380380

@@ -383,7 +383,7 @@ Signed-off-by: Sandor Yu <[email protected]>
383383
}
384384

385385
static bool cdn_dp_check_link_status(struct cdn_dp_device *dp)
386-
@@ -571,11 +579,11 @@ static bool cdn_dp_check_link_status(str
386+
@@ -572,11 +580,11 @@ static bool cdn_dp_check_link_status(str
387387
struct cdn_dp_port *port = cdn_dp_connected_port(dp);
388388
u8 sink_lanes = drm_dp_max_lane_count(dp->dpcd);
389389

@@ -398,7 +398,7 @@ Signed-off-by: Sandor Yu <[email protected]>
398398
DRM_ERROR("Failed to get link status\n");
399399
return false;
400400
}
401-
@@ -587,15 +595,16 @@ static bool cdn_dp_check_link_status(str
401+
@@ -588,15 +596,16 @@ static bool cdn_dp_check_link_status(str
402402
static void cdn_dp_encoder_enable(struct drm_encoder *encoder)
403403
{
404404
struct cdn_dp_device *dp = encoder_to_dp(encoder);
@@ -418,7 +418,7 @@ Signed-off-by: Sandor Yu <[email protected]>
418418
(ret) ? "LIT" : "BIG");
419419
if (ret)
420420
val = DP_SEL_VOP_LIT | (DP_SEL_VOP_LIT << 16);
421-
@@ -610,33 +619,33 @@ static void cdn_dp_encoder_enable(struct
421+
@@ -611,33 +620,33 @@ static void cdn_dp_encoder_enable(struct
422422

423423
ret = cdn_dp_enable(dp);
424424
if (ret) {
@@ -461,7 +461,7 @@ Signed-off-by: Sandor Yu <[email protected]>
461461
goto out;
462462
}
463463
out:
464-
@@ -652,7 +661,8 @@ static void cdn_dp_encoder_disable(struc
464+
@@ -653,7 +662,8 @@ static void cdn_dp_encoder_disable(struc
465465
if (dp->active) {
466466
ret = cdn_dp_disable(dp);
467467
if (ret) {
@@ -471,7 +471,7 @@ Signed-off-by: Sandor Yu <[email protected]>
471471
ret);
472472
}
473473
}
474-
@@ -696,7 +706,7 @@ static const struct drm_encoder_funcs cd
474+
@@ -697,7 +707,7 @@ static const struct drm_encoder_funcs cd
475475

476476
static int cdn_dp_parse_dt(struct cdn_dp_device *dp)
477477
{
@@ -480,7 +480,7 @@ Signed-off-by: Sandor Yu <[email protected]>
480480
struct device_node *np = dev->of_node;
481481
struct platform_device *pdev = to_platform_device(dev);
482482
struct resource *res;
483-
@@ -708,10 +718,10 @@ static int cdn_dp_parse_dt(struct cdn_dp
483+
@@ -709,10 +719,10 @@ static int cdn_dp_parse_dt(struct cdn_dp
484484
}
485485

486486
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@@ -494,7 +494,7 @@ Signed-off-by: Sandor Yu <[email protected]>
494494
}
495495

496496
dp->core_clk = devm_clk_get(dev, "core-clk");
497-
@@ -726,10 +736,10 @@ static int cdn_dp_parse_dt(struct cdn_dp
497+
@@ -727,10 +737,10 @@ static int cdn_dp_parse_dt(struct cdn_dp
498498
return PTR_ERR(dp->pclk);
499499
}
500500

@@ -508,7 +508,7 @@ Signed-off-by: Sandor Yu <[email protected]>
508508
}
509509

510510
dp->grf_clk = devm_clk_get(dev, "grf");
511-
@@ -738,10 +748,10 @@ static int cdn_dp_parse_dt(struct cdn_dp
511+
@@ -739,10 +749,10 @@ static int cdn_dp_parse_dt(struct cdn_dp
512512
return PTR_ERR(dp->grf_clk);
513513
}
514514

@@ -522,7 +522,7 @@ Signed-off-by: Sandor Yu <[email protected]>
522522
}
523523

524524
dp->dptx_rst = devm_reset_control_get(dev, "dptx");
525-
@@ -796,7 +806,7 @@ static int cdn_dp_audio_hw_params(struct
525+
@@ -797,7 +807,7 @@ static int cdn_dp_audio_hw_params(struct
526526
goto out;
527527
}
528528

@@ -531,7 +531,7 @@ Signed-off-by: Sandor Yu <[email protected]>
531531
if (!ret)
532532
dp->audio_info = audio;
533533

534-
@@ -814,7 +824,7 @@ static void cdn_dp_audio_shutdown(struct
534+
@@ -815,7 +825,7 @@ static void cdn_dp_audio_shutdown(struct
535535
if (!dp->active)
536536
goto out;
537537

@@ -540,7 +540,7 @@ Signed-off-by: Sandor Yu <[email protected]>
540540
if (!ret)
541541
dp->audio_info.format = AFMT_UNUSED;
542542
out:
543-
@@ -833,7 +843,7 @@ static int cdn_dp_audio_digital_mute(str
543+
@@ -834,7 +844,7 @@ static int cdn_dp_audio_digital_mute(str
544544
goto out;
545545
}
546546

@@ -549,7 +549,7 @@ Signed-off-by: Sandor Yu <[email protected]>
549549

550550
out:
551551
mutex_unlock(&dp->lock);
552-
@@ -845,7 +855,8 @@ static int cdn_dp_audio_get_eld(struct d
552+
@@ -846,7 +856,8 @@ static int cdn_dp_audio_get_eld(struct d
553553
{
554554
struct cdn_dp_device *dp = dev_get_drvdata(dev);
555555

@@ -559,15 +559,15 @@ Signed-off-by: Sandor Yu <[email protected]>
559559

560560
return 0;
561561
}
562-
@@ -879,6 +890,7 @@ static int cdn_dp_request_firmware(struc
562+
@@ -880,6 +891,7 @@ static int cdn_dp_request_firmware(struc
563563
int ret;
564564
unsigned long timeout = jiffies + msecs_to_jiffies(CDN_FW_TIMEOUT_MS);
565565
unsigned long sleep = 1000;
566566
+ struct device *dev = dp->mhdp.dev;
567567

568568
WARN_ON(!mutex_is_locked(&dp->lock));
569569

570-
@@ -889,13 +901,13 @@ static int cdn_dp_request_firmware(struc
570+
@@ -890,13 +902,13 @@ static int cdn_dp_request_firmware(struc
571571
mutex_unlock(&dp->lock);
572572

573573
while (time_before(jiffies, timeout)) {
@@ -583,7 +583,7 @@ Signed-off-by: Sandor Yu <[email protected]>
583583
"failed to request firmware: %d\n", ret);
584584
goto out;
585585
}
586-
@@ -905,7 +917,7 @@ static int cdn_dp_request_firmware(struc
586+
@@ -906,7 +918,7 @@ static int cdn_dp_request_firmware(struc
587587
goto out;
588588
}
589589

@@ -592,7 +592,7 @@ Signed-off-by: Sandor Yu <[email protected]>
592592
ret = -ETIMEDOUT;
593593
out:
594594
mutex_lock(&dp->lock);
595-
@@ -916,8 +928,9 @@ static void cdn_dp_pd_event_work(struct
595+
@@ -917,8 +929,9 @@ static void cdn_dp_pd_event_work(struct
596596
{
597597
struct cdn_dp_device *dp = container_of(work, struct cdn_dp_device,
598598
event_work);
@@ -603,7 +603,7 @@ Signed-off-by: Sandor Yu <[email protected]>
603603

604604
int ret;
605605

606-
@@ -934,44 +947,45 @@ static void cdn_dp_pd_event_work(struct
606+
@@ -935,44 +948,45 @@ static void cdn_dp_pd_event_work(struct
607607

608608
/* Not connected, notify userspace to disable the block */
609609
if (!cdn_dp_connected_port(dp)) {
@@ -662,7 +662,7 @@ Signed-off-by: Sandor Yu <[email protected]>
662662
"Failed to config video %d\n",
663663
ret);
664664
}
665-
@@ -1040,7 +1054,7 @@ static int cdn_dp_bind(struct device *de
665+
@@ -1041,7 +1055,7 @@ static int cdn_dp_bind(struct device *de
666666

667667
drm_encoder_helper_add(encoder, &cdn_dp_encoder_helper_funcs);
668668

@@ -671,7 +671,7 @@ Signed-off-by: Sandor Yu <[email protected]>
671671
connector->polled = DRM_CONNECTOR_POLL_HPD;
672672
connector->dpms = DRM_MODE_DPMS_OFF;
673673

674-
@@ -1064,7 +1078,7 @@ static int cdn_dp_bind(struct device *de
674+
@@ -1065,7 +1079,7 @@ static int cdn_dp_bind(struct device *de
675675
port = dp->port[i];
676676

677677
port->event_nb.notifier_call = cdn_dp_pd_event;
@@ -680,7 +680,7 @@ Signed-off-by: Sandor Yu <[email protected]>
680680
EXTCON_DISP_DP,
681681
&port->event_nb);
682682
if (ret) {
683-
@@ -1091,7 +1105,7 @@ static void cdn_dp_unbind(struct device
683+
@@ -1092,7 +1106,7 @@ static void cdn_dp_unbind(struct device
684684
{
685685
struct cdn_dp_device *dp = dev_get_drvdata(dev);
686686
struct drm_encoder *encoder = &dp->encoder;
@@ -689,7 +689,7 @@ Signed-off-by: Sandor Yu <[email protected]>
689689

690690
cancel_work_sync(&dp->event_work);
691691
cdn_dp_encoder_disable(encoder);
692-
@@ -1151,7 +1165,7 @@ static int cdn_dp_probe(struct platform_
692+
@@ -1152,7 +1166,7 @@ static int cdn_dp_probe(struct platform_
693693
dp = devm_kzalloc(dev, sizeof(*dp), GFP_KERNEL);
694694
if (!dp)
695695
return -ENOMEM;
@@ -698,7 +698,7 @@ Signed-off-by: Sandor Yu <[email protected]>
698698

699699
match = of_match_node(cdn_dp_dt_ids, pdev->dev.of_node);
700700
dp_data = (struct cdn_dp_data *)match->data;
701-
@@ -1196,7 +1210,7 @@ static int cdn_dp_remove(struct platform
701+
@@ -1197,7 +1211,7 @@ static int cdn_dp_remove(struct platform
702702
struct cdn_dp_device *dp = platform_get_drvdata(pdev);
703703

704704
platform_device_unregister(dp->audio_pdev);
@@ -707,7 +707,7 @@ Signed-off-by: Sandor Yu <[email protected]>
707707
component_del(&pdev->dev, &cdn_dp_component_ops);
708708

709709
return 0;
710-
@@ -1206,7 +1220,7 @@ static void cdn_dp_shutdown(struct platf
710+
@@ -1207,7 +1221,7 @@ static void cdn_dp_shutdown(struct platf
711711
{
712712
struct cdn_dp_device *dp = platform_get_drvdata(pdev);
713713

0 commit comments

Comments
 (0)