diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-04-03 10:33:01 +0200 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-04-06 10:21:55 +0200 |
commit | 6d124ff845334bc466f56c059147e7ad587c2e7e (patch) | |
tree | 7b1e65482312d947f8f461924183855a5e304bfc /drivers/gpu/drm/drm_color_mgmt.c | |
parent | ca659e0e3cda69c5e8bbb7038adad30442a8ce39 (diff) | |
download | linux-stable-6d124ff845334bc466f56c059147e7ad587c2e7e.tar.gz linux-stable-6d124ff845334bc466f56c059147e7ad587c2e7e.tar.bz2 linux-stable-6d124ff845334bc466f56c059147e7ad587c2e7e.zip |
drm: Add acquire ctx to ->gamma_set hook
Atomic helpers really want this instead of the hacked-up legacy
backoff trick, which unfortunately prevents drivers from using their
own private drm_modeset_locks.
Aside: There's a few atomic drivers (nv50, vc4, soon vmwgfx) which
don't yet use the new atomic color mgmt/gamma table stuff. Would be
nice if they could switch over and just hook up
drm_atomic_helper_legacy_gamma_set() instead.
Cc: Dave Airlie <airlied@redhat.com>
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: Christian König <christian.koenig@amd.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Ben Skeggs <bskeggs@redhat.com>
Cc: Sinclair Yeh <syeh@vmware.com>
Cc: Thomas Hellstrom <thellstrom@vmware.com>
Cc: Eric Anholt <eric@anholt.net>
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Sinclair Yeh <syeh@vmware.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170403083304.9083-13-daniel.vetter@ffwll.ch
Diffstat (limited to 'drivers/gpu/drm/drm_color_mgmt.c')
-rw-r--r-- | drivers/gpu/drm/drm_color_mgmt.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_color_mgmt.c b/drivers/gpu/drm/drm_color_mgmt.c index e1b4084c3d16..b81dcb1d4cb3 100644 --- a/drivers/gpu/drm/drm_color_mgmt.c +++ b/drivers/gpu/drm/drm_color_mgmt.c @@ -261,7 +261,8 @@ retry: goto out; } - ret = crtc->funcs->gamma_set(crtc, r_base, g_base, b_base, crtc->gamma_size); + ret = crtc->funcs->gamma_set(crtc, r_base, g_base, b_base, + crtc->gamma_size, &ctx); out: if (ret == -EDEADLK) { |