leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
977697e20b
linux/drivers/gpu/drm/vmwgfx
History
Maxime Ripard 977697e20b
drm/atomic: Pass the full state to planes atomic disable and update 
The current atomic helpers have either their object state being passed as
an argument or the full atomic state.

The former is the pattern that was done at first, before switching to the
latter for new hooks or when it was needed.

Let's convert the remaining helpers to provide a consistent interface,
this time with the planes atomic_update and atomic_disable.

The conversion was done using the coccinelle script below, built tested on
all the drivers.

@@
identifier plane, plane_state;
symbol state;
@@

 struct drm_plane_helper_funcs {
 	...
	void (*atomic_update)(struct drm_plane *plane,
-			      struct drm_plane_state *plane_state);
+			      struct drm_atomic_state *state);
 	...
 }

@@
identifier plane, plane_state;
symbol state;
@@

 struct drm_plane_helper_funcs {
	...
	void (*atomic_disable)(struct drm_plane *plane,
-			       struct drm_plane_state *plane_state);
+			       struct drm_atomic_state *state);
	...
 }

@ plane_atomic_func @
identifier helpers;
identifier func;
@@

(
 static const struct drm_plane_helper_funcs helpers = {
 	...,
 	.atomic_update = func,
	...,
 };
|
 static const struct drm_plane_helper_funcs helpers = {
 	...,
 	.atomic_disable = func,
	...,
 };
)

@@
struct drm_plane_helper_funcs *FUNCS;
identifier f;
identifier crtc_state;
identifier plane, plane_state, state;
expression e;
@@

 f(struct drm_crtc_state *crtc_state)
 {
 	...
 	struct drm_atomic_state *state = e;
 	<+...
(
-	FUNCS->atomic_disable(plane, plane_state)
+	FUNCS->atomic_disable(plane, state)
|
-	FUNCS->atomic_update(plane, plane_state)
+	FUNCS->atomic_update(plane, state)
)
 	...+>
 }

@@
identifier plane_atomic_func.func;
identifier plane;
symbol state;
@@

 func(struct drm_plane *plane,
-    struct drm_plane_state *state)
+    struct drm_plane_state *old_plane_state)
 {
	<...
-	state
+	old_plane_state
	...>
 }

@ ignores_old_state @
identifier plane_atomic_func.func;
identifier plane, old_state;
@@

 func(struct drm_plane *plane, struct drm_plane_state *old_state)
 {
	... when != old_state
 }

@ adds_old_state depends on plane_atomic_func && !ignores_old_state @
identifier plane_atomic_func.func;
identifier plane, plane_state;
@@

 func(struct drm_plane *plane, struct drm_plane_state *plane_state)
 {
+	struct drm_plane_state *plane_state = drm_atomic_get_old_plane_state(state, plane);
 	...
 }

@ depends on plane_atomic_func @
identifier plane_atomic_func.func;
identifier plane, plane_state;
@@

 func(struct drm_plane *plane,
-     struct drm_plane_state *plane_state
+     struct drm_atomic_state *state
     )
 { ... }

@ include depends on adds_old_state @
@@

 #include <drm/drm_atomic.h>

@ no_include depends on !include && adds_old_state @
@@

+ #include <drm/drm_atomic.h>
  #include <drm/...>

