diff options
author | Dave Airlie <airlied@redhat.com> | 2022-11-15 10:20:30 +0300 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2022-11-15 10:20:53 +0300 |
commit | 3076e09f36a58d796d7fea0c92a5011420228404 (patch) | |
tree | 2b0bdd6208924de90d4e1a5a37ad82eb8f4838aa /drivers/gpu/drm/xlnx | |
parent | c02f20d38fb90eba606277874581db124ace42c4 (diff) | |
parent | cec9e59cae6071e58140baf54e47c00aaa39851b (diff) | |
download | linux-3076e09f36a58d796d7fea0c92a5011420228404.tar.xz |
Merge tag 'drm-next-20221109' of git://linuxtv.org/pinchartl/media into drm-next
- Renesas RZ/G2L DSI support
- Renesas DU Kconfig cleanup
- Xilinx DPSUB fix
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Link: https://patchwork.freedesktop.org/patch/msgid/Y2u+mhkPJQ4de3q5@pendragon.ideasonboard.com
Diffstat (limited to 'drivers/gpu/drm/xlnx')
-rw-r--r-- | drivers/gpu/drm/xlnx/zynqmp_dp.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/gpu/drm/xlnx/zynqmp_dp.c b/drivers/gpu/drm/xlnx/zynqmp_dp.c index 7c9ae167eac7..0a7b466446fb 100644 --- a/drivers/gpu/drm/xlnx/zynqmp_dp.c +++ b/drivers/gpu/drm/xlnx/zynqmp_dp.c @@ -1362,9 +1362,10 @@ static void zynqmp_dp_bridge_detach(struct drm_bridge *bridge) zynqmp_dp_aux_cleanup(dp); } -static int zynqmp_dp_bridge_mode_valid(struct drm_bridge *bridge, - const struct drm_display_info *info, - const struct drm_display_mode *mode) +static enum drm_mode_status +zynqmp_dp_bridge_mode_valid(struct drm_bridge *bridge, + const struct drm_display_info *info, + const struct drm_display_mode *mode) { struct zynqmp_dp *dp = bridge_to_dp(bridge); int rate; |