From: Daniel Vetter <daniel@ffwll.ch>
To: Boris Brezillon <boris.brezillon@free-electrons.com>
Cc: David Airlie <airlied@linux.ie>, Daniel Vetter <daniel@ffwll.ch>,
dri-devel@lists.freedesktop.org,
Daniel Vetter <daniel.vetter@intel.com>,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
Kukjin Kim <kgene@kernel.org>,
Krzysztof Kozlowski <k.kozlowski@samsung.com>,
linux-samsung-soc@vger.kernel.org,
intel-gfx@lists.freedesktop.org,
Jani Nikula <jani.nikula@linux.intel.com>,
Alexey Brodkin <abrodkin@synopsys.com>,
Inki Dae <inki.dae@samsung.com>,
Joonyoung Shim <jy0922.shim@samsung.com>,
Seung-Woo Kim <sw0312.kim@samsung.com>,
Kyungmin Park <kyungmin.park@samsung.com>,
Stefan Agner <stefan@agner.ch>,
Alison Wang <alison.wang@freescale.com>,
Matthias Brugger <matthias.bgg@gmail.com>,
Rob Clark <robdclark@gmail.com>,
Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
Mark Yao <mark.yao@rock-chips.com>,
Heiko Stuebner <heiko@sntech.de>,
Benjamin
Subject: Re: [PATCH v2 06/20] drm: i915: Rely on the default ->best_encoder() behavior where appropriate
Date: Fri, 10 Jun 2016 17:24:12 +0200 [thread overview]
Message-ID: <20160610152412.GL3363@phenom.ffwll.local> (raw)
In-Reply-To: <1465300095-16971-7-git-send-email-boris.brezillon@free-electrons.com>
On Tue, Jun 07, 2016 at 01:48:01PM +0200, Boris Brezillon wrote:
> For all outputs except dp_mst, we have a 1:1 relationship between
> connectors and encoders and the driver is relying on the atomic helpers:
> we can drop the custom ->best_encoder() implementation and let the core
> call drm_atomic_helper_best_encoder() for us.
>
> Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
You can also drop the best_encoder from intel_dp_mst, we only need the
atomic_best_encoder. The best_encoder there was needed to help out the
fbdev emulation. Care to respin?
-Daniel
> ---
> drivers/gpu/drm/i915/intel_crt.c | 1 -
> drivers/gpu/drm/i915/intel_display.c | 8 --------
> drivers/gpu/drm/i915/intel_dp.c | 1 -
> drivers/gpu/drm/i915/intel_drv.h | 1 -
> drivers/gpu/drm/i915/intel_dsi.c | 1 -
> drivers/gpu/drm/i915/intel_dvo.c | 1 -
> drivers/gpu/drm/i915/intel_hdmi.c | 1 -
> drivers/gpu/drm/i915/intel_lvds.c | 1 -
> drivers/gpu/drm/i915/intel_sdvo.c | 1 -
> drivers/gpu/drm/i915/intel_tv.c | 1 -
> 10 files changed, 17 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c
> index 3fbb6fc..bd0cd68 100644
> --- a/drivers/gpu/drm/i915/intel_crt.c
> +++ b/drivers/gpu/drm/i915/intel_crt.c
> @@ -753,7 +753,6 @@ static const struct drm_connector_funcs intel_crt_connector_funcs = {
> static const struct drm_connector_helper_funcs intel_crt_connector_helper_funcs = {
> .mode_valid = intel_crt_mode_valid,
> .get_modes = intel_crt_get_modes,
> - .best_encoder = intel_best_encoder,
> };
>
> static const struct drm_encoder_funcs intel_crt_enc_funcs = {
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 2113f40..77026ce 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -16113,14 +16113,6 @@ void intel_modeset_cleanup(struct drm_device *dev)
> intel_teardown_gmbus(dev);
> }
>
> -/*
> - * Return which encoder is currently attached for connector.
> - */
> -struct drm_encoder *intel_best_encoder(struct drm_connector *connector)
> -{
> - return &intel_attached_encoder(connector)->base;
> -}
> -
> void intel_connector_attach_encoder(struct intel_connector *connector,
> struct intel_encoder *encoder)
> {
> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> index f192f58..21b2833 100644
> --- a/drivers/gpu/drm/i915/intel_dp.c
> +++ b/drivers/gpu/drm/i915/intel_dp.c
> @@ -4935,7 +4935,6 @@ static const struct drm_connector_funcs intel_dp_connector_funcs = {
> static const struct drm_connector_helper_funcs intel_dp_connector_helper_funcs = {
> .get_modes = intel_dp_get_modes,
> .mode_valid = intel_dp_mode_valid,
> - .best_encoder = intel_best_encoder,
> };
>
> static const struct drm_encoder_funcs intel_dp_enc_funcs = {
> diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
> index a28b4aa..79a4d6b 100644
> --- a/drivers/gpu/drm/i915/intel_drv.h
> +++ b/drivers/gpu/drm/i915/intel_drv.h
> @@ -1128,7 +1128,6 @@ struct intel_connector *intel_connector_alloc(void);
> bool intel_connector_get_hw_state(struct intel_connector *connector);
> void intel_connector_attach_encoder(struct intel_connector *connector,
> struct intel_encoder *encoder);
> -struct drm_encoder *intel_best_encoder(struct drm_connector *connector);
> struct drm_display_mode *intel_crtc_mode_get(struct drm_device *dev,
> struct drm_crtc *crtc);
> enum pipe intel_get_pipe_from_connector(struct intel_connector *connector);
> diff --git a/drivers/gpu/drm/i915/intel_dsi.c b/drivers/gpu/drm/i915/intel_dsi.c
> index 366ad6c..ec51952 100644
> --- a/drivers/gpu/drm/i915/intel_dsi.c
> +++ b/drivers/gpu/drm/i915/intel_dsi.c
> @@ -1378,7 +1378,6 @@ static const struct drm_encoder_funcs intel_dsi_funcs = {
> static const struct drm_connector_helper_funcs intel_dsi_connector_helper_funcs = {
> .get_modes = intel_dsi_get_modes,
> .mode_valid = intel_dsi_mode_valid,
> - .best_encoder = intel_best_encoder,
> };
>
> static const struct drm_connector_funcs intel_dsi_connector_funcs = {
> diff --git a/drivers/gpu/drm/i915/intel_dvo.c b/drivers/gpu/drm/i915/intel_dvo.c
> index 286baec..34b7e3f 100644
> --- a/drivers/gpu/drm/i915/intel_dvo.c
> +++ b/drivers/gpu/drm/i915/intel_dvo.c
> @@ -351,7 +351,6 @@ static const struct drm_connector_funcs intel_dvo_connector_funcs = {
> static const struct drm_connector_helper_funcs intel_dvo_connector_helper_funcs = {
> .mode_valid = intel_dvo_mode_valid,
> .get_modes = intel_dvo_get_modes,
> - .best_encoder = intel_best_encoder,
> };
>
> static void intel_dvo_enc_destroy(struct drm_encoder *encoder)
> diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
> index 2c3bd9c..aef4bc8 100644
> --- a/drivers/gpu/drm/i915/intel_hdmi.c
> +++ b/drivers/gpu/drm/i915/intel_hdmi.c
> @@ -2114,7 +2114,6 @@ static const struct drm_connector_funcs intel_hdmi_connector_funcs = {
> static const struct drm_connector_helper_funcs intel_hdmi_connector_helper_funcs = {
> .get_modes = intel_hdmi_get_modes,
> .mode_valid = intel_hdmi_mode_valid,
> - .best_encoder = intel_best_encoder,
> };
>
> static const struct drm_encoder_funcs intel_hdmi_enc_funcs = {
> diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
> index bc53c0d..d4faa5a 100644
> --- a/drivers/gpu/drm/i915/intel_lvds.c
> +++ b/drivers/gpu/drm/i915/intel_lvds.c
> @@ -547,7 +547,6 @@ static int intel_lvds_set_property(struct drm_connector *connector,
> static const struct drm_connector_helper_funcs intel_lvds_connector_helper_funcs = {
> .get_modes = intel_lvds_get_modes,
> .mode_valid = intel_lvds_mode_valid,
> - .best_encoder = intel_best_encoder,
> };
>
> static const struct drm_connector_funcs intel_lvds_connector_funcs = {
> diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
> index 2128fae..5cd48ff 100644
> --- a/drivers/gpu/drm/i915/intel_sdvo.c
> +++ b/drivers/gpu/drm/i915/intel_sdvo.c
> @@ -2191,7 +2191,6 @@ static const struct drm_connector_funcs intel_sdvo_connector_funcs = {
> static const struct drm_connector_helper_funcs intel_sdvo_connector_helper_funcs = {
> .get_modes = intel_sdvo_get_modes,
> .mode_valid = intel_sdvo_mode_valid,
> - .best_encoder = intel_best_encoder,
> };
>
> static void intel_sdvo_enc_destroy(struct drm_encoder *encoder)
> diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c
> index 223129d..47fe241 100644
> --- a/drivers/gpu/drm/i915/intel_tv.c
> +++ b/drivers/gpu/drm/i915/intel_tv.c
> @@ -1512,7 +1512,6 @@ static const struct drm_connector_funcs intel_tv_connector_funcs = {
> static const struct drm_connector_helper_funcs intel_tv_connector_helper_funcs = {
> .mode_valid = intel_tv_mode_valid,
> .get_modes = intel_tv_get_modes,
> - .best_encoder = intel_best_encoder,
> };
>
> static const struct drm_encoder_funcs intel_tv_enc_funcs = {
> --
> 2.7.4
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
next prev parent reply other threads:[~2016-06-10 15:24 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-07 11:47 [PATCH v2 00/20] drm/atomic: Provide default ->best_encoder() behavior Boris Brezillon
2016-06-07 11:47 ` [PATCH v2 01/20] drm/atomic: Fix remaining places where !funcs->best_encoder is valid Boris Brezillon
[not found] ` <1465300095-16971-2-git-send-email-boris.brezillon-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
2016-06-07 14:39 ` Daniel Vetter
2016-06-07 11:47 ` [PATCH v2 02/20] drm: arc: Rely on the default ->best_encoder() behavior Boris Brezillon
2016-06-07 11:47 ` [PATCH v2 04/20] drm: exynos: " Boris Brezillon
2016-06-07 11:48 ` [PATCH v2 05/20] drm: fsl-dcu: " Boris Brezillon
[not found] ` <1465300095-16971-1-git-send-email-boris.brezillon-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
2016-06-07 11:47 ` [PATCH v2 03/20] drm: atmel-hlcdc: " Boris Brezillon
2016-06-07 11:48 ` [PATCH v2 06/20] drm: i915: Rely on the default ->best_encoder() behavior where appropriate Boris Brezillon
2016-06-10 15:24 ` Daniel Vetter [this message]
[not found] ` <20160610152412.GL3363-dv86pmgwkMBes7Z6vYuT8azUEOm+Xw19@public.gmane.org>
2016-06-10 16:41 ` Daniel Vetter
2016-06-07 11:48 ` [PATCH v2 07/20] drm: mediatek: Rely on the default ->best_encoder() behavior Boris Brezillon
2016-06-08 11:17 ` Matthias Brugger
2016-06-07 11:48 ` [PATCH v2 08/20] drm: msm: Rely on the default ->best_encoder() behavior where appropriate Boris Brezillon
2016-06-08 10:09 ` Archit Taneja
2016-06-07 11:48 ` [PATCH v2 09/20] drm: rcar-du: Rely on the default ->best_encoder() behavior Boris Brezillon
2016-06-07 11:48 ` [PATCH v2 11/20] drm: sti: " Boris Brezillon
[not found] ` <1465300095-16971-12-git-send-email-boris.brezillon-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
2016-06-08 9:35 ` Vincent ABRIOU
2016-06-07 11:48 ` [PATCH v2 12/20] drm: sun4i: " Boris Brezillon
2016-06-07 11:48 ` [PATCH v2 13/20] drm: tegra: " Boris Brezillon
2016-06-07 11:48 ` [PATCH v2 16/20] drm: omap: " Boris Brezillon
2016-06-07 11:48 ` [PATCH v2 17/20] drm/bridge: anx78xx: " Boris Brezillon
2016-06-07 11:48 ` [PATCH v2 18/20] drm/bridge: ptn3460: " Boris Brezillon
2016-06-07 11:48 ` [PATCH v2 19/20] drm/bridge: ps8622: " Boris Brezillon
2016-06-07 11:48 ` [PATCH v2 20/20] drm/bridge: dw-hdmi: Use drm_atomic_helper_best_encoder() Boris Brezillon
2016-06-07 11:48 ` [PATCH v2 10/20] drm: rockchip: Rely on the default ->best_encoder() behavior Boris Brezillon
2016-06-07 11:48 ` [PATCH v2 14/20] drm: vc4: " Boris Brezillon
2016-06-07 11:48 ` [PATCH v2 15/20] drm: virtgpu: " Boris Brezillon
2016-06-10 15:25 ` [PATCH v2 00/20] drm/atomic: Provide " 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=20160610152412.GL3363@phenom.ffwll.local \
--to=daniel@ffwll.ch \
--cc=abrodkin@synopsys.com \
--cc=airlied@linux.ie \
--cc=alison.wang@freescale.com \
--cc=boris.brezillon@free-electrons.com \
--cc=daniel.vetter@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=heiko@sntech.de \
--cc=inki.dae@samsung.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jani.nikula@linux.intel.com \
--cc=jy0922.shim@samsung.com \
--cc=k.kozlowski@samsung.com \
--cc=kgene@kernel.org \
--cc=kyungmin.park@samsung.com \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=mark.yao@rock-chips.com \
--cc=matthias.bgg@gmail.com \
--cc=robdclark@gmail.com \
--cc=stefan@agner.ch \
--cc=sw0312.kim@samsung.com \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).