@@
identifier plane_atomic_func.func;
identifier plane, state;
identifier plane_state;
@@

 func(struct drm_plane *plane, struct drm_atomic_state *state) {
 	...
 	struct drm_plane_state *plane_state = drm_atomic_get_old_plane_state(state, plane);
 	<+...
-	plane_state->state
+	state
 	...+>
 }

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20210219120032.260676-9-maxime@cerno.tech
2021-02-25 08:05:28 +01:00
..
device_include drm/vmwgfx: Sync virtual device headers for new feature 2020-03-23 22:39:34 +01:00
Kconfig drm/vmwgfx: Implement an infrastructure for write-coherent resources 2019-11-06 13:04:54 +01:00
Makefile drm/ttm: move memory accounting into vmwgfx v4 2021-02-09 17:27:33 +01:00
ttm_lock.c drm/vmwgfx: Kill unneeded legacy security features 2019-08-15 08:39:27 +02:00
ttm_lock.h drm/vmwgfx: drop use of drmP.h in header files 2019-08-15 08:40:04 +02:00
ttm_memory.c drm/ttm: move memory accounting into vmwgfx v4 2021-02-09 17:27:33 +01:00
ttm_memory.h drm/ttm: move memory accounting into vmwgfx v4 2021-02-09 17:27:33 +01:00
ttm_object.c drm/vmwgfx/ttm_object: Reorder header to immediately precede its struct 2021-01-19 14:19:12 -05:00
ttm_object.h drm/ttm: move memory accounting into vmwgfx v4 2021-02-09 17:27:33 +01:00
vmwgfx_binding.c drm/vmwgfx/vmwgfx_binding: Provide some missing param descriptions and remove others 2021-01-19 14:19:07 -05:00
vmwgfx_binding.h drm/vmwgfx: Add support for streamoutput with mob commands 2020-03-23 22:39:35 +01:00
vmwgfx_blit.c drm/ttm: device naming cleanup 2021-01-21 14:51:45 +01:00
vmwgfx_bo.c drm/ttm: move memory accounting into vmwgfx v4 2021-02-09 17:27:33 +01:00
vmwgfx_cmd.c drm/vmwgfx/vmwgfx_fifo: Demote non-conformant kernel-doc header 2021-01-19 14:18:38 -05:00
vmwgfx_cmdbuf_res.c drm/vmwgfx/vmwgfx_cmdbuf_res: Remove unused variable 'ret' 2021-01-19 14:18:47 -05:00
vmwgfx_cmdbuf.c drm/vmwgfx/vmwgfx_cmdbuf: Fix misnaming of 'headers' should be plural 2021-01-19 14:19:05 -05:00
vmwgfx_context.c drm/vmwgfx/vmwgfx_context: Demote kernel-doc abuses 2021-01-19 14:18:42 -05:00
vmwgfx_cotable.c drm/vmwgfx/vmwgfx_cotable: Fix a couple of simple documentation problems 2021-01-19 14:19:06 -05:00
vmwgfx_drv.c drm/ttm: move memory accounting into vmwgfx v4 2021-02-09 17:27:33 +01:00
vmwgfx_drv.h drm/ttm: device naming cleanup 2021-01-21 14:51:45 +01:00
vmwgfx_execbuf.c drm/vmwgfx/vmwgfx_execbuf: Fix some kernel-doc related issues 2021-01-19 14:18:32 -05:00
vmwgfx_fb.c drm/vmwgfx: Cleanup the cmd/fifo split 2021-01-14 12:15:49 -05:00
vmwgfx_fence.c drm/vmwgfx/vmwgfx_fence: Add, remove and demote various documentation params/headers 2021-01-19 14:18:41 -05:00
vmwgfx_fence.h drm/vmwgfx: drop use of drmP.h in header files 2019-08-15 08:40:04 +02:00
vmwgfx_gmr.c drm/vmwgfx: Cleanup the cmd/fifo split 2021-01-14 12:15:49 -05:00
vmwgfx_gmrid_manager.c drm/ttm: cleanup BO size handling v3 2020-12-14 14:20:46 +01:00
vmwgfx_ioctl.c drm/vmwgfx/vmwgfx_ioctl: Provide missing '@' sign required by kernel-doc 2021-01-19 14:18:35 -05:00
vmwgfx_irq.c drm/vmwgfx: Remove the throttling code 2021-01-14 12:14:10 -05:00
vmwgfx_kms.c drm/atomic: Pass the full state to planes atomic disable and update 2021-02-25 08:05:28 +01:00
vmwgfx_kms.h drm/atomic: Pass the full state to planes atomic disable and update 2021-02-25 08:05:28 +01:00
vmwgfx_ldu.c drm/atomic: Pass the full state to planes atomic disable and update 2021-02-25 08:05:28 +01:00
vmwgfx_mob.c drm/vmwgfx: Make sure we unpin no longer needed buffers 2021-01-20 17:04:56 -05:00
vmwgfx_msg.c drm/vmwgfx/vmwgfx_msg: Fix misspelling of 'msg' 2021-01-19 14:19:08 -05:00
vmwgfx_msg.h drm/vmwgfx: Update the backdoor call with support for new instructions 2019-08-28 13:36:46 +02:00
vmwgfx_overlay.c drm/vmwgfx/vmwgfx_overlay: Demote kernel-doc abuses to standard comment blocks 2021-01-19 14:18:40 -05:00
vmwgfx_page_dirty.c drm/ttm: cleanup BO size handling v3 2020-12-14 14:20:46 +01:00
vmwgfx_prime.c drm/vmwgfx: Delete mmaping functions 2019-11-25 22:36:14 +01:00
vmwgfx_reg.h
vmwgfx_resource_priv.h drm/vmwgfx: Implement an infrastructure for read-coherent resources 2019-11-06 13:30:27 +01:00
vmwgfx_resource.c drm/ttm: device naming cleanup 2021-01-21 14:51:45 +01:00
vmwgfx_scrn.c drm/atomic: Pass the full state to planes atomic disable and update 2021-02-25 08:05:28 +01:00
vmwgfx_shader.c drm/vmwgfx/vmwgfx_shader: Demote kernel-doc abuses and fix-up worthy headers 2021-01-19 14:18:45 -05:00
vmwgfx_simple_resource.c
vmwgfx_so.c drm/vmwgfx/vmwgfx_so: Add description for 'vmw_view's 'rcu' member 2021-01-19 14:19:07 -05:00
vmwgfx_so.h drm/vmwgfx: Add support for streamoutput with mob commands 2020-03-23 22:39:35 +01:00
vmwgfx_stdu.c drm/atomic: Pass the full state to planes atomic disable and update 2021-02-25 08:05:28 +01:00
vmwgfx_streamoutput.c drm/vmwgfx: Cleanup the cmd/fifo split 2021-01-14 12:15:49 -05:00
vmwgfx_surface.c drm/vmwgfx/vmwgfx_surface: Fix some kernel-doc related issues 2021-01-19 14:18:44 -05:00
vmwgfx_thp.c drm/vmwgfx/vmwgfx_thp: Add description for 'vmw_thp_manager's member 'manager' 2021-01-19 14:19:11 -05:00
vmwgfx_ttm_buffer.c drm/ttm: move memory accounting into vmwgfx v4 2021-02-09 17:27:33 +01:00
vmwgfx_ttm_glue.c drm/vmwgfx: Support huge page faults 2020-03-24 18:48:55 +01:00
vmwgfx_va.c
vmwgfx_validation.c drm/vmwgfx/vmwgfx_validation: Add some missing struct member/function param descriptions 2021-01-19 14:19:10 -05:00
vmwgfx_validation.h drm/vmwgfx: Implement an infrastructure for write-coherent resources 2019-11-06 13:04:54 +01:00