Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

+5 -4
-1
MAINTAINERS
··· 3378 3378 S: Supported 3379 3379 F: drivers/gpu/drm/rcar-du/ 3380 3380 F: drivers/gpu/drm/shmobile/ 3381 - F: include/linux/platform_data/rcar-du.h 3382 3381 F: include/linux/platform_data/shmob_drm.h 3383 3382 3384 3383 DSBR100 USB FM RADIO DRIVER
-2
drivers/gpu/drm/rcar-du/rcar_du_crtc.c
··· 486 486 unsigned long flags; 487 487 488 488 if (event) { 489 - event->pipe = rcrtc->index; 490 - 491 489 WARN_ON(drm_crtc_vblank_get(crtc) != 0); 492 490 493 491 spin_lock_irqsave(&dev->event_lock, flags);
+2 -1
drivers/gpu/drm/rcar-du/rcar_du_drv.c
··· 252 252 }; 253 253 254 254 static struct drm_driver rcar_du_driver = { 255 - .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME, 255 + .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME 256 + | DRIVER_ATOMIC, 256 257 .load = rcar_du_load, 257 258 .unload = rcar_du_unload, 258 259 .preclose = rcar_du_preclose,
+3
drivers/gpu/drm/rcar-du/rcar_du_plane.c
··· 316 316 static void rcar_du_plane_atomic_destroy_state(struct drm_plane *plane, 317 317 struct drm_plane_state *state) 318 318 { 319 + if (state->fb) 320 + drm_framebuffer_unreference(state->fb); 321 + 319 322 kfree(to_rcar_du_plane_state(state)); 320 323 } 321 324