diff options
| author | Lee Jones <lee.jones@linaro.org> | 2016-06-29 12:13:44 +0300 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2016-06-29 12:13:44 +0300 |
| commit | 422e09039bbc2d488d10e9d7d02c531d0478e149 (patch) | |
| tree | 0ecb34dbdbcb4dd2fbe03f653d8d7947ebdfe638 /drivers/gpu/drm/arm/hdlcd_drv.h | |
| parent | ccc12561926c0bef9a40865db93b926a0927e93f (diff) | |
| parent | a370f60a58ec7bad7045803041524ccdc4d79c75 (diff) | |
| download | linux-422e09039bbc2d488d10e9d7d02c531d0478e149.tar.xz | |
Merge branches 'ib-mfd-regmap-4.8' and 'ib-mfd-regulator-arm-4.8' into ibs-for-mfd-merged
Diffstat (limited to 'drivers/gpu/drm/arm/hdlcd_drv.h')
| -rw-r--r-- | drivers/gpu/drm/arm/hdlcd_drv.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/gpu/drm/arm/hdlcd_drv.h b/drivers/gpu/drm/arm/hdlcd_drv.h index aa234784f053..e3950a071152 100644 --- a/drivers/gpu/drm/arm/hdlcd_drv.h +++ b/drivers/gpu/drm/arm/hdlcd_drv.h @@ -9,10 +9,9 @@ struct hdlcd_drm_private { void __iomem *mmio; struct clk *clk; struct drm_fbdev_cma *fbdev; - struct drm_framebuffer *fb; - struct list_head event_list; struct drm_crtc crtc; struct drm_plane *plane; + struct drm_atomic_state *state; #ifdef CONFIG_DEBUG_FS atomic_t buffer_underrun_count; atomic_t bus_error_count; @@ -36,7 +35,5 @@ static inline u32 hdlcd_read(struct hdlcd_drm_private *hdlcd, unsigned int reg) int hdlcd_setup_crtc(struct drm_device *dev); void hdlcd_set_scanout(struct hdlcd_drm_private *hdlcd); -void hdlcd_crtc_suspend(struct drm_crtc *crtc); -void hdlcd_crtc_resume(struct drm_crtc *crtc); #endif /* __HDLCD_DRV_H__ */ |