Re: [PATCH v2 06/20] drm: i915: Rely on the default ->best_encoder() behavior where appropriate
On Fri, Jun 10, 2016 at 05:24:12PM +0200, Daniel Vetter wrote: > 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 > > 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? Boris pointed out on irc that this won't work for the fbdev stuff since that has a WARN_ON if theres more than 1 possible encoder. Applied this one here instead. Thanks, Daniel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch ___ Virtualization mailing list Virtualization@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Re: [PATCH v2 06/20] drm: i915: Rely on the default ->best_encoder() behavior where appropriate
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 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 >
[PATCH v2 06/20] drm: i915: Rely on the default ->best_encoder() behavior where appropriate
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 --- 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