Commit 6d124ff8 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

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: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarSinclair Yeh <syeh@vmware.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170403083304.9083-13-daniel.vetter@ffwll.ch
parent ca659e0e

drivers/gpu/drm/amd/amdgpu/dce_v10_0.c

+2 −1
Original line number Diff line number Diff line
@@ -2631,7 +2631,8 @@ static void dce_v10_0_cursor_reset(struct drm_crtc *crtc) 
}



static int dce_v10_0_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green,

				    u16 *blue, uint32_t size)

				    u16 *blue, uint32_t size,

				    struct drm_modeset_acquire_ctx *ctx)

{

	struct amdgpu_crtc *amdgpu_crtc = to_amdgpu_crtc(crtc);

	int i;

drivers/gpu/drm/amd/amdgpu/dce_v11_0.c

+2 −1
Original line number Diff line number Diff line
@@ -2651,7 +2651,8 @@ static void dce_v11_0_cursor_reset(struct drm_crtc *crtc) 
}



static int dce_v11_0_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green,

				    u16 *blue, uint32_t size)

				    u16 *blue, uint32_t size,

				    struct drm_modeset_acquire_ctx *ctx)

{

	struct amdgpu_crtc *amdgpu_crtc = to_amdgpu_crtc(crtc);

	int i;

drivers/gpu/drm/amd/amdgpu/dce_v6_0.c

+2 −1
Original line number Diff line number Diff line
@@ -1998,7 +1998,8 @@ static void dce_v6_0_cursor_reset(struct drm_crtc *crtc) 
}



static int dce_v6_0_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green,

				   u16 *blue, uint32_t size)

				   u16 *blue, uint32_t size,

				   struct drm_modeset_acquire_ctx *ctx)

{

	struct amdgpu_crtc *amdgpu_crtc = to_amdgpu_crtc(crtc);

	int i;

drivers/gpu/drm/amd/amdgpu/dce_v8_0.c

+2 −1
Original line number Diff line number Diff line
@@ -2482,7 +2482,8 @@ static void dce_v8_0_cursor_reset(struct drm_crtc *crtc) 
}



static int dce_v8_0_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green,

				   u16 *blue, uint32_t size)

				   u16 *blue, uint32_t size,

				   struct drm_modeset_acquire_ctx *ctx)

{

	struct amdgpu_crtc *amdgpu_crtc = to_amdgpu_crtc(crtc);

	int i;

drivers/gpu/drm/amd/amdgpu/dce_virtual.c

+2 −1
Original line number Diff line number Diff line
@@ -165,7 +165,8 @@ static void dce_virtual_bandwidth_update(struct amdgpu_device *adev) 
}



static int dce_virtual_crtc_gamma_set(struct drm_crtc *crtc, u16 *red,

				      u16 *green, u16 *blue, uint32_t size)

				      u16 *green, u16 *blue, uint32_t size,

				      struct drm_modeset_acquire_ctx *ctx)

{

	struct amdgpu_crtc *amdgpu_crtc = to_amdgpu_crtc(crtc);

	int i;

CRA Git | Maintained and supported by SUSTech CRA and CCSE