From: Alexandru Gheorghe <alexandru-cosmin.gheorghe@arm.com> To: seanpaul@chromium.org, airlied@linux.ie, dri-devel@lists.freedesktop.org, liviu.dudau@arm.com, brian.starkey@arm.com, malidp@foss.arm.com, ville.syrjala@linux.intel.com, daniel@ffwll.ch, gustavo@padovan.org, maarten.lankhorst@linux.intel.com, alexander.deucher@amd.com, christian.koenig@amd.com, David1.Zhou@amd.com, harry.wentland@amd.com, andrey.grodzovsky@amd.com, Tony.Cheng@amd.com, sunpeng.li@amd.com, shirish.s@amd.com, boris.brezillon@bootlin.com, nicolas.ferre@microchip.com, alexandre.belloni@bootlin.com, inki.dae@samsung.com, jy0922.shim@samsung.com, sw0312.kim@samsung.com, kyungmin.park@samsung.com, kgene@kernel.org, krzk@kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, p.zabel@pengutronix.de, laurent.pinchart@ideasonboard.com, maxime.ripard@bootlin.com, wens@csie.org, eric@anholt.net, linux-graphics-maintainer@vmware.com, syeh@ Cc: nd@arm.com, Alexandru Gheorghe <alexandru-cosmin.gheorghe@arm.com> Subject: [PATCH v3 01/10] drm/atomic: Add __drm_atomic_helper_plane_reset Date: Sat, 4 Aug 2018 17:15:21 +0100 [thread overview] Message-ID: <20180804161530.12275-2-alexandru-cosmin.gheorghe@arm.com> (raw) In-Reply-To: <20180804161530.12275-1-alexandru-cosmin.gheorghe@arm.com> There are a lot of drivers that subclass drm_plane_state, all of them duplicate the code that links together the plane with plane_state. On top of that, drivers that enable core properties also have to duplicate the code for initializing the properties to their default values, which in all cases are the same as the defaults from core. Change since v1: - Make it consistent with the other helpers and require that both plane and state not be NULL, suggested by Boris Brezillon and Philipp Zabel. Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Alexandru Gheorghe <alexandru-cosmin.gheorghe@arm.com> --- drivers/gpu/drm/drm_atomic_helper.c | 33 +++++++++++++++++++++-------- include/drm/drm_atomic_helper.h | 2 ++ 2 files changed, 26 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index 866a2cc72ef6..6dd5036545ec 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -3552,6 +3552,28 @@ void drm_atomic_helper_crtc_destroy_state(struct drm_crtc *crtc, } EXPORT_SYMBOL(drm_atomic_helper_crtc_destroy_state); +/** + * __drm_atomic_helper_plane_reset - resets planes state to default values + * @plane: plane object, must not be NULL + * @state: atomic plane state, must not be NULL + * + * Initializes plane state to default. This is useful for drivers that subclass + * the plane state. + */ +void __drm_atomic_helper_plane_reset(struct drm_plane *plane, + struct drm_plane_state *state) +{ + state->plane = plane; + state->rotation = DRM_MODE_ROTATE_0; + + /* Reset the alpha value to fully opaque if it matters */ + if (plane->alpha_property) + state->alpha = plane->alpha_property->values[1]; + + plane->state = state; +} +EXPORT_SYMBOL(__drm_atomic_helper_plane_reset); + /** * drm_atomic_helper_plane_reset - default &drm_plane_funcs.reset hook for planes * @plane: drm plane @@ -3566,15 +3588,8 @@ void drm_atomic_helper_plane_reset(struct drm_plane *plane) kfree(plane->state); plane->state = kzalloc(sizeof(*plane->state), GFP_KERNEL); - - if (plane->state) { - plane->state->plane = plane; - plane->state->rotation = DRM_MODE_ROTATE_0; - - /* Reset the alpha value to fully opaque if it matters */ - if (plane->alpha_property) - plane->state->alpha = plane->alpha_property->values[1]; - } + if (plane->state) + __drm_atomic_helper_plane_reset(plane, plane->state); } EXPORT_SYMBOL(drm_atomic_helper_plane_reset); diff --git a/include/drm/drm_atomic_helper.h b/include/drm/drm_atomic_helper.h index 99e2a5297c69..f4c7ed876c97 100644 --- a/include/drm/drm_atomic_helper.h +++ b/include/drm/drm_atomic_helper.h @@ -156,6 +156,8 @@ void __drm_atomic_helper_crtc_destroy_state(struct drm_crtc_state *state); void drm_atomic_helper_crtc_destroy_state(struct drm_crtc *crtc, struct drm_crtc_state *state); +void __drm_atomic_helper_plane_reset(struct drm_plane *plane, + struct drm_plane_state *state); void drm_atomic_helper_plane_reset(struct drm_plane *plane); void __drm_atomic_helper_plane_duplicate_state(struct drm_plane *plane, struct drm_plane_state *state); -- 2.18.0 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
WARNING: multiple messages have this Message-ID (diff)
From: alexandru-cosmin.gheorghe@arm.com (Alexandru Gheorghe) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v3 01/10] drm/atomic: Add __drm_atomic_helper_plane_reset Date: Sat, 4 Aug 2018 17:15:21 +0100 [thread overview] Message-ID: <20180804161530.12275-2-alexandru-cosmin.gheorghe@arm.com> (raw) In-Reply-To: <20180804161530.12275-1-alexandru-cosmin.gheorghe@arm.com> There are a lot of drivers that subclass drm_plane_state, all of them duplicate the code that links together the plane with plane_state. On top of that, drivers that enable core properties also have to duplicate the code for initializing the properties to their default values, which in all cases are the same as the defaults from core. Change since v1: - Make it consistent with the other helpers and require that both plane and state not be NULL, suggested by Boris Brezillon and Philipp Zabel. Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Alexandru Gheorghe <alexandru-cosmin.gheorghe@arm.com> --- drivers/gpu/drm/drm_atomic_helper.c | 33 +++++++++++++++++++++-------- include/drm/drm_atomic_helper.h | 2 ++ 2 files changed, 26 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index 866a2cc72ef6..6dd5036545ec 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -3552,6 +3552,28 @@ void drm_atomic_helper_crtc_destroy_state(struct drm_crtc *crtc, } EXPORT_SYMBOL(drm_atomic_helper_crtc_destroy_state); +/** + * __drm_atomic_helper_plane_reset - resets planes state to default values + * @plane: plane object, must not be NULL + * @state: atomic plane state, must not be NULL + * + * Initializes plane state to default. This is useful for drivers that subclass + * the plane state. + */ +void __drm_atomic_helper_plane_reset(struct drm_plane *plane, + struct drm_plane_state *state) +{ + state->plane = plane; + state->rotation = DRM_MODE_ROTATE_0; + + /* Reset the alpha value to fully opaque if it matters */ + if (plane->alpha_property) + state->alpha = plane->alpha_property->values[1]; + + plane->state = state; +} +EXPORT_SYMBOL(__drm_atomic_helper_plane_reset); + /** * drm_atomic_helper_plane_reset - default &drm_plane_funcs.reset hook for planes * @plane: drm plane @@ -3566,15 +3588,8 @@ void drm_atomic_helper_plane_reset(struct drm_plane *plane) kfree(plane->state); plane->state = kzalloc(sizeof(*plane->state), GFP_KERNEL); - - if (plane->state) { - plane->state->plane = plane; - plane->state->rotation = DRM_MODE_ROTATE_0; - - /* Reset the alpha value to fully opaque if it matters */ - if (plane->alpha_property) - plane->state->alpha = plane->alpha_property->values[1]; - } + if (plane->state) + __drm_atomic_helper_plane_reset(plane, plane->state); } EXPORT_SYMBOL(drm_atomic_helper_plane_reset); diff --git a/include/drm/drm_atomic_helper.h b/include/drm/drm_atomic_helper.h index 99e2a5297c69..f4c7ed876c97 100644 --- a/include/drm/drm_atomic_helper.h +++ b/include/drm/drm_atomic_helper.h @@ -156,6 +156,8 @@ void __drm_atomic_helper_crtc_destroy_state(struct drm_crtc_state *state); void drm_atomic_helper_crtc_destroy_state(struct drm_crtc *crtc, struct drm_crtc_state *state); +void __drm_atomic_helper_plane_reset(struct drm_plane *plane, + struct drm_plane_state *state); void drm_atomic_helper_plane_reset(struct drm_plane *plane); void __drm_atomic_helper_plane_duplicate_state(struct drm_plane *plane, struct drm_plane_state *state); -- 2.18.0
next prev parent reply other threads:[~2018-08-04 16:15 UTC|newest] Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-08-04 16:15 [PATCH v3 00/10] Add helper for plane reset Alexandru Gheorghe 2018-08-04 16:15 ` Alexandru Gheorghe 2018-08-04 16:15 ` Alexandru Gheorghe [this message] 2018-08-04 16:15 ` [PATCH v3 01/10] drm/atomic: Add __drm_atomic_helper_plane_reset Alexandru Gheorghe 2018-08-06 6:29 ` Philipp Zabel 2018-08-06 6:29 ` Philipp Zabel 2018-08-04 16:15 ` [PATCH v3 02/10] drm/amd/display: Use __drm_atomic_helper_plane_reset instead of copying the logic Alexandru Gheorghe 2018-08-04 16:15 ` Alexandru Gheorghe 2018-08-04 16:15 ` [PATCH v3 03/10] drm: mali-dp: " Alexandru Gheorghe 2018-08-04 16:15 ` Alexandru Gheorghe 2018-08-04 16:15 ` [PATCH v3 04/10] drm: atmel-hlcdc: " Alexandru Gheorghe 2018-08-04 16:15 ` Alexandru Gheorghe 2018-08-04 16:15 ` [PATCH v3 05/10] drm/exynos: " Alexandru Gheorghe 2018-08-04 16:15 ` Alexandru Gheorghe 2018-08-04 16:15 ` [PATCH v3 06/10] drm/imx: " Alexandru Gheorghe 2018-08-04 16:15 ` Alexandru Gheorghe 2018-08-06 6:29 ` Philipp Zabel 2018-08-06 6:29 ` Philipp Zabel 2018-08-06 8:53 ` Alexandru-Cosmin Gheorghe 2018-08-06 8:53 ` Alexandru-Cosmin Gheorghe 2018-08-04 16:15 ` [PATCH v3 07/10] drm: rcar-du: " Alexandru Gheorghe 2018-08-04 16:15 ` Alexandru Gheorghe 2018-08-04 16:15 ` [PATCH v3 08/10] drm/sun4i: " Alexandru Gheorghe 2018-08-04 16:15 ` Alexandru Gheorghe 2018-08-04 16:15 ` [PATCH v3 09/10] drm/vc4: " Alexandru Gheorghe 2018-08-04 16:15 ` Alexandru Gheorghe 2018-08-06 19:58 ` Eric Anholt 2018-08-06 19:58 ` Eric Anholt 2018-08-08 18:16 ` Alexandru-Cosmin Gheorghe 2018-08-04 16:15 ` [PATCH v3 10/10] drm/vmwgfx: " Alexandru Gheorghe 2018-08-04 16:15 ` Alexandru Gheorghe 2018-08-06 16:57 ` Sinclair Yeh 2018-08-06 16:57 ` Sinclair Yeh 2018-08-07 8:03 ` Alexandru-Cosmin Gheorghe 2018-08-07 8:03 ` Alexandru-Cosmin Gheorghe 2018-08-07 13:25 ` Sinclair Yeh 2018-08-07 13:25 ` Sinclair Yeh 2018-08-06 11:07 ` [PATCH v3 00/10] Add helper for plane reset Alexandru-Cosmin Gheorghe 2018-08-06 11:07 ` Alexandru-Cosmin Gheorghe 2018-08-06 11:45 ` Laurent Pinchart 2018-08-06 11:45 ` Laurent Pinchart 2018-08-06 12:20 ` Alexandru-Cosmin Gheorghe 2018-08-06 12:20 ` Alexandru-Cosmin Gheorghe 2018-08-06 12:28 ` Laurent Pinchart 2018-08-06 12:28 ` Laurent Pinchart 2018-08-06 15:48 ` Daniel Vetter 2018-08-06 15:48 ` Daniel Vetter
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20180804161530.12275-2-alexandru-cosmin.gheorghe@arm.com \ --to=alexandru-cosmin.gheorghe@arm.com \ --cc=David1.Zhou@amd.com \ --cc=Tony.Cheng@amd.com \ --cc=airlied@linux.ie \ --cc=alexander.deucher@amd.com \ --cc=alexandre.belloni@bootlin.com \ --cc=andrey.grodzovsky@amd.com \ --cc=boris.brezillon@bootlin.com \ --cc=brian.starkey@arm.com \ --cc=christian.koenig@amd.com \ --cc=daniel@ffwll.ch \ --cc=dri-devel@lists.freedesktop.org \ --cc=eric@anholt.net \ --cc=gustavo@padovan.org \ --cc=harry.wentland@amd.com \ --cc=inki.dae@samsung.com \ --cc=jy0922.shim@samsung.com \ --cc=kgene@kernel.org \ --cc=krzk@kernel.org \ --cc=kyungmin.park@samsung.com \ --cc=laurent.pinchart@ideasonboard.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-graphics-maintainer@vmware.com \ --cc=linux-samsung-soc@vger.kernel.org \ --cc=liviu.dudau@arm.com \ --cc=maarten.lankhorst@linux.intel.com \ --cc=malidp@foss.arm.com \ --cc=maxime.ripard@bootlin.com \ --cc=nd@arm.com \ --cc=nicolas.ferre@microchip.com \ --cc=p.zabel@pengutronix.de \ --cc=seanpaul@chromium.org \ --cc=shirish.s@amd.com \ --cc=sunpeng.li@amd.com \ --cc=sw0312.kim@samsung.com \ --cc=ville.syrjala@linux.intel.com \ --cc=wens@csie.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.