Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ae10c224 authored by Dave Airlie's avatar Dave Airlie
Browse files

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
parents e8b6fe69 6dbe686b

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -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

drivers/gpu/drm/rcar-du/rcar_du_crtc.c

+0 −2
Original line number Diff line number Diff line
@@ -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);

drivers/gpu/drm/rcar-du/rcar_du_drv.c

+2 −1
Original line number Diff line number Diff line
@@ -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,

drivers/gpu/drm/rcar-du/rcar_du_plane.c

+3 −0
Original line number Diff line number Diff line
@@ -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));

}