Merge commit '6397c9ae572a61003dde39d2563c487bf12a0dc9'

* commit '6397c9ae572a61003dde39d2563c487bf12a0dc9':
  drm/rockchip: cdn-dp: support dp training outside dp firmware
  drm/rockchip: cdn-dp: Avoid drm_dp_link helpers in dp training
  FROMLIST: drm/rockchip: add transfer function for cdn-dp

Conflicts:
	drivers/gpu/drm/rockchip/cdn-dp-core.c
	drivers/gpu/drm/rockchip/cdn-dp-core.h

Ignore:
0aefe26fd9 ("FROMLIST: drm/rockchip: add transfer function for cdn-dp")
99b9c4c771 ("drm/rockchip: cdn-dp: Avoid drm_dp_link helpers in dp training")
6397c9ae57 ("drm/rockchip: cdn-dp: support dp training outside dp firmware")

Change-Id: I1c17714963639b3ea88418ddd8ad43e88327d0ec
This commit is contained in:
Tao Huang
2023-08-22 14:42:34 +08:00

Diff Content Not Available