Declare which infoframes are supported via the .hdmi_write_infoframe()
interface. Return -EOPNOTSUPP if the driver is asked to write or clear
the unsupported InfoFrame.

Reviewed-by: Liu Ying <[email protected]>
Acked-by: Daniel Stone <[email protected]>
Signed-off-by: Dmitry Baryshkov <[email protected]>
---
 drivers/gpu/drm/msm/hdmi/hdmi_bridge.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/msm/hdmi/hdmi_bridge.c 
b/drivers/gpu/drm/msm/hdmi/hdmi_bridge.c
index 
46fd58646d32fd0611192595826a3aa680bd0d02..f6ba8032904187a2f169456052b0e4cbd60ab919
 100644
--- a/drivers/gpu/drm/msm/hdmi/hdmi_bridge.c
+++ b/drivers/gpu/drm/msm/hdmi/hdmi_bridge.c
@@ -249,6 +249,7 @@ static int msm_hdmi_bridge_clear_infoframe(struct 
drm_bridge *bridge,
 
        default:
                drm_dbg_driver(hdmi_bridge->base.dev, "Unsupported infoframe 
type %x\n", type);
+               return -EOPNOTSUPP;
        }
 
        return 0;
@@ -274,7 +275,7 @@ static int msm_hdmi_bridge_write_infoframe(struct 
drm_bridge *bridge,
                return msm_hdmi_config_hdmi_infoframe(hdmi, buffer, len);
        default:
                drm_dbg_driver(hdmi_bridge->base.dev, "Unsupported infoframe 
type %x\n", type);
-               return 0;
+               return -EOPNOTSUPP;
        }
 }
 
@@ -498,6 +499,11 @@ int msm_hdmi_bridge_init(struct hdmi *hdmi)
        bridge->type = DRM_MODE_CONNECTOR_HDMIA;
        bridge->vendor = "Qualcomm";
        bridge->product = "Snapdragon";
+       bridge->supported_infoframes =
+               DRM_CONNECTOR_INFOFRAME_AVI |
+               DRM_CONNECTOR_INFOFRAME_AUDIO |
+               DRM_CONNECTOR_INFOFRAME_SPD |
+               DRM_CONNECTOR_INFOFRAME_VENDOR;
        bridge->ops = DRM_BRIDGE_OP_HPD |
                DRM_BRIDGE_OP_DETECT |
                DRM_BRIDGE_OP_HDMI |

-- 
2.47.3

Reply via email to