diff options
-rw-r--r-- | drivers/staging/imx-drm/imx-drm-core.c | 3 | ||||
-rw-r--r-- | drivers/staging/imx-drm/ipuv3-crtc.c | 5 |
2 files changed, 0 insertions, 8 deletions
diff --git a/drivers/staging/imx-drm/imx-drm-core.c b/drivers/staging/imx-drm/imx-drm-core.c index 8c433fc167c6..9854a1daf606 100644 --- a/drivers/staging/imx-drm/imx-drm-core.c +++ b/drivers/staging/imx-drm/imx-drm-core.c | |||
@@ -491,7 +491,6 @@ int imx_drm_add_crtc(struct drm_crtc *crtc, | |||
491 | { | 491 | { |
492 | struct imx_drm_device *imxdrm = __imx_drm_device(); | 492 | struct imx_drm_device *imxdrm = __imx_drm_device(); |
493 | struct imx_drm_crtc *imx_drm_crtc; | 493 | struct imx_drm_crtc *imx_drm_crtc; |
494 | const struct drm_crtc_funcs *crtc_funcs; | ||
495 | int ret; | 494 | int ret; |
496 | 495 | ||
497 | mutex_lock(&imxdrm->mutex); | 496 | mutex_lock(&imxdrm->mutex); |
@@ -512,8 +511,6 @@ int imx_drm_add_crtc(struct drm_crtc *crtc, | |||
512 | imx_drm_crtc->cookie.cookie = cookie; | 511 | imx_drm_crtc->cookie.cookie = cookie; |
513 | imx_drm_crtc->cookie.id = id; | 512 | imx_drm_crtc->cookie.id = id; |
514 | 513 | ||
515 | crtc_funcs = imx_drm_helper_funcs->crtc_funcs; | ||
516 | |||
517 | imx_drm_crtc->crtc = crtc; | 514 | imx_drm_crtc->crtc = crtc; |
518 | imx_drm_crtc->imxdrm = imxdrm; | 515 | imx_drm_crtc->imxdrm = imxdrm; |
519 | 516 | ||
diff --git a/drivers/staging/imx-drm/ipuv3-crtc.c b/drivers/staging/imx-drm/ipuv3-crtc.c index ff5c63350932..abcdaefce8e0 100644 --- a/drivers/staging/imx-drm/ipuv3-crtc.c +++ b/drivers/staging/imx-drm/ipuv3-crtc.c | |||
@@ -22,7 +22,6 @@ | |||
22 | #include <linux/device.h> | 22 | #include <linux/device.h> |
23 | #include <linux/platform_device.h> | 23 | #include <linux/platform_device.h> |
24 | #include <drm/drmP.h> | 24 | #include <drm/drmP.h> |
25 | #include <drm/drm_fb_helper.h> | ||
26 | #include <drm/drm_crtc_helper.h> | 25 | #include <drm/drm_crtc_helper.h> |
27 | #include <linux/fb.h> | 26 | #include <linux/fb.h> |
28 | #include <linux/clk.h> | 27 | #include <linux/clk.h> |
@@ -42,9 +41,6 @@ struct ipu_framebuffer { | |||
42 | }; | 41 | }; |
43 | 42 | ||
44 | struct ipu_crtc { | 43 | struct ipu_crtc { |
45 | struct drm_fb_helper fb_helper; | ||
46 | struct ipu_framebuffer ifb; | ||
47 | int num_crtcs; | ||
48 | struct device *dev; | 44 | struct device *dev; |
49 | struct drm_crtc base; | 45 | struct drm_crtc base; |
50 | struct imx_drm_crtc *imx_crtc; | 46 | struct imx_drm_crtc *imx_crtc; |
@@ -54,7 +50,6 @@ struct ipu_crtc { | |||
54 | struct dmfc_channel *dmfc; | 50 | struct dmfc_channel *dmfc; |
55 | struct ipu_di *di; | 51 | struct ipu_di *di; |
56 | int enabled; | 52 | int enabled; |
57 | struct ipu_priv *ipu_priv; | ||
58 | struct drm_pending_vblank_event *page_flip_event; | 53 | struct drm_pending_vblank_event *page_flip_event; |
59 | struct drm_framebuffer *newfb; | 54 | struct drm_framebuffer *newfb; |
60 | int irq; | 55 | int irq; |