vmwgfx part: Reviewed-by: Sinclair Yeh <syeh@xxxxxxxxxx>
On Mon, Apr 03, 2017 at 10:33:01AM +0200, Daniel Vetter wrote:
> 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@xxxxxxxxxx>
> Cc: Alex Deucher <alexander.deucher@xxxxxxx>
> Cc: Christian König <christian.koenig@xxxxxxx>
> Cc: Gerd Hoffmann <kraxel@xxxxxxxxxx>
> Cc: Ben Skeggs <bskeggs@xxxxxxxxxx>
> Cc: Sinclair Yeh <syeh@xxxxxxxxxx>
> Cc: Thomas Hellstrom <thellstrom@xxxxxxxxxx>
> Cc: Eric Anholt <eric@xxxxxxxxxx>
> Signed-off-by: Daniel Vetter <daniel.vetter@xxxxxxxxx>
> ---
> drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 3 ++-
> drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 3 ++-
> drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 3 ++-
> drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 3 ++-
> drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 3 ++-
> drivers/gpu/drm/ast/ast_mode.c | 3 ++-
> drivers/gpu/drm/cirrus/cirrus_mode.c | 3 ++-
> drivers/gpu/drm/drm_atomic_helper.c | 4 +++-
> drivers/gpu/drm/drm_color_mgmt.c | 3 ++-
> drivers/gpu/drm/drm_fb_helper.c | 3 ++-
> drivers/gpu/drm/gma500/gma_display.c | 3 ++-
> drivers/gpu/drm/gma500/gma_display.h | 3 ++-
> drivers/gpu/drm/mgag200/mgag200_mode.c | 3 ++-
> drivers/gpu/drm/nouveau/dispnv04/crtc.c | 3 ++-
> drivers/gpu/drm/nouveau/nv50_display.c | 3 ++-
> drivers/gpu/drm/radeon/radeon_display.c | 3 ++-
> drivers/gpu/drm/vc4/vc4_crtc.c | 3 ++-
> drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 3 ++-
> drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 3 ++-
> include/drm/drm_atomic_helper.h | 3 ++-
> include/drm/drm_crtc.h | 3 ++-
> 21 files changed, 43 insertions(+), 21 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
> index f525ae4e0576..daf003dd2351 100644
> --- a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
> @@ -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;
> diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
> index 3eac27f24d94..3a7296724457 100644
> --- a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
> @@ -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;
> diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
> index 838cf1a778f2..8ccada5d6f39 100644
> --- a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
> @@ -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;
> diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
> index 1b0717b11efe..6943f2641c90 100644
> --- a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
> @@ -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;
> diff --git a/drivers/gpu/drm/amd/amdgpu/dce_virtual.c b/drivers/gpu/drm/amd/amdgpu/dce_virtual.c
> index 5c51f9a97811..81a24b6b4846 100644
> --- a/drivers/gpu/drm/amd/amdgpu/dce_virtual.c
> +++ b/drivers/gpu/drm/amd/amdgpu/dce_virtual.c
> @@ -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;
> diff --git a/drivers/gpu/drm/ast/ast_mode.c b/drivers/gpu/drm/ast/ast_mode.c
> index 47b78e52691c..aaef0a652f10 100644
> --- a/drivers/gpu/drm/ast/ast_mode.c
> +++ b/drivers/gpu/drm/ast/ast_mode.c
> @@ -645,7 +645,8 @@ static void ast_crtc_reset(struct drm_crtc *crtc)
> }
>
> static int ast_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 ast_crtc *ast_crtc = to_ast_crtc(crtc);
> int i;
> diff --git a/drivers/gpu/drm/cirrus/cirrus_mode.c b/drivers/gpu/drm/cirrus/cirrus_mode.c
> index ed43ab10ac99..53f6f0f84206 100644
> --- a/drivers/gpu/drm/cirrus/cirrus_mode.c
> +++ b/drivers/gpu/drm/cirrus/cirrus_mode.c
> @@ -327,7 +327,8 @@ static void cirrus_crtc_commit(struct drm_crtc *crtc)
> * but it's a requirement that we provide the function
> */
> static int cirrus_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 cirrus_crtc *cirrus_crtc = to_cirrus_crtc(crtc);
> int i;
> diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c
> index 978dd8f49476..d5915317e7d3 100644
> --- a/drivers/gpu/drm/drm_atomic_helper.c
> +++ b/drivers/gpu/drm/drm_atomic_helper.c
> @@ -3480,6 +3480,7 @@ EXPORT_SYMBOL(drm_atomic_helper_connector_destroy_state);
> * @green: green correction table
> * @blue: green correction table
> * @size: size of the tables
> + * @ctx: lock acquire context
> *
> * Implements support for legacy gamma correction table for drivers
> * that support color management through the DEGAMMA_LUT/GAMMA_LUT
> @@ -3487,7 +3488,8 @@ EXPORT_SYMBOL(drm_atomic_helper_connector_destroy_state);
> */
> int drm_atomic_helper_legacy_gamma_set(struct drm_crtc *crtc,
> u16 *red, u16 *green, u16 *blue,
> - uint32_t size)
> + uint32_t size,
> + struct drm_modeset_acquire_ctx *ctx)
> {
> struct drm_device *dev = crtc->dev;
> struct drm_mode_config *config = &dev->mode_config;
> 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 @@ int drm_mode_gamma_set_ioctl(struct drm_device *dev,
> 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) {
> diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
> index 9147abb774e8..6dc5381e1c45 100644
> --- a/drivers/gpu/drm/drm_fb_helper.c
> +++ b/drivers/gpu/drm/drm_fb_helper.c
> @@ -256,7 +256,8 @@ static void drm_fb_helper_restore_lut_atomic(struct drm_crtc *crtc)
> g_base = r_base + crtc->gamma_size;
> b_base = g_base + crtc->gamma_size;
>
> - crtc->funcs->gamma_set(crtc, r_base, g_base, b_base, crtc->gamma_size);
> + crtc->funcs->gamma_set(crtc, r_base, g_base, b_base,
> + crtc->gamma_size, NULL);
> }
>
> /**
> diff --git a/drivers/gpu/drm/gma500/gma_display.c b/drivers/gpu/drm/gma500/gma_display.c
> index 93ff46535c04..e7fd356acf2e 100644
> --- a/drivers/gpu/drm/gma500/gma_display.c
> +++ b/drivers/gpu/drm/gma500/gma_display.c
> @@ -177,7 +177,8 @@ void gma_crtc_load_lut(struct drm_crtc *crtc)
> }
>
> int gma_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green, u16 *blue,
> - u32 size)
> + u32 size,
> + struct drm_modeset_acquire_ctx *ctx)
> {
> struct gma_crtc *gma_crtc = to_gma_crtc(crtc);
> int i;
> diff --git a/drivers/gpu/drm/gma500/gma_display.h b/drivers/gpu/drm/gma500/gma_display.h
> index 166e608923db..239c374b6169 100644
> --- a/drivers/gpu/drm/gma500/gma_display.h
> +++ b/drivers/gpu/drm/gma500/gma_display.h
> @@ -73,7 +73,8 @@ extern int gma_crtc_cursor_set(struct drm_crtc *crtc,
> extern int gma_crtc_cursor_move(struct drm_crtc *crtc, int x, int y);
> extern void gma_crtc_load_lut(struct drm_crtc *crtc);
> extern int gma_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green,
> - u16 *blue, u32 size);
> + u16 *blue, u32 size,
> + struct drm_modeset_acquire_ctx *ctx);
> extern void gma_crtc_dpms(struct drm_crtc *crtc, int mode);
> extern void gma_crtc_prepare(struct drm_crtc *crtc);
> extern void gma_crtc_commit(struct drm_crtc *crtc);
> diff --git a/drivers/gpu/drm/mgag200/mgag200_mode.c b/drivers/gpu/drm/mgag200/mgag200_mode.c
> index f2e9b2bc18a5..adb411a078e8 100644
> --- a/drivers/gpu/drm/mgag200/mgag200_mode.c
> +++ b/drivers/gpu/drm/mgag200/mgag200_mode.c
> @@ -1393,7 +1393,8 @@ static void mga_crtc_commit(struct drm_crtc *crtc)
> * but it's a requirement that we provide the function
> */
> static int mga_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 mga_crtc *mga_crtc = to_mga_crtc(crtc);
> int i;
> diff --git a/drivers/gpu/drm/nouveau/dispnv04/crtc.c b/drivers/gpu/drm/nouveau/dispnv04/crtc.c
> index 43ab560de7f9..4b4b0b496262 100644
> --- a/drivers/gpu/drm/nouveau/dispnv04/crtc.c
> +++ b/drivers/gpu/drm/nouveau/dispnv04/crtc.c
> @@ -788,7 +788,8 @@ nv_crtc_disable(struct drm_crtc *crtc)
>
> static int
> nv_crtc_gamma_set(struct drm_crtc *crtc, u16 *r, u16 *g, u16 *b,
> - uint32_t size)
> + uint32_t size,
> + struct drm_modeset_acquire_ctx *ctx)
> {
> struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);
> int i;
> diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c
> index 3d381d5c82ce..bf504788bce6 100644
> --- a/drivers/gpu/drm/nouveau/nv50_display.c
> +++ b/drivers/gpu/drm/nouveau/nv50_display.c
> @@ -2218,7 +2218,8 @@ nv50_head_help = {
>
> static int
> nv50_head_gamma_set(struct drm_crtc *crtc, u16 *r, u16 *g, u16 *b,
> - uint32_t size)
> + uint32_t size,
> + struct drm_modeset_acquire_ctx *ctx)
> {
> struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);
> u32 i;
> diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
> index 146297a702ab..981385eb5389 100644
> --- a/drivers/gpu/drm/radeon/radeon_display.c
> +++ b/drivers/gpu/drm/radeon/radeon_display.c
> @@ -232,7 +232,8 @@ void radeon_crtc_fb_gamma_get(struct drm_crtc *crtc, u16 *red, u16 *green,
> }
>
> static int radeon_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 radeon_crtc *radeon_crtc = to_radeon_crtc(crtc);
> int i;
> diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c
> index 04c390a487ba..1b4dbe9e1c6d 100644
> --- a/drivers/gpu/drm/vc4/vc4_crtc.c
> +++ b/drivers/gpu/drm/vc4/vc4_crtc.c
> @@ -300,7 +300,8 @@ vc4_crtc_lut_load(struct drm_crtc *crtc)
>
> static int
> vc4_crtc_gamma_set(struct drm_crtc *crtc, u16 *r, u16 *g, u16 *b,
> - uint32_t size)
> + uint32_t size,
> + struct drm_modeset_acquire_ctx *ctx)
> {
> struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc);
> u32 i;
> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
> index 6078654d033b..ef9f3a2a4030 100644
> --- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
> +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
> @@ -2026,7 +2026,8 @@ static int vmw_du_update_layout(struct vmw_private *dev_priv, unsigned num,
>
> int vmw_du_crtc_gamma_set(struct drm_crtc *crtc,
> u16 *r, u16 *g, u16 *b,
> - uint32_t size)
> + uint32_t size,
> + struct drm_modeset_acquire_ctx *ctx)
> {
> struct vmw_private *dev_priv = vmw_priv(crtc->dev);
> int i;
> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.h b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.h
> index 0c226b2adea5..13f2f1d2818a 100644
> --- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.h
> +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.h
> @@ -254,7 +254,8 @@ void vmw_du_crtc_save(struct drm_crtc *crtc);
> void vmw_du_crtc_restore(struct drm_crtc *crtc);
> int vmw_du_crtc_gamma_set(struct drm_crtc *crtc,
> u16 *r, u16 *g, u16 *b,
> - uint32_t size);
> + uint32_t size,
> + struct drm_modeset_acquire_ctx *ctx);
> int vmw_du_crtc_cursor_set2(struct drm_crtc *crtc, struct drm_file *file_priv,
> uint32_t handle, uint32_t width, uint32_t height,
> int32_t hot_x, int32_t hot_y);
> diff --git a/include/drm/drm_atomic_helper.h b/include/drm/drm_atomic_helper.h
> index fd395dc050ee..f0a8678ae98e 100644
> --- a/include/drm/drm_atomic_helper.h
> +++ b/include/drm/drm_atomic_helper.h
> @@ -176,7 +176,8 @@ void drm_atomic_helper_connector_destroy_state(struct drm_connector *connector,
> struct drm_connector_state *state);
> int drm_atomic_helper_legacy_gamma_set(struct drm_crtc *crtc,
> u16 *red, u16 *green, u16 *blue,
> - uint32_t size);
> + uint32_t size,
> + struct drm_modeset_acquire_ctx *ctx);
>
> /**
> * drm_atomic_crtc_for_each_plane - iterate over planes currently attached to CRTC
> diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
> index ede60d67976f..a8176a836e25 100644
> --- a/include/drm/drm_crtc.h
> +++ b/include/drm/drm_crtc.h
> @@ -322,7 +322,8 @@ struct drm_crtc_funcs {
> * hooks.
> */
> int (*gamma_set)(struct drm_crtc *crtc, u16 *r, u16 *g, u16 *b,
> - uint32_t size);
> + uint32_t size,
> + struct drm_modeset_acquire_ctx *ctx);
>
> /**
> * @destroy:
> --
> 2.11.0
>
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/dri-devel
