linux-stable.git/drivers/gpu/drm/rockchip, branch v4.7.2

drm/rockchip: allocate correct crtc state structure on reset

2016-08-20T16:11:00+00:00

commit dc0b408f5a87cce3ea3f81a6800244fb7d395435 upstream.

Because we are using a custom crtc_state structure, we must override the
reset helper to allocate the correct amount of memory.

Fixes: 4e257d9eee23 ("drm/rockchip: get rid of rockchip_drm_crtc_mode_config")
Signed-off-by: John Keeping 
Signed-off-by: Mark Yao 
Reviewed-by: Sean Paul 
Signed-off-by: Greg Kroah-Hartman

drm: Nuke ->vblank_disable_allowed

2016-05-20T21:03:31+00:00

This was added in

commit 0a3e67a4caac273a3bfc4ced3da364830b1ab241
Author: Jesse Barnes 
Date:   Tue Sep 30 12:14:26 2008 -0700

    drm: Rework vblank-wait handling to allow interrupt reduction.

to stay backwards-compatible with old UMS code that didn't even tell
the kernel when it did a modeset, so that the kernel could
save/restore vblank counters. At worst this means vblanks will be
somewhat funky on a setup that very likely no one still runs.

So let's just nuke it.

Plan B would be to set it unconditionally in drm_vblank_init for kms
drivers, instead of in each driver separately. So if this patch breaks
anything please only restore the hunks in drmP.h and drm_irq.c, plus
add a check for DRIVER_MODESET in drm_vblank_init.

Stumbled over this in a discussion on irc with Chris.

Cc: Chris Wilson 
Cc: Alex Deucher 
Cc: Liviu Dudau 
Cc: Russell King 
Cc: Thierry Reding 
Cc: Eric Anholt 
Cc: Laurent Pinchart 
Cc: Inki Dae 
Cc: Tomi Valkeinen 
Cc: Mark Yao 
Cc: Sascha Hauer 
Cc: Philipp Zabel 
Signed-off-by: Daniel Vetter 
Reviewed-by: Alex Deucher 
Acked-by: Liviu Dudau 
Acked-by: Laurent Pinchart 
Tested-by: Laurent Pinchart 
Signed-off-by: Dave Airlie

drm: Drop plane argument from __drm_atomic_helper_plane_destroy_state

2016-05-17T06:56:55+00:00

It's unused, and really this helper should only look at the state
structure and nothing else.

v2: Fix commit message (Laurent).

v3: Rebase onto mtk driver merge.

Cc: Maarten Lankhorst 
Cc: Thierry Reding 
Cc: Eric Anholt 
Cc: Laurent Pinchart 
Cc: Inki Dae 
Cc: Tomi Valkeinen 
Cc: Mark Yao 
Acked-by: Thierry Reding 
Acked-by: Maarten Lankhorst 
Acked-by: Laurent Pinchart 
Acked-by: Eric Anholt 
Signed-off-by: Daniel Vetter 
Signed-off-by: Daniel Vetter 
Link: http://patchwork.freedesktop.org/patch/msgid/1462804451-15318-2-git-send-email-daniel.vetter@ffwll.ch

drm: Drop crtc argument from __drm_atomic_helper_crtc_destroy_state

2016-05-17T06:56:41+00:00

It's unused, and really this helper should only look at the state
structure and nothing else.

v2: Rebase on top of rockchip changes

v3: Drop unrelated hunk, spotted by Laurent.

v4: Rebase onto mtk driver merge.

Cc: Maarten Lankhorst 
Cc: Thierry Reding 
Cc: Eric Anholt 
Cc: Mark Yao 
Acked-by: Thierry Reding 
Acked-by: Maarten Lankhorst 
Acked-by: Laurent Pinchart 
Acked-by: Eric Anholt 
Signed-off-by: Daniel Vetter 
Signed-off-by: Daniel Vetter 
Link: http://patchwork.freedesktop.org/patch/msgid/1462804451-15318-1-git-send-email-daniel.vetter@ffwll.ch

drm: Remove unused drm_device from drm_gem_object_lookup()

