diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2024-01-15 09:38:05 +0200 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2024-01-15 09:38:05 +0200 |
| commit | 0ea5c948cb64bab5bc7a5516774eb8536f05aa0d (patch) | |
| tree | 8437ec451643a0fa3e7e8f3cab5c851dcb5a9c4b /include/drm/display/drm_dp_helper.h | |
| parent | 78d49aaa36bd9b736bbd4b2944935e6714c4bfe6 (diff) | |
| parent | 205e18c13545ab43cc4fe4930732b4feef551198 (diff) | |
| download | linux-0ea5c948cb64bab5bc7a5516774eb8536f05aa0d.tar.gz linux-0ea5c948cb64bab5bc7a5516774eb8536f05aa0d.tar.bz2 linux-0ea5c948cb64bab5bc7a5516774eb8536f05aa0d.zip | |
Merge drm/drm-next into drm-intel-next
Backmerge to bring Xe driver to drm-intel-next.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'include/drm/display/drm_dp_helper.h')
| -rw-r--r-- | include/drm/display/drm_dp_helper.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/drm/display/drm_dp_helper.h b/include/drm/display/drm_dp_helper.h index b88cc53425e0..863b2e7add29 100644 --- a/include/drm/display/drm_dp_helper.h +++ b/include/drm/display/drm_dp_helper.h @@ -286,8 +286,8 @@ struct drm_dp_aux_msg { }; struct cec_adapter; -struct edid; struct drm_connector; +struct drm_edid; /** * struct drm_dp_aux_cec - DisplayPort CEC-Tunneling-over-AUX @@ -521,18 +521,18 @@ bool drm_dp_downstream_is_type(const u8 dpcd[DP_RECEIVER_CAP_SIZE], const u8 port_cap[4], u8 type); bool drm_dp_downstream_is_tmds(const u8 dpcd[DP_RECEIVER_CAP_SIZE], const u8 port_cap[4], - const struct edid *edid); + const struct drm_edid *drm_edid); int drm_dp_downstream_max_dotclock(const u8 dpcd[DP_RECEIVER_CAP_SIZE], const u8 port_cap[4]); int drm_dp_downstream_max_tmds_clock(const u8 dpcd[DP_RECEIVER_CAP_SIZE], const u8 port_cap[4], - const struct edid *edid); + const struct drm_edid *drm_edid); int drm_dp_downstream_min_tmds_clock(const u8 dpcd[DP_RECEIVER_CAP_SIZE], const u8 port_cap[4], - const struct edid *edid); + const struct drm_edid *drm_edid); int drm_dp_downstream_max_bpc(const u8 dpcd[DP_RECEIVER_CAP_SIZE], const u8 port_cap[4], - const struct edid *edid); + const struct drm_edid *drm_edid); bool drm_dp_downstream_420_passthrough(const u8 dpcd[DP_RECEIVER_CAP_SIZE], const u8 port_cap[4]); bool drm_dp_downstream_444_to_420_conversion(const u8 dpcd[DP_RECEIVER_CAP_SIZE], @@ -544,7 +544,7 @@ int drm_dp_downstream_id(struct drm_dp_aux *aux, char id[6]); void drm_dp_downstream_debug(struct seq_file *m, const u8 dpcd[DP_RECEIVER_CAP_SIZE], const u8 port_cap[4], - const struct edid *edid, + const struct drm_edid *drm_edid, struct drm_dp_aux *aux); enum drm_mode_subconnector drm_dp_subconnector_type(const u8 dpcd[DP_RECEIVER_CAP_SIZE], |