diff options
| author | Sean Paul <seanpaul@chromium.org> | 2018-09-27 09:54:54 +0300 |
|---|---|---|
| committer | Sean Paul <seanpaul@chromium.org> | 2018-09-27 09:54:54 +0300 |
| commit | 7b76d0588477d4b6097a9048b42835a45caf5c48 (patch) | |
| tree | fa4e0bcd49f8d17f26795224290c8f8460aa4116 /drivers/gpu/drm/omapdrm/omap_drv.h | |
| parent | a74c0aa524050e5fd6c275a153b1f37283f6e37c (diff) | |
| parent | bf78296ab1cb215d0609ac6cff4e43e941e51265 (diff) | |
| download | linux-7b76d0588477d4b6097a9048b42835a45caf5c48.tar.xz | |
Merge drm/drm-next into drm-misc-next
Backmerging 4.19-rc5 to pick up sun4i fix
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Diffstat (limited to 'drivers/gpu/drm/omapdrm/omap_drv.h')
| -rw-r--r-- | drivers/gpu/drm/omapdrm/omap_drv.h | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/drivers/gpu/drm/omapdrm/omap_drv.h b/drivers/gpu/drm/omapdrm/omap_drv.h index f27c8e216adf..bd7f2c227a25 100644 --- a/drivers/gpu/drm/omapdrm/omap_drv.h +++ b/drivers/gpu/drm/omapdrm/omap_drv.h @@ -45,6 +45,14 @@ struct omap_drm_usergart; +struct omap_drm_pipeline { + struct drm_crtc *crtc; + struct drm_encoder *encoder; + struct drm_connector *connector; + struct omap_dss_device *output; + struct omap_dss_device *display; +}; + struct omap_drm_private { struct drm_device *ddev; struct device *dev; @@ -54,18 +62,13 @@ struct omap_drm_private { struct dispc_device *dispc; const struct dispc_ops *dispc_ops; - unsigned int num_crtcs; - struct drm_crtc *crtcs[8]; + unsigned int num_pipes; + struct omap_drm_pipeline pipes[8]; + struct omap_drm_pipeline *channels[8]; unsigned int num_planes; struct drm_plane *planes[8]; - unsigned int num_encoders; - struct drm_encoder *encoders[8]; - - unsigned int num_connectors; - struct drm_connector *connectors[8]; - struct drm_fb_helper *fbdev; struct workqueue_struct *wq; |