2016-05-17T06:47:30+00:00

drm_gem_object_lookup() has never required the drm_device for its file
local translation of the user handle to the GEM object. Let's remove the
unused parameter and save some space.

Signed-off-by: Chris Wilson 
Cc: dri-devel@lists.freedesktop.org
Cc: Dave Airlie 
Cc: Daniel Vetter 
[danvet: Fixup kerneldoc too.]
Signed-off-by: Daniel Vetter

Merge tag 'topic/drm-misc-2016-05-04' of git://anongit.freedesktop.org/drm-intel into drm-next

2016-05-04T23:56:30+00:00

Ofc I promise just a few leftovers for drm-misc and somehow it's the
biggest pull. But really mostly trivial stuff:
- MAINTAINERS updates from Emil
- rename async to nonblock in atomic_commit to avoid the confusion between
nonblocking ioctl and async flip (= not vblank synced), from Maarten.
Needs to be regened with newer drivers, but probably only after -rc1 to
catch them all.
- actually lockless gem_object_free, plus acked driver conversion patches.
All the trickier prep stuff already is in drm-next.
- Noralf's nice work for generic defio support in our fbdev emulation.
Keeps the udl hack, and qxl is tested by Gerd.

* tag 'topic/drm-misc-2016-05-04' of git://anongit.freedesktop.org/drm-intel: (47 commits)
drm: Fixup locking WARN_ON mistake around gem_object_free_unlocked
drm/etnaviv: Use lockless gem BO free callback
drm/imx: Use lockless gem BO free callback
drm/radeon: Use lockless gem BO free callback
drm/amdgpu: Use lockless gem BO free callback
drm/gem: support BO freeing without dev->struct_mutex
MAINTAINERS: Add myself for the new VC4 (RPi GPU) graphics driver.
MAINTAINERS: Add a bunch of legacy (UMS) DRM drivers
MAINTAINERS: Add a few DRM drivers by Dave Airlie
MAINTAINERS: List the correct git repo for the Renesas DRM drivers
MAINTAINERS: Update the files list for the Renesas DRM drivers
MAINTAINERS: Update the files list for the Armada DRM driver
MAINTAINERS: Update the files list for the Rockchip DRM driver
MAINTAINERS: Update the files list for the Exynos DRM driver
MAINTAINERS: Add maintainer entry for the VMWGFX DRM driver
MAINTAINERS: Add maintainer entry for the MSM DRM driver
MAINTAINERS: Add maintainer entry for the Nouveau DRM driver
MAINTAINERS: Update the files list for the Etnaviv DRM driver
MAINTAINERS: Remove unneded wildcard for the i915 DRM driver
drm/atomic: Add WARN_ON when state->acquire_ctx is not set.
...

drm/rockchip: vop: Initialize vskiplines to zero

2016-05-03T06:11:23+00:00

There is a path that use vskiplines with non-initialize.
That would cause vop abnormal behavior.

Signed-off-by: Mark Yao

drm/rockchip: vop: fix iommu crash with async atomic

2016-05-03T06:11:23+00:00

After async atomic_commit callback, drm_atomic_clean_old_fb will
clean all old fb, but because async, the old fb may be also on
the vop hardware, dma will access the old fb buffer, clean old
fb will cause iommu page fault.

Reference the fb and unreference it when the fb actuall swap out
from vop hardware.

Signed-off-by: Mark Yao

drm/rockchip: support non-iommu buffer path

2016-05-03T06:11:23+00:00

Some rockchip vop not support iommu, need use non-iommu
buffer for it. And if we get iommu issues, we can compare
the issues with non-iommu path, that would help the debug.

Signed-off-by: Mark Yao

drm/rockchip: get rid of rockchip_drm_crtc_mode_config

2016-05-03T06:11:23+00:00

We need to take care of the vop status when use
rockchip_drm_crtc_mode_config, if vop is disabled,
the function would failed, that is terrible.

Save output_type and output_mode into rockchip_crtc_state,
it's nice to make them into atomic.

Signed-off-by: Mark Yao 
Tested-by: John Keeping