diff options
Diffstat (limited to 'drivers/gpu/drm/sti/sti_hdmi.h')
| -rw-r--r-- | drivers/gpu/drm/sti/sti_hdmi.h | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/drivers/gpu/drm/sti/sti_hdmi.h b/drivers/gpu/drm/sti/sti_hdmi.h index 63a24941db3b..91d43dd46f13 100644 --- a/drivers/gpu/drm/sti/sti_hdmi.h +++ b/drivers/gpu/drm/sti/sti_hdmi.h @@ -10,9 +10,12 @@ #include <linux/hdmi.h> #include <linux/platform_device.h> -#include <drm/drmP.h> #include <media/cec-notifier.h> +#include <drm/drm_bridge.h> +#include <drm/drm_modes.h> +#include <drm/drm_property.h> + #define HDMI_STA 0x0010 #define HDMI_STA_DLL_LCK BIT(5) #define HDMI_STA_HOT_PLUG BIT(4) @@ -31,12 +34,6 @@ struct hdmi_audio_params { struct hdmi_audio_infoframe cea; }; -static const struct drm_prop_enum_list colorspace_mode_names[] = { - { HDMI_COLORSPACE_RGB, "rgb" }, - { HDMI_COLORSPACE_YUV422, "yuv422" }, - { HDMI_COLORSPACE_YUV444, "yuv444" }, -}; - #define DEFAULT_COLORSPACE_MODE HDMI_COLORSPACE_RGB /** @@ -61,7 +58,6 @@ static const struct drm_prop_enum_list colorspace_mode_names[] = { * @reset: reset control of the hdmi phy * @ddc_adapt: i2c ddc adapter * @colorspace: current colorspace selected - * @hdmi_monitor: true if HDMI monitor detected else DVI monitor assumed * @audio_pdev: ASoC hdmi-codec platform device * @audio: hdmi audio parameters. * @drm_connector: hdmi connector @@ -87,11 +83,11 @@ struct sti_hdmi { struct reset_control *reset; struct i2c_adapter *ddc_adapt; enum hdmi_colorspace colorspace; - bool hdmi_monitor; struct platform_device *audio_pdev; struct hdmi_audio_params audio; struct drm_connector *drm_connector; struct cec_notifier *notifier; + struct drm_bridge bridge; }; u32 hdmi_read(struct sti_hdmi *hdmi, int offset); |