diff options
author | Rob Clark <robdclark@gmail.com> | 2013-08-30 13:02:15 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2013-09-01 20:23:35 -0400 |
commit | a3376e3ec81c5dd0622cbc187db76d2824d31c1c (patch) | |
tree | 22e4e13c73905a624692cbfd7c7a560d79597b67 /drivers/gpu/drm/msm/msm_drv.h | |
parent | 3b336ec4c5460833ad7573d0b6e22793f6a389ab (diff) |
drm/msm: convert to drm_bridge
Drop the msm_connector base class, and special calls to base class
methods from the encoder, and use instead drm_bridge. This allows for a
cleaner division between the hdmi (and in future dsi) blocks, from the
mdp block.
Signed-off-by: Rob Clark <robdclark@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/msm/msm_drv.h')
-rw-r--r-- | drivers/gpu/drm/msm/msm_drv.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h index 34c36b2911d9..80d75094bf0a 100644 --- a/drivers/gpu/drm/msm/msm_drv.h +++ b/drivers/gpu/drm/msm/msm_drv.h | |||
@@ -83,6 +83,9 @@ struct msm_drm_private { | |||
83 | unsigned int num_encoders; | 83 | unsigned int num_encoders; |
84 | struct drm_encoder *encoders[8]; | 84 | struct drm_encoder *encoders[8]; |
85 | 85 | ||
86 | unsigned int num_bridges; | ||
87 | struct drm_bridge *bridges[8]; | ||
88 | |||
86 | unsigned int num_connectors; | 89 | unsigned int num_connectors; |
87 | struct drm_connector *connectors[8]; | 90 | struct drm_connector *connectors[8]; |
88 | }; | 91 | }; |
@@ -170,8 +173,7 @@ struct drm_framebuffer *msm_framebuffer_create(struct drm_device *dev, | |||
170 | 173 | ||
171 | struct drm_fb_helper *msm_fbdev_init(struct drm_device *dev); | 174 | struct drm_fb_helper *msm_fbdev_init(struct drm_device *dev); |
172 | 175 | ||
173 | struct drm_connector *hdmi_connector_init(struct drm_device *dev, | 176 | int hdmi_init(struct drm_device *dev, struct drm_encoder *encoder); |
174 | struct drm_encoder *encoder); | ||
175 | void __init hdmi_register(void); | 177 | void __init hdmi_register(void); |
176 | void __exit hdmi_unregister(void); | 178 | void __exit hdmi_unregister(void); |
177 | 179 | ||