evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
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
This commit is contained in:
Dave Airlie 2015-03-23 09:34:32 +10:00
commit ae10c22485
4 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
MAINTAINERS
View file

@ -3378,7 +3378,6 @@ T: git git://people.freedesktop.org/~airlied/linux
S: Supported S: Supported
F: drivers/gpu/drm/rcar-du/ F: drivers/gpu/drm/rcar-du/
F: drivers/gpu/drm/shmobile/ F: drivers/gpu/drm/shmobile/
F: include/linux/platform_data/rcar-du.h
F: include/linux/platform_data/shmob_drm.h F: include/linux/platform_data/shmob_drm.h
DSBR100 USB FM RADIO DRIVER DSBR100 USB FM RADIO DRIVER

2
drivers/gpu/drm/rcar-du/rcar_du_crtc.c
View file

@ -486,8 +486,6 @@ static void rcar_du_crtc_atomic_begin(struct drm_crtc *crtc)
unsigned long flags; unsigned long flags;
if (event) { if (event) {
event->pipe = rcrtc->index;
WARN_ON(drm_crtc_vblank_get(crtc) != 0); WARN_ON(drm_crtc_vblank_get(crtc) != 0);
spin_lock_irqsave(&dev->event_lock, flags); spin_lock_irqsave(&dev->event_lock, flags);

3
drivers/gpu/drm/rcar-du/rcar_du_drv.c
View file

@ -252,7 +252,8 @@ static const struct file_operations rcar_du_fops = {
}; };
static struct drm_driver rcar_du_driver = { 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, .load = rcar_du_load,
.unload = rcar_du_unload, .unload = rcar_du_unload,
.preclose = rcar_du_preclose, .preclose = rcar_du_preclose,

3
drivers/gpu/drm/rcar-du/rcar_du_plane.c
View file

@ -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, static void rcar_du_plane_atomic_destroy_state(struct drm_plane *plane,
struct drm_plane_state *state) struct drm_plane_state *state)
{ {
if (state->fb)
drm_framebuffer_unreference(state->fb);
kfree(to_rcar_du_plane_state(state)); kfree(to_rcar_du_plane_state(state));
} }