diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2021-07-18 23:51:48 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-07-19 22:47:17 +0200 |
| commit | a1d50e7b45080f60a0066e9ca88ad756480dd1f8 (patch) | |
| tree | 22dcfbbc4fc62d12483e9ffb961385d2da9993f3 /target/linux/layerscape/patches-5.4/805-display-0018-drm-bridge-cdns-dp-Remove-link-rate-lanes-set-by-dev.patch | |
| parent | 88c8d0a2193bd3dd2cf00bc875def6155f2e34db (diff) | |
| download | upstream-a1d50e7b45080f60a0066e9ca88ad756480dd1f8.tar.gz upstream-a1d50e7b45080f60a0066e9ca88ad756480dd1f8.tar.bz2 upstream-a1d50e7b45080f60a0066e9ca88ad756480dd1f8.zip | |
kernel: bump 5.4 to 5.4.132
Manually rebased
layerscape/patches-5.4/805-display-0002-drm-rockchip-prepare-common-code-for-cdns-and-rk-dpi.patch
All others updated automatically.
Compile-tested on: ramips/mt7621
Runtime-tested on: ramips/mt7621
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/layerscape/patches-5.4/805-display-0018-drm-bridge-cdns-dp-Remove-link-rate-lanes-set-by-dev.patch')
| -rw-r--r-- | target/linux/layerscape/patches-5.4/805-display-0018-drm-bridge-cdns-dp-Remove-link-rate-lanes-set-by-dev.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/layerscape/patches-5.4/805-display-0018-drm-bridge-cdns-dp-Remove-link-rate-lanes-set-by-dev.patch b/target/linux/layerscape/patches-5.4/805-display-0018-drm-bridge-cdns-dp-Remove-link-rate-lanes-set-by-dev.patch index 58df9b98aa..fba2ac4f02 100644 --- a/target/linux/layerscape/patches-5.4/805-display-0018-drm-bridge-cdns-dp-Remove-link-rate-lanes-set-by-dev.patch +++ b/target/linux/layerscape/patches-5.4/805-display-0018-drm-bridge-cdns-dp-Remove-link-rate-lanes-set-by-dev.patch @@ -142,7 +142,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> msg[4] = PTS1 | PTS2 | PTS3 | PTS4; --- a/drivers/gpu/drm/rockchip/cdn-dp-core.c +++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c -@@ -305,12 +305,10 @@ static int cdn_dp_connector_mode_valid(s +@@ -306,12 +306,10 @@ static int cdn_dp_connector_mode_valid(s requested = mode->clock * bpc * 3 / 1000; source_max = dp->lanes; @@ -157,7 +157,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> actual = rate * lanes / 100; -@@ -365,21 +363,25 @@ static int cdn_dp_firmware_init(struct c +@@ -366,21 +364,25 @@ static int cdn_dp_firmware_init(struct c static int cdn_dp_get_sink_capability(struct cdn_dp_device *dp) { @@ -188,7 +188,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> return 0; } -@@ -421,7 +423,8 @@ static int cdn_dp_enable_phy(struct cdn_ +@@ -422,7 +424,8 @@ static int cdn_dp_enable_phy(struct cdn_ } port->lanes = cdn_dp_get_port_lanes(port); @@ -198,7 +198,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> if (ret) { DRM_DEV_ERROR(dev, "set host capabilities failed: %d\n", ret); -@@ -576,9 +579,9 @@ static bool cdn_dp_check_link_status(str +@@ -577,9 +580,9 @@ static bool cdn_dp_check_link_status(str { u8 link_status[DP_LINK_STATUS_SIZE]; struct cdn_dp_port *port = cdn_dp_connected_port(dp); |