Merge branch 'drm/next/rcar-du' of git://linuxtv.org/pinchartl/fbdev into drm-next

rcar-du fixes

* 'drm/next/rcar-du' of git://linuxtv.org/pinchartl/fbdev:
  drm: rcar-du: Enable the atomic updates API
  drm: rcar-du: Don't initialize event->pipe field
  drm: rcar-du: Fix framebuffer reference leak through plane state
  MAINTAINERS: Remove rcar-du.h entry

4 files changed, 5 insertions, 4 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 6239a305dff0..ab44a48d53bb 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3378,7 +3378,6 @@ T:	git git://people.freedesktop.org/~airlied/linux
 S:      Supported
 F:      drivers/gpu/drm/rcar-du/
 F:      drivers/gpu/drm/shmobile/
-F:      include/linux/platform_data/rcar-du.h
 F:      include/linux/platform_data/shmob_drm.h
 
 DSBR100 USB FM RADIO DRIVER
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c
index 9e72133bb64b..7d0b8ef9bea2 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c
@@ -486,8 +486,6 @@ static void rcar_du_crtc_atomic_begin(struct drm_crtc *crtc)
         unsigned long flags;
 
         if (event) {
-                event->pipe = rcrtc->index;
-
                 WARN_ON(drm_crtc_vblank_get(crtc) != 0);
 
                 spin_lock_irqsave(&dev->event_lock, flags);
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_drv.c b/drivers/gpu/drm/rcar-du/rcar_du_drv.c
index 1d9e4f8568ae..da1216a73969 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_drv.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_drv.c
@@ -252,7 +252,8 @@ static const struct file_operations rcar_du_fops = {
 };
 
 static struct drm_driver rcar_du_driver = {
-        .driver_features        = DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME,
+        .driver_features        = DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME
+                                | DRIVER_ATOMIC,
         .load                   = rcar_du_load,
         .unload                 = rcar_du_unload,
         .preclose               = rcar_du_preclose,
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_plane.c b/drivers/gpu/drm/rcar-du/rcar_du_plane.c
index 35a2f04ab799..210e5c3fd982 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_plane.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_plane.c
@@ -316,6 +316,9 @@ rcar_du_plane_atomic_duplicate_state(struct drm_plane *plane)
 static void rcar_du_plane_atomic_destroy_state(struct drm_plane *plane,
                                                struct drm_plane_state *state)
 {
+        if (state->fb)
+                drm_framebuffer_unreference(state->fb);
+
         kfree(to_rcar_du_plane_state(state));
 }