diff options
author | Jasper St. Pierre <jstpierre@mecheye.net> | 2014-11-20 19:59:15 -0800 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-11-25 13:12:43 +0100 |
commit | aa54e2ee80b4f653f75b9139ae7500ee8cd5ad5f (patch) | |
tree | e73849bba9e2b569478a4cae4f8ae930ff9a8f21 /include/drm/drm_plane_helper.h | |
parent | 9c04b7e3698a2e77b3473ef91a26ecb384459a04 (diff) | |
download | blackbird-op-linux-aa54e2ee80b4f653f75b9139ae7500ee8cd5ad5f.tar.gz blackbird-op-linux-aa54e2ee80b4f653f75b9139ae7500ee8cd5ad5f.zip |
drm/atomic_helper: Cope with plane->crtc == NULL in disable helper
The drm core can call the plane disable hook multiple times, which
means it can get called when plane->crtc is already NULL. That in turn
means we can't get at the implicit acquire ctx we use in the atomic
helpers for legacy entries points.
We could try to pass drm_modeset_legacy_acquire_ctx a drm_device
pointer so that it can cope with a NULL crtc. But that still doesn't
work since the cursor ioctls (remapped with the universal cursor plane
support code) only grabs the crtc locks. So the global acquire context
isn't set eitehr.
The real solution here would be to bite the bullet and wire up
explicit acquire context parameters to all relevant functions. We need
to do that anyway (to be able to get rid of some small allocations
which we can't cope with failing). But that's a lot of work and better
done once atomic has settled a bit.
So meanwhile just catch this case in the helper and bail out.
Signed-off-by: Jasper St. Pierre <jstpierre@mecheye.net>
Reviewed-by: Rob Clark <robdclark@gmail.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
[danvet: Completely rewrite commit message and comment but keep
Jasper's logic and author credits since his patch is the only
short-term solution that works.]
Tested-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'include/drm/drm_plane_helper.h')
0 files changed, 0 insertions, 0 deletions