drm: Pass crtc to .best_encoder()
Subsystems (19)
PATCH 1/1 drm: Pass crtc to .best_encoder()
From: Ville Syrjälä <[email protected]>
To pick the correct MST encoder i915 wants to know which crtc is going to be feeding us. To that end let's pass the crtc to the .best_encoder() hook. The atomic variant already knows the crtc via the connector state, but the non-atomic hooks is still being used by the fb_helper even on atomic drivers.
This allows us to fix up the possible_crtcs bitmask for the i915 MST encoders. We have one encoder for each crtc+port combination, and thus we have to know both the connector and the crtc to pick the right one. This has only worked so far because every MST encoder lied in its possible_crtcs bitmask that they can be driven by any crtc.
I took the easy way out and passed NULL as the crtc for all the driver internal uses of .best_encoder() in the amdgpu/radeon drivers. None of the other drivers have such internal uses. The other callers (crtc_helper, atomic_helper, fb_helper) will pass in the proper crtc. but no one besides i915 will currently look at it.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 33 +++++++++-------- drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 3 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 7 ++-- .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 5 +-- drivers/gpu/drm/ast/ast_mode.c | 3 +- drivers/gpu/drm/bochs/bochs_kms.c | 3 +- drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 3 +- drivers/gpu/drm/bridge/tc358767.c | 3 +- drivers/gpu/drm/cirrus/cirrus_mode.c | 5 +-- drivers/gpu/drm/drm_atomic_helper.c | 16 ++++++--- drivers/gpu/drm/drm_crtc_helper.c | 3 +- drivers/gpu/drm/drm_fb_helper.c | 41 ++++++++++++---------- drivers/gpu/drm/gma500/gma_display.c | 3 +- drivers/gpu/drm/gma500/mdfld_dsi_output.c | 5 +-- drivers/gpu/drm/gma500/psb_intel_drv.h | 3 +- drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c | 3 +- drivers/gpu/drm/i2c/tda998x_drv.c | 3 +- drivers/gpu/drm/i915/intel_dp_mst.c | 9 +++-- drivers/gpu/drm/imx/imx-ldb.c | 5 +-- drivers/gpu/drm/imx/imx-tve.c | 5 +-- drivers/gpu/drm/imx/parallel-display.c | 5 +-- drivers/gpu/drm/mediatek/mtk_hdmi.c | 3 +- drivers/gpu/drm/mgag200/mgag200_mode.c | 5 +-- drivers/gpu/drm/msm/dsi/dsi_manager.c | 3 +- drivers/gpu/drm/nouveau/dispnv50/disp.c | 3 +- drivers/gpu/drm/nouveau/nouveau_connector.c | 3 +- drivers/gpu/drm/qxl/qxl_display.c | 3 +- drivers/gpu/drm/radeon/radeon_connectors.c | 40 +++++++++++---------- drivers/gpu/drm/radeon/radeon_dp_mst.c | 5 +-- drivers/gpu/drm/shmobile/shmob_drm_crtc.c | 3 +- drivers/gpu/drm/tilcdc/tilcdc_panel.c | 5 +-- drivers/gpu/drm/tilcdc/tilcdc_tfp410.c | 5 +-- drivers/gpu/drm/udl/udl_connector.c | 3 +- drivers/staging/vboxvideo/vbox_mode.c | 5 +-- include/drm/drm_atomic_helper.h | 3 +- include/drm/drm_modeset_helper_vtables.h | 6 ++-- 36 files changed, 155 insertions(+), 106 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c +18 -15
@@ -135,7 +135,8 @@ int amdgpu_connector_get_monitor_bpc(struct drm_connector *connector)else {const struct drm_connector_helper_funcs *connector_funcs = connector->helper_private; -struct drm_encoder *encoder = connector_funcs->best_encoder (connector); +struct drm_encoder *encoder = connector_funcs->best_encoder (connector, +NULL );struct amdgpu_encoder *amdgpu_encoder =to_amdgpu_encoder (encoder);struct amdgpu_encoder_atom_dig *dig = amdgpu_encoder->enc_priv;
@@ -218,7 +219,7 @@ amdgpu_connector_update_scratch_regs(struct drm_connector *connector,bool connected;int i; - best_encoder = connector_funcs->best_encoder (connector); + best_encoder = connector_funcs->best_encoder (connector,NULL );for (i =0 ; i <DRM_CONNECTOR_MAX_ENCODER ; i++) {if (connector->encoder_ids[i] ==0 )
@@ -358,7 +359,8 @@ static int amdgpu_connector_ddc_get_modes(struct drm_connector *connector) }static struct drm_encoder * -amdgpu_connector_best_single_encoder (struct drm_connector *connector) +amdgpu_connector_best_single_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {int enc_id = connector->encoder_ids[0 ];
@@ -370,7 +372,7 @@ amdgpu_connector_best_single_encoder(struct drm_connector *connector)static void amdgpu_get_native_mode (struct drm_connector *connector) { -struct drm_encoder *encoder =amdgpu_connector_best_single_encoder (connector); +struct drm_encoder *encoder =amdgpu_connector_best_single_encoder (connector,NULL );struct amdgpu_encoder *amdgpu_encoder;if (encoder ==NULL )
@@ -593,7 +595,7 @@ static int amdgpu_connector_set_property(struct drm_connector *connector, amdgpu_encoder =to_amdgpu_encoder (connector->encoder); }else {const struct drm_connector_helper_funcs *connector_funcs = connector->helper_private; - amdgpu_encoder =to_amdgpu_encoder (connector_funcs->best_encoder (connector)); + amdgpu_encoder =to_amdgpu_encoder (connector_funcs->best_encoder (connector,NULL )); }switch (val) {
@@ -663,7 +665,7 @@ static int amdgpu_connector_lvds_get_modes(struct drm_connector *connector)amdgpu_connector_get_edid (connector); ret =amdgpu_connector_ddc_get_modes (connector);if (ret >0 ) { - encoder =amdgpu_connector_best_single_encoder (connector); + encoder =amdgpu_connector_best_single_encoder (connector,NULL );if (encoder) {amdgpu_connector_fixup_lcd_native_mode (encoder, connector);/* add scaled modes */
@@ -672,7 +674,7 @@ static int amdgpu_connector_lvds_get_modes(struct drm_connector *connector)return ret; } - encoder =amdgpu_connector_best_single_encoder (connector); + encoder =amdgpu_connector_best_single_encoder (connector,NULL );if (!encoder)return 0 ;
@@ -694,7 +696,7 @@ static int amdgpu_connector_lvds_get_modes(struct drm_connector *connector)static enum drm_mode_status amdgpu_connector_lvds_mode_valid (struct drm_connector *connector,struct drm_display_mode *mode) { -struct drm_encoder *encoder =amdgpu_connector_best_single_encoder (connector); +struct drm_encoder *encoder =amdgpu_connector_best_single_encoder (connector,NULL );if ((mode->hdisplay <320 ) || (mode->vdisplay <240 ))return MODE_PANEL ;
@@ -725,7 +727,7 @@ static enum drm_connector_status amdgpu_connector_lvds_detect(struct drm_connector *connector, bool force) {struct amdgpu_connector *amdgpu_connector =to_amdgpu_connector (connector); -struct drm_encoder *encoder =amdgpu_connector_best_single_encoder (connector); +struct drm_encoder *encoder =amdgpu_connector_best_single_encoder (connector,NULL );enum drm_connector_status ret = connector_status_disconnected;int r;
@@ -798,7 +800,7 @@ static int amdgpu_connector_set_lcd_property(struct drm_connector *connector, amdgpu_encoder =to_amdgpu_encoder (connector->encoder); else {const struct drm_connector_helper_funcs *connector_funcs = connector->helper_private; - amdgpu_encoder =to_amdgpu_encoder (connector_funcs->best_encoder (connector)); + amdgpu_encoder =to_amdgpu_encoder (connector_funcs->best_encoder (connector,NULL )); }switch (value) {
@@ -873,7 +875,7 @@ amdgpu_connector_vga_detect(struct drm_connector *connector, bool force)return connector_status_disconnected; } - encoder =amdgpu_connector_best_single_encoder (connector); + encoder =amdgpu_connector_best_single_encoder (connector,NULL );if (!encoder) ret = connector_status_disconnected;
@@ -1130,7 +1132,8 @@ amdgpu_connector_dvi_detect(struct drm_connector *connector, bool force)/* okay need to be smart in here about which encoder to pick */ static struct drm_encoder * -amdgpu_connector_dvi_encoder (struct drm_connector *connector) +amdgpu_connector_dvi_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {int enc_id = connector->encoder_ids[0 ];struct amdgpu_connector *amdgpu_connector =to_amdgpu_connector (connector);
@@ -1224,7 +1227,7 @@ static int amdgpu_connector_dp_get_modes(struct drm_connector *connector) {struct amdgpu_connector *amdgpu_connector =to_amdgpu_connector (connector);struct amdgpu_connector_atom_dig *amdgpu_dig_connector = amdgpu_connector->con_priv; -struct drm_encoder *encoder =amdgpu_connector_best_single_encoder (connector); +struct drm_encoder *encoder =amdgpu_connector_best_single_encoder (connector,NULL );int ret; if ((connector->connector_type == DRM_MODE_CONNECTOR_eDP) ||
@@ -1363,7 +1366,7 @@ amdgpu_connector_dp_detect(struct drm_connector *connector, bool force)struct amdgpu_connector *amdgpu_connector =to_amdgpu_connector (connector);enum drm_connector_status ret = connector_status_disconnected;struct amdgpu_connector_atom_dig *amdgpu_dig_connector = amdgpu_connector->con_priv; -struct drm_encoder *encoder =amdgpu_connector_best_single_encoder (connector); +struct drm_encoder *encoder =amdgpu_connector_best_single_encoder (connector,NULL );int r;if (!drm_kms_helper_is_poll_worker ()) {
@@ -1458,7 +1461,7 @@ static enum drm_mode_status amdgpu_connector_dp_mode_valid(struct drm_connectorif ((connector->connector_type == DRM_MODE_CONNECTOR_eDP) || (connector->connector_type ==DRM_MODE_CONNECTOR_LVDS )) { -struct drm_encoder *encoder =amdgpu_connector_best_single_encoder (connector); +struct drm_encoder *encoder =amdgpu_connector_best_single_encoder (connector,NULL );if ((mode->hdisplay <320 ) || (mode->vdisplay <240 ))return MODE_PANEL ;
drivers/gpu/drm/amd/amdgpu/dce_virtual.c +2 -1
@@ -267,7 +267,8 @@ static int dce_virtual_early_init(void *handle) }static struct drm_encoder * -dce_virtual_encoder (struct drm_connector *connector) +dce_virtual_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {int enc_id = connector->encoder_ids[0 ];struct drm_encoder *encoder;
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +4 -3
@@ -2758,7 +2758,8 @@ static const struct drm_connector_funcs amdgpu_dm_connector_funcs = { .atomic_get_property = amdgpu_dm_connector_atomic_get_property }; -static struct drm_encoder *best_encoder (struct drm_connector *connector) +static struct drm_encoder *best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {int enc_id = connector->encoder_ids[0 ];struct drm_mode_object *obj;
@@ -3304,7 +3305,7 @@ static void amdgpu_dm_get_native_mode(struct drm_connector *connector)struct drm_encoder *encoder;struct amdgpu_encoder *amdgpu_encoder; - encoder = helper->best_encoder (connector); + encoder = helper->best_encoder (connector,NULL );if (encoder ==NULL )return ;
@@ -3438,7 +3439,7 @@ static int amdgpu_dm_connector_get_modes(struct drm_connector *connector)struct drm_encoder *encoder;struct edid *edid = amdgpu_dm_connector->edid; - encoder = helper->best_encoder (connector); + encoder = helper->best_encoder (connector,NULL );amdgpu_dm_connector_ddc_get_modes (connector, edid);amdgpu_dm_connector_add_common_modes (encoder, connector);
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +3 -2
@@ -269,7 +269,8 @@ static int dm_dp_mst_get_modes(struct drm_connector *connector)return ret; } -static struct drm_encoder *dm_mst_best_encoder (struct drm_connector *connector) +static struct drm_encoder *dm_mst_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {struct amdgpu_dm_connector *amdgpu_dm_connector =to_amdgpu_dm_connector (connector);
@@ -302,7 +303,7 @@ dm_dp_create_fake_mst_encoder(struct amdgpu_dm_connector *connector)const struct drm_connector_helper_funcs *connector_funcs = connector->base.helper_private;struct drm_encoder *enc_master = - connector_funcs->best_encoder (&connector->base); + connector_funcs->best_encoder (&connector->base,NULL );DRM_DEBUG_KMS ("enc master is %p\n" , enc_master); amdgpu_encoder =kzalloc (sizeof (*amdgpu_encoder),GFP_KERNEL );
drivers/gpu/drm/ast/ast_mode.c +2 -1
@@ -709,7 +709,8 @@ static void ast_encoder_destroy(struct drm_encoder *encoder) } -static struct drm_encoder *ast_best_single_encoder (struct drm_connector *connector) +static struct drm_encoder *ast_best_single_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {int enc_id = connector->encoder_ids[0 ];/* pick the encoder ids */
drivers/gpu/drm/bochs/bochs_kms.c +2 -1
@@ -208,7 +208,8 @@ static enum drm_mode_status bochs_connector_mode_valid(struct drm_connector *con }static struct drm_encoder * -bochs_connector_best_encoder (struct drm_connector *connector) +bochs_connector_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {int enc_id = connector->encoder_ids[0 ];/* pick the encoder ids */
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c +2 -1
@@ -1137,7 +1137,8 @@ static int analogix_dp_get_modes(struct drm_connector *connector) }static struct drm_encoder * -analogix_dp_best_encoder (struct drm_connector *connector) +analogix_dp_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {struct analogix_dp_device *dp =to_dp (connector);
drivers/gpu/drm/bridge/tc358767.c +2 -1
@@ -1155,7 +1155,8 @@ static void tc_connector_set_polling(struct tc_data *tc, }static struct drm_encoder * -tc_connector_best_encoder (struct drm_connector *connector) +tc_connector_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {struct tc_data *tc =connector_to_tc (connector);
drivers/gpu/drm/cirrus/cirrus_mode.c +3 -2
@@ -451,8 +451,9 @@ static int cirrus_vga_get_modes(struct drm_connector *connector)return count; } -static struct drm_encoder *cirrus_connector_best_encoder (struct drm_connector - *connector) +static struct drm_encoder * +cirrus_connector_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {int enc_id = connector->encoder_ids[0 ];/* pick the encoder ids */
drivers/gpu/drm/drm_atomic_helper.c +11 -5
@@ -115,9 +115,11 @@ static int handle_conflicting_encoders(struct drm_atomic_state *state,if (funcs->atomic_best_encoder) new_encoder = funcs->atomic_best_encoder (connector, new_conn_state);else if (funcs->best_encoder) - new_encoder = funcs->best_encoder (connector); + new_encoder = funcs->best_encoder (connector, + new_conn_state->crtc);else - new_encoder =drm_atomic_helper_best_encoder (connector); + new_encoder =drm_atomic_helper_best_encoder (connector, + new_conn_state->crtc);if (new_encoder) {if (encoder_mask & (1 <<drm_encoder_index (new_encoder))) {
@@ -312,9 +314,11 @@ update_connector_routing(struct drm_atomic_state *state, new_encoder = funcs->atomic_best_encoder (connector, new_connector_state); else if (funcs->best_encoder) - new_encoder = funcs->best_encoder (connector); + new_encoder = funcs->best_encoder (connector, + new_connector_state->crtc); else - new_encoder =drm_atomic_helper_best_encoder (connector); + new_encoder =drm_atomic_helper_best_encoder (connector, + new_connector_state->crtc);if (!new_encoder) { DRM_DEBUG_ATOMIC("No suitable encoder found for [CONNECTOR:%d:%s]\n",
@@ -3318,13 +3322,15 @@ EXPORT_SYMBOL(drm_atomic_helper_page_flip_target);* drm_atomic_helper_best_encoder - Helper for * &drm_connector_helper_funcs.best_encoder callback * @connector: Connector control structure +* @crtc: DRM crtc * * This is a &drm_connector_helper_funcs.best_encoder callback helper for * connectors that support exactly 1 encoder, statically determined at driver * init time. */ struct drm_encoder * -drm_atomic_helper_best_encoder (struct drm_connector *connector) +drm_atomic_helper_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {WARN_ON (connector->encoder_ids[1 ]);return drm_encoder_find (connector->dev,NULL , connector->encoder_ids[0 ]);
drivers/gpu/drm/drm_crtc_helper.c +2 -1
@@ -637,7 +637,8 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set, new_encoder = connector->encoder;for (ro =0 ; ro < set->num_connectors; ro++) {if (set->connectors[ro] == connector) { - new_encoder = connector_funcs->best_encoder (connector); + new_encoder = connector_funcs->best_encoder (connector, + set->crtc);/* if we can't get an encoder for a connector we are setting now - then fail */ if (new_encoder ==NULL )
drivers/gpu/drm/drm_fb_helper.c +22 -19
66 lines not on this page · raw message
drivers/gpu/drm/gma500/gma_display.c +2 -1
@@ -652,7 +652,8 @@ void gma_encoder_destroy(struct drm_encoder *encoder) }/* Currently there is only a 1:1 mapping of encoders and connectors */ -struct drm_encoder *gma_best_encoder (struct drm_connector *connector) +struct drm_encoder *gma_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {struct gma_encoder *gma_encoder =gma_attached_encoder (connector);
drivers/gpu/drm/gma500/mdfld_dsi_output.c +3 -2
@@ -377,8 +377,9 @@ static enum drm_mode_status mdfld_dsi_connector_mode_valid(struct drm_connectorreturn MODE_OK ; } -static struct drm_encoder *mdfld_dsi_connector_best_encoder ( -struct drm_connector *connector) +static struct drm_encoder * +mdfld_dsi_connector_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {struct mdfld_dsi_connector *dsi_connector =mdfld_dsi_connector (connector);
drivers/gpu/drm/gma500/psb_intel_drv.h +2 -1
@@ -230,7 +230,8 @@ extern void oaktrail_lvds_i2c_init(struct drm_encoder *encoder);extern void mid_dsi_init (struct drm_device *dev,struct psb_intel_mode_device *mode_dev,int dsi_num); -extern struct drm_encoder *gma_best_encoder (struct drm_connector *connector); +extern struct drm_encoder *gma_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc);extern void gma_connector_attach_encoder (struct gma_connector *connector,struct gma_encoder *encoder);
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c +2 -1
@@ -34,7 +34,8 @@ static enum drm_mode_status hibmc_connector_mode_valid(struct drm_connector *con }static struct drm_encoder * -hibmc_connector_best_encoder (struct drm_connector *connector) +hibmc_connector_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {return drm_encoder_find (connector->dev,NULL , connector->encoder_ids[0 ]); }
drivers/gpu/drm/i2c/tda998x_drv.c +2 -1
@@ -1267,7 +1267,8 @@ static enum drm_mode_status tda998x_connector_mode_valid(struct drm_connector *c }static struct drm_encoder * -tda998x_connector_best_encoder (struct drm_connector *connector) +tda998x_connector_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {struct tda998x_priv *priv =conn_to_tda998x_priv (connector);
drivers/gpu/drm/i915/intel_dp_mst.c +6 -3
@@ -403,20 +403,23 @@ static struct drm_encoder *intel_mst_atomic_best_encoder(struct drm_connector *creturn &intel_dp->mst_encoders[crtc->pipe]->base.base; } -static struct drm_encoder *intel_mst_best_encoder (struct drm_connector *connector) +static struct drm_encoder *intel_mst_best_encoder (struct drm_connector *connector, +struct drm_crtc *_crtc) {struct intel_connector *intel_connector =to_intel_connector (connector);struct intel_dp *intel_dp = intel_connector->mst_port; +struct intel_crtc *crtc =to_intel_crtc (_crtc); +if (!intel_dp)return NULL ; -return &intel_dp->mst_encoders[0 ]->base.base; +return &intel_dp->mst_encoders[crtc->pipe]->base.base; }static const struct drm_connector_helper_funcs intel_dp_mst_connector_helper_funcs = { .get_modes = intel_dp_mst_get_modes, .mode_valid = intel_dp_mst_mode_valid, .atomic_best_encoder = intel_mst_atomic_best_encoder, - .best_encoder = intel_mst_best_encoder, + .best_encoder = intel_mst_best_encoder,/* only for fb_helper */ .atomic_check = intel_dp_mst_atomic_check, };
drivers/gpu/drm/imx/imx-ldb.c +3 -2
@@ -163,8 +163,9 @@ static int imx_ldb_connector_get_modes(struct drm_connector *connector)return num_modes; } -static struct drm_encoder *imx_ldb_connector_best_encoder ( -struct drm_connector *connector) +static struct drm_encoder * +imx_ldb_connector_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {struct imx_ldb_channel *imx_ldb_ch =con_to_imx_ldb_ch (connector);
drivers/gpu/drm/imx/imx-tve.c +3 -2
@@ -265,8 +265,9 @@ static int imx_tve_connector_mode_valid(struct drm_connector *connector,return MODE_BAD ; } -static struct drm_encoder *imx_tve_connector_best_encoder ( -struct drm_connector *connector) +static struct drm_encoder * +imx_tve_connector_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {struct imx_tve *tve =con_to_tve (connector);
drivers/gpu/drm/imx/parallel-display.c +3 -2
@@ -89,8 +89,9 @@ static int imx_pd_connector_get_modes(struct drm_connector *connector)return num_modes; } -static struct drm_encoder *imx_pd_connector_best_encoder ( -struct drm_connector *connector) +static struct drm_encoder * +imx_pd_connector_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {struct imx_parallel_display *imxpd =con_to_imxpd (connector);
drivers/gpu/drm/mediatek/mtk_hdmi.c +2 -1
@@ -1253,7 +1253,8 @@ static int mtk_hdmi_conn_mode_valid(struct drm_connector *conn,return drm_mode_validate_size (mode,0x1fff ,0x1fff ); } -static struct drm_encoder *mtk_hdmi_conn_best_enc (struct drm_connector *conn) +static struct drm_encoder *mtk_hdmi_conn_best_enc (struct drm_connector *conn, +struct drm_crtc *crtc) {struct mtk_hdmi *hdmi =hdmi_ctx_from_conn (conn);
drivers/gpu/drm/mgag200/mgag200_mode.c +3 -2
@@ -1664,8 +1664,9 @@ static enum drm_mode_status mga_vga_mode_valid(struct drm_connector *connector,return MODE_OK ; } -static struct drm_encoder *mga_connector_best_encoder (struct drm_connector - *connector) +static struct drm_encoder * +mga_connector_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {int enc_id = connector->encoder_ids[0 ];/* pick the encoder ids */
drivers/gpu/drm/msm/dsi/dsi_manager.c +2 -1
@@ -426,7 +426,8 @@ static int dsi_mgr_connector_mode_valid(struct drm_connector *connector, }static struct drm_encoder * -dsi_mgr_connector_best_encoder (struct drm_connector *connector) +dsi_mgr_connector_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {int id =dsi_mgr_connector_get_id (connector);struct msm_dsi *msm_dsi =dsi_mgr_get_dsi (id);
drivers/gpu/drm/nouveau/dispnv50/disp.c +2 -1
@@ -826,7 +826,8 @@ nv50_mstc_atomic_best_encoder(struct drm_connector *connector, }static struct drm_encoder * -nv50_mstc_best_encoder (struct drm_connector *connector) +nv50_mstc_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {struct nv50_mstc *mstc =nv50_mstc (connector);if (mstc->port) {
drivers/gpu/drm/nouveau/nouveau_connector.c +2 -1
@@ -1063,7 +1063,8 @@ nouveau_connector_mode_valid(struct drm_connector *connector, }static struct drm_encoder * -nouveau_connector_best_encoder (struct drm_connector *connector) +nouveau_connector_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {struct nouveau_connector *nv_connector =nouveau_connector (connector);
drivers/gpu/drm/qxl/qxl_display.c +2 -1
@@ -978,7 +978,8 @@ static enum drm_mode_status qxl_conn_mode_valid(struct drm_connector *connector,return MODE_BAD ; } -static struct drm_encoder *qxl_best_encoder (struct drm_connector *connector) +static struct drm_encoder *qxl_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {struct qxl_output *qxl_output =drm_connector_to_qxl_output (connector);
drivers/gpu/drm/radeon/radeon_connectors.c +21 -19
@@ -158,7 +158,7 @@ int radeon_get_monitor_bpc(struct drm_connector *connector)else if (ASIC_IS_DCE41 (rdev) ||ASIC_IS_DCE5 (rdev)) {const struct drm_connector_helper_funcs *connector_funcs = connector->helper_private; -struct drm_encoder *encoder = connector_funcs->best_encoder (connector); +struct drm_encoder *encoder = connector_funcs->best_encoder (connector,NULL );struct radeon_encoder *radeon_encoder =to_radeon_encoder (encoder);struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv;
@@ -250,7 +250,7 @@ radeon_connector_update_scratch_regs(struct drm_connector *connector, enum drm_cbool connected;int i; - best_encoder = connector_funcs->best_encoder (connector); + best_encoder = connector_funcs->best_encoder (connector,NULL );for (i =0 ; i <DRM_CONNECTOR_MAX_ENCODER ; i++) {if (connector->encoder_ids[i] ==0 )
@@ -391,7 +391,8 @@ static int radeon_ddc_get_modes(struct drm_connector *connector)return 0 ; } -static struct drm_encoder *radeon_best_single_encoder (struct drm_connector *connector) +static struct drm_encoder *radeon_best_single_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {int enc_id = connector->encoder_ids[0 ];/* pick the encoder ids */
@@ -402,7 +403,7 @@ static struct drm_encoder *radeon_best_single_encoder(struct drm_connector *connstatic void radeon_get_native_mode (struct drm_connector *connector) { -struct drm_encoder *encoder =radeon_best_single_encoder (connector); +struct drm_encoder *encoder =radeon_best_single_encoder (connector,NULL );struct radeon_encoder *radeon_encoder;if (encoder ==NULL )
@@ -728,7 +729,7 @@ static int radeon_connector_set_property(struct drm_connector *connector, struct radeon_encoder =to_radeon_encoder (connector->encoder); else {const struct drm_connector_helper_funcs *connector_funcs = connector->helper_private; - radeon_encoder =to_radeon_encoder (connector_funcs->best_encoder (connector)); + radeon_encoder =to_radeon_encoder (connector_funcs->best_encoder (connector,NULL )); }switch (val) {
@@ -755,7 +756,7 @@ static int radeon_connector_set_property(struct drm_connector *connector, struct radeon_encoder =to_radeon_encoder (connector->encoder); else {const struct drm_connector_helper_funcs *connector_funcs = connector->helper_private; - radeon_encoder =to_radeon_encoder (connector_funcs->best_encoder (connector)); + radeon_encoder =to_radeon_encoder (connector_funcs->best_encoder (connector,NULL )); }if (radeon_encoder->output_csc == val)
@@ -824,7 +825,7 @@ static int radeon_lvds_get_modes(struct drm_connector *connector)radeon_connector_get_edid (connector); ret =radeon_ddc_get_modes (connector);if (ret >0 ) { - encoder =radeon_best_single_encoder (connector); + encoder =radeon_best_single_encoder (connector,NULL );if (encoder) {radeon_fixup_lvds_native_mode (encoder, connector);/* add scaled modes */
@@ -833,7 +834,7 @@ static int radeon_lvds_get_modes(struct drm_connector *connector)return ret; } - encoder =radeon_best_single_encoder (connector); + encoder =radeon_best_single_encoder (connector,NULL );if (!encoder)return 0 ;
@@ -855,7 +856,7 @@ static int radeon_lvds_get_modes(struct drm_connector *connector)static enum drm_mode_status radeon_lvds_mode_valid (struct drm_connector *connector,struct drm_display_mode *mode) { -struct drm_encoder *encoder =radeon_best_single_encoder (connector); +struct drm_encoder *encoder =radeon_best_single_encoder (connector,NULL );if ((mode->hdisplay <320 ) || (mode->vdisplay <240 ))return MODE_PANEL ;
@@ -888,7 +889,7 @@ radeon_lvds_detect(struct drm_connector *connector, bool force)struct drm_device *dev = connector->dev;struct radeon_device *rdev = dev->dev_private;struct radeon_connector *radeon_connector =to_radeon_connector (connector); -struct drm_encoder *encoder =radeon_best_single_encoder (connector); +struct drm_encoder *encoder =radeon_best_single_encoder (connector,NULL );enum drm_connector_status ret = connector_status_disconnected;int r;
@@ -965,7 +966,7 @@ static int radeon_lvds_set_property(struct drm_connector *connector, radeon_encoder =to_radeon_encoder (connector->encoder); else {const struct drm_connector_helper_funcs *connector_funcs = connector->helper_private; - radeon_encoder =to_radeon_encoder (connector_funcs->best_encoder (connector)); + radeon_encoder =to_radeon_encoder (connector_funcs->best_encoder (connector,NULL )); }switch (value) {
@@ -1044,7 +1045,7 @@ radeon_vga_detect(struct drm_connector *connector, bool force)return connector_status_disconnected; } - encoder =radeon_best_single_encoder (connector); + encoder =radeon_best_single_encoder (connector,NULL );if (!encoder) ret = connector_status_disconnected;
@@ -1139,7 +1140,7 @@ static int radeon_tv_get_modes(struct drm_connector *connector)struct drm_display_mode *tv_mode;struct drm_encoder *encoder; - encoder =radeon_best_single_encoder (connector); + encoder =radeon_best_single_encoder (connector,NULL );if (!encoder)return 0 ;
@@ -1182,7 +1183,7 @@ radeon_tv_detect(struct drm_connector *connector, bool force)return connector_status_disconnected; } - encoder =radeon_best_single_encoder (connector); + encoder =radeon_best_single_encoder (connector,NULL );if (!encoder) ret = connector_status_disconnected;else {
@@ -1439,7 +1440,7 @@ radeon_dvi_detect(struct drm_connector *connector, bool force)const struct drm_connector_helper_funcs *connector_funcs = connector->helper_private; - encoder = connector_funcs->best_encoder (connector); + encoder = connector_funcs->best_encoder (connector,NULL );if (encoder && (encoder->encoder_type ==DRM_MODE_ENCODER_TMDS )) {radeon_connector_get_edid (connector);radeon_audio_detect (connector, encoder, ret);
@@ -1456,7 +1457,8 @@ radeon_dvi_detect(struct drm_connector *connector, bool force) }/* okay need to be smart in here about which encoder to pick */ -static struct drm_encoder *radeon_dvi_encoder (struct drm_connector *connector) +static struct drm_encoder *radeon_dvi_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {int enc_id = connector->encoder_ids[0 ];struct radeon_connector *radeon_connector =to_radeon_connector (connector);
@@ -1556,7 +1558,7 @@ static int radeon_dp_get_modes(struct drm_connector *connector) {struct radeon_connector *radeon_connector =to_radeon_connector (connector);struct radeon_connector_atom_dig *radeon_dig_connector = radeon_connector->con_priv; -struct drm_encoder *encoder =radeon_best_single_encoder (connector); +struct drm_encoder *encoder =radeon_best_single_encoder (connector,NULL );int ret; if ((connector->connector_type == DRM_MODE_CONNECTOR_eDP) ||
@@ -1695,7 +1697,7 @@ radeon_dp_detect(struct drm_connector *connector, bool force)struct radeon_connector *radeon_connector =to_radeon_connector (connector);enum drm_connector_status ret = connector_status_disconnected;struct radeon_connector_atom_dig *radeon_dig_connector = radeon_connector->con_priv; -struct drm_encoder *encoder =radeon_best_single_encoder (connector); +struct drm_encoder *encoder =radeon_best_single_encoder (connector,NULL );int r;if (radeon_dig_connector->is_mst)
@@ -1812,7 +1814,7 @@ static enum drm_mode_status radeon_dp_mode_valid(struct drm_connector *connectorif ((connector->connector_type == DRM_MODE_CONNECTOR_eDP) || (connector->connector_type ==DRM_MODE_CONNECTOR_LVDS )) { -struct drm_encoder *encoder =radeon_best_single_encoder (connector); +struct drm_encoder *encoder =radeon_best_single_encoder (connector,NULL );if ((mode->hdisplay <320 ) || (mode->vdisplay <240 ))return MODE_PANEL ;
drivers/gpu/drm/radeon/radeon_dp_mst.c +3 -2
@@ -224,7 +224,8 @@ radeon_dp_mst_mode_valid(struct drm_connector *connector, }static struct -drm_encoder *radeon_mst_best_encoder (struct drm_connector *connector) +drm_encoder *radeon_mst_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {struct radeon_connector *radeon_connector =to_radeon_connector (connector);
@@ -613,7 +614,7 @@ radeon_dp_create_fake_mst_encoder(struct radeon_connector *connector)struct radeon_encoder_mst *mst_enc;struct drm_encoder *encoder;const struct drm_connector_helper_funcs *connector_funcs = connector->base.helper_private; -struct drm_encoder *enc_master = connector_funcs->best_encoder (&connector->base); +struct drm_encoder *enc_master = connector_funcs->best_encoder (&connector->base,NULL );DRM_DEBUG_KMS ("enc master is %p\n" , enc_master); radeon_encoder =kzalloc (sizeof (*radeon_encoder),GFP_KERNEL );
drivers/gpu/drm/shmobile/shmob_drm_crtc.c +2 -1
@@ -668,7 +668,8 @@ static int shmob_drm_connector_get_modes(struct drm_connector *connector) }static struct drm_encoder * -shmob_drm_connector_best_encoder (struct drm_connector *connector) +shmob_drm_connector_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {struct shmob_drm_connector *scon =to_shmob_connector (connector);
drivers/gpu/drm/tilcdc/tilcdc_panel.c +3 -2
@@ -178,8 +178,9 @@ static int panel_connector_mode_valid(struct drm_connector *connector,return tilcdc_crtc_mode_valid (priv->crtc, mode); } -static struct drm_encoder *panel_connector_best_encoder ( -struct drm_connector *connector) +static struct drm_encoder * +panel_connector_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {struct panel_connector *panel_connector =to_panel_connector (connector);return panel_connector->encoder;
drivers/gpu/drm/tilcdc/tilcdc_tfp410.c +3 -2
@@ -191,8 +191,9 @@ static int tfp410_connector_mode_valid(struct drm_connector *connector,return tilcdc_crtc_mode_valid (priv->crtc, mode); } -static struct drm_encoder *tfp410_connector_best_encoder ( -struct drm_connector *connector) +static struct drm_encoder * +tfp410_connector_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {struct tfp410_connector *tfp410_connector =to_tfp410_connector (connector);return tfp410_connector->encoder;
drivers/gpu/drm/udl/udl_connector.c +2 -1
@@ -145,7 +145,8 @@ udl_detect(struct drm_connector *connector, bool force) }static struct drm_encoder * -udl_best_single_encoder (struct drm_connector *connector) +udl_best_single_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {int enc_id = connector->encoder_ids[0 ];return drm_encoder_find (connector->dev,NULL , enc_id);
drivers/staging/vboxvideo/vbox_mode.c +3 -2
@@ -370,8 +370,9 @@ static void vbox_encoder_destroy(struct drm_encoder *encoder)kfree (encoder); } -static struct drm_encoder *vbox_best_single_encoder (struct drm_connector - *connector) +static struct drm_encoder * +vbox_best_single_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {int enc_id = connector->encoder_ids[0 ];
include/drm/drm_atomic_helper.h +2 -1
@@ -143,7 +143,8 @@ int drm_atomic_helper_page_flip_target(uint32_t target, struct drm_modeset_acquire_ctx *ctx);struct drm_encoder * -drm_atomic_helper_best_encoder (struct drm_connector *connector); +drm_atomic_helper_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc);/* default implementations for state handling */ void drm_atomic_helper_crtc_reset (struct drm_crtc *crtc);
include/drm/drm_modeset_helper_vtables.h +4 -2
@@ -885,7 +885,8 @@ struct drm_connector_helper_funcs {/** * @best_encoder: * -* This function should select the best encoder for the given connector. +* This function should select the best encoder for the given connector +* and crtc. For some driver internal use crtc may be NULL. * * This function is used by both the atomic helpers (in the * drm_atomic_helper_check_modeset() function) and in the legacy CRTC
@@ -911,7 +912,8 @@ struct drm_connector_helper_funcs {* will ensure that encoders aren't used twice, drivers should not check * for this. */ -struct drm_encoder *(*best_encoder)(struct drm_connector *connector); +struct drm_encoder *(*best_encoder)(struct drm_connector *connector, +struct drm_crtc *crtc);/** * @atomic_best_encoder:
Signature · 6 lines
2.16.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Patchwork
CI✗ Fi.CI.CHECKPATCH: warning for drm: Pass crtc to .best_encoder()
== Series Details ==
== Series Details ==
Series: drm: Pass crtc to .best_encoder()
URL : https://patchwork.freedesktop.org/series/44864/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip 30c6fbddb826 drm: Pass crtc to .best_encoder() -:81: WARNING:LONG_LINE: line over 100 characters #81: FILE: drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c:598: + amdgpu_encoder = to_amdgpu_encoder(connector_funcs->best_encoder(connector, NULL));
-:301: WARNING:OBSOLETE: drivers/gpu/drm/cirrus/cirrus_mode.c is marked as 'obsolete' in the MAINTAINERS hierarchy. No unnecessary modifications please.
-:304: WARNING:OBSOLETE: drivers/gpu/drm/cirrus/cirrus_mode.c is marked as 'obsolete' in the MAINTAINERS hierarchy. No unnecessary modifications please.
-:492: CHECK:AVOID_EXTERNS: extern prototypes should be avoided in .h files #492: FILE: drivers/gpu/drm/gma500/psb_intel_drv.h:233:
+extern struct drm_encoder *gma_best_encoder(struct drm_connector *connector,
-:699: WARNING:LONG_LINE: line over 100 characters #699: FILE: drivers/gpu/drm/radeon/radeon_connectors.c:161:
+ struct drm_encoder *encoder = connector_funcs->best_encoder(connector, NULL);
-:736: WARNING:LONG_LINE: line over 100 characters #736: FILE: drivers/gpu/drm/radeon/radeon_connectors.c:732:
+ radeon_encoder = to_radeon_encoder(connector_funcs->best_encoder(connector, NULL));
-:745: WARNING:LONG_LINE: line over 100 characters #745: FILE: drivers/gpu/drm/radeon/radeon_connectors.c:759:
+ radeon_encoder = to_radeon_encoder(connector_funcs->best_encoder(connector, NULL));
total: 0 errors, 6 warnings, 1 checks, 749 lines checked
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for drm: Pass crtc to .best_encoder()
In reply to Ville Syrjala== Series Details ==
== Series Details ==
Series: drm: Pass crtc to .best_encoder()
URL : https://patchwork.freedesktop.org/series/44864/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4328 -> Patchwork_9339 =
== Summary - SUCCESS ==
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/44864/revisions/1/mbox/
== Known issues ==
Here are the changes found in Patchwork_9339 that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@gem_exec_nop@basic-parallel:
fi-glk-j4005: PASS -> DMESG-WARN (fdo#105719)
igt@gem_exec_suspend@basic-s3:
fi-glk-j4005: PASS -> DMESG-WARN (fdo#106097) +1
igt@kms_flip@basic-flip-vs-modeset:
fi-glk-j4005: PASS -> DMESG-WARN (fdo#106000)
igt@kms_flip@basic-flip-vs-wf_vblank:
fi-cfl-s3: PASS -> FAIL (fdo#103928, fdo#100368)
==== Possible fixes ====
igt@kms_pipe_crc_basic@nonblocking-crc-pipe-b-frame-sequence:
fi-glk-j4005: DMESG-WARN (fdo#106238) -> PASS fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#103928 https://bugs.freedesktop.org/show_bug.cgi?id=103928
fdo#105719 https://bugs.freedesktop.org/show_bug.cgi?id=105719
fdo#106000 https://bugs.freedesktop.org/show_bug.cgi?id=106000
fdo#106097 https://bugs.freedesktop.org/show_bug.cgi?id=106097
fdo#106238 https://bugs.freedesktop.org/show_bug.cgi?id=106238
== Participating hosts (43 -> 38) ==
Missing (5): fi-ctg-p8600 fi-ilk-m540 fi-byt-squawks fi-bsw-cyan fi-hsw-4200u
== Build changes ==
* Linux: CI_DRM_4328 -> Patchwork_9339
CI_DRM_4328: 6d317aed03baa49c412638f69ffe580001c7d3b6 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4521: 4aa49a88acdaafed8235837d85a099ad941fc281 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9339: 30c6fbddb826fc78dcc6ce657d31f64b5b061021 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
30c6fbddb826 drm: Pass crtc to .best_encoder()
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9339/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.IGT: failure for drm: Pass crtc to .best_encoder()
In reply to Ville Syrjala== Series Details ==
== Series Details ==
Series: drm: Pass crtc to .best_encoder()
URL : https://patchwork.freedesktop.org/series/44864/
State : failure
== Summary ==
= CI Bug Log - changes from CI_DRM_4328_full -> Patchwork_9339_full =
== Summary - FAILURE ==
Serious unknown changes coming with Patchwork_9339_full absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_9339_full, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
== Possible new issues ==
Here are the unknown changes that may have been introduced in Patchwork_9339_full:
=== IGT changes ===
==== Possible regressions ====
igt@drv_selftest@live_hangcheck:
shard-apl: PASS -> DMESG-FAIL
shard-glk: PASS -> DMESG-FAIL
==== Warnings ====
igt@gem_exec_schedule@deep-vebox:
shard-kbl: SKIP -> PASS== Known issues ==
Here are the changes found in Patchwork_9339_full that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@drv_selftest@live_gtt:
shard-glk: PASS -> FAIL (fdo#105347)
igt@kms_atomic_transition@1x-modeset-transitions-nonblocking-fencing:
shard-glk: PASS -> FAIL (fdo#105703)
igt@kms_cursor_legacy@2x-nonblocking-modeset-vs-cursor-atomic:
shard-glk: PASS -> FAIL (fdo#106509, fdo#105454)
igt@kms_flip@flip-vs-blocking-wf-vblank:
shard-hsw: PASS -> FAIL (fdo#103928)
igt@kms_flip@modeset-vs-vblank-race:
shard-glk: PASS -> FAIL (fdo#103060)
igt@kms_flip@plain-flip-fb-recreate-interruptible:
shard-glk: PASS -> FAIL (fdo#100368)
shard-hsw: PASS -> FAIL (fdo#100368)
==== Possible fixes ====
igt@drv_selftest@live_hangcheck:
shard-kbl: DMESG-FAIL -> PASS
igt@kms_atomic_transition@1x-modeset-transitions-nonblocking:
shard-glk: FAIL (fdo#105703) -> PASS
igt@kms_cursor_legacy@2x-long-nonblocking-modeset-vs-cursor-atomic:
shard-glk: FAIL (fdo#106509, fdo#105454) -> PASS
igt@kms_cursor_legacy@cursor-vs-flip-atomic-transitions-varying-size:
shard-hsw: FAIL (fdo#103355) -> PASS
igt@kms_cursor_legacy@flip-vs-cursor-legacy:
shard-hsw: FAIL (fdo#102670) -> PASS
igt@kms_flip_tiling@flip-to-x-tiled:
shard-glk: FAIL (fdo#103822, fdo#104724) -> PASS
igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-shrfb-draw-render:
shard-snb: FAIL (fdo#103167, fdo#104724) -> PASS
igt@kms_setmode@basic:
shard-apl: FAIL (fdo#99912) -> PASS
shard-kbl: FAIL (fdo#99912) -> PASS
igt@kms_vblank@pipe-a-accuracy-idle:
shard-glk: FAIL (fdo#102583) -> PASS
igt@perf@polling:
shard-hsw: FAIL (fdo#102252) -> PASS fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#102252 https://bugs.freedesktop.org/show_bug.cgi?id=102252
fdo#102583 https://bugs.freedesktop.org/show_bug.cgi?id=102583
fdo#102670 https://bugs.freedesktop.org/show_bug.cgi?id=102670
fdo#103060 https://bugs.freedesktop.org/show_bug.cgi?id=103060
fdo#103167 https://bugs.freedesktop.org/show_bug.cgi?id=103167
fdo#103355 https://bugs.freedesktop.org/show_bug.cgi?id=103355
fdo#103822 https://bugs.freedesktop.org/show_bug.cgi?id=103822
fdo#103928 https://bugs.freedesktop.org/show_bug.cgi?id=103928
fdo#104724 https://bugs.freedesktop.org/show_bug.cgi?id=104724
fdo#105347 https://bugs.freedesktop.org/show_bug.cgi?id=105347
fdo#105454 https://bugs.freedesktop.org/show_bug.cgi?id=105454
fdo#105703 https://bugs.freedesktop.org/show_bug.cgi?id=105703
fdo#106509 https://bugs.freedesktop.org/show_bug.cgi?id=106509
fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912
== Participating hosts (5 -> 5) ==
No changes in participating hosts
== Build changes ==
* Linux: CI_DRM_4328 -> Patchwork_9339
CI_DRM_4328: 6d317aed03baa49c412638f69ffe580001c7d3b6 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4521: 4aa49a88acdaafed8235837d85a099ad941fc281 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9339: 30c6fbddb826fc78dcc6ce657d31f64b5b061021 @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9339/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 20 lines · Ville Syrjala
From: Ville Syrjälä <[email protected]>
To pick the correct MST encoder i915 wants to know which crtc is going to be feeding us. To that end let's pass the crtc to the .best_encoder() hook. The atomic variant already knows the crtc via the connector state, but the non-atomic hooks is still being used by the
fb_helpereven on atomic drivers.This allows us to fix up the
possible_crtcsbitmask for the i915 MST encoders. We have one encoder for each crtc+port combination, and thus we have to know both the connector and the crtc to pick the right one. This has only worked so far because every MST encoder lied in itspossible_crtcsbitmask that they can be driven by any crtc.I took the easy way out and passed NULL as the crtc for all the driver internal uses of .best_encoder() in the amdgpu/radeon drivers. None of the other drivers have such internal uses. The other callers (
crtc_helper,atomic_helper,fb_helper) will pass in the proper crtc. but no one besides i915 will currently look at it.
Quoted 6 lines
Cc Alex Deucher <[email protected]>Cc "Christian König" <[email protected]>Cc "David (ChunMing) Zhou" <[email protected]>Cc Harry Wentland <[email protected]>Signed-off-by Ville Syrjälä <[email protected]>
amdgpu parts are
Harry
Quoted 1,001 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 33 +++++++++-------- drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 3 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 7 ++-- .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 5 +-- drivers/gpu/drm/ast/ast_mode.c | 3 +- drivers/gpu/drm/bochs/bochs_kms.c | 3 +- drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 3 +- drivers/gpu/drm/bridge/tc358767.c | 3 +- drivers/gpu/drm/cirrus/cirrus_mode.c | 5 +-- drivers/gpu/drm/drm_atomic_helper.c | 16 ++++++--- drivers/gpu/drm/drm_crtc_helper.c | 3 +- drivers/gpu/drm/drm_fb_helper.c | 41 ++++++++++++---------- drivers/gpu/drm/gma500/gma_display.c | 3 +- drivers/gpu/drm/gma500/mdfld_dsi_output.c | 5 +-- drivers/gpu/drm/gma500/psb_intel_drv.h | 3 +- drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c | 3 +- drivers/gpu/drm/i2c/tda998x_drv.c | 3 +- drivers/gpu/drm/i915/intel_dp_mst.c | 9 +++-- drivers/gpu/drm/imx/imx-ldb.c | 5 +-- drivers/gpu/drm/imx/imx-tve.c | 5 +-- drivers/gpu/drm/imx/parallel-display.c | 5 +-- drivers/gpu/drm/mediatek/mtk_hdmi.c | 3 +- drivers/gpu/drm/mgag200/mgag200_mode.c | 5 +-- drivers/gpu/drm/msm/dsi/dsi_manager.c | 3 +- drivers/gpu/drm/nouveau/dispnv50/disp.c | 3 +- drivers/gpu/drm/nouveau/nouveau_connector.c | 3 +- drivers/gpu/drm/qxl/qxl_display.c | 3 +- drivers/gpu/drm/radeon/radeon_connectors.c | 40 +++++++++++---------- drivers/gpu/drm/radeon/radeon_dp_mst.c | 5 +-- drivers/gpu/drm/shmobile/shmob_drm_crtc.c | 3 +- drivers/gpu/drm/tilcdc/tilcdc_panel.c | 5 +-- drivers/gpu/drm/tilcdc/tilcdc_tfp410.c | 5 +-- drivers/gpu/drm/udl/udl_connector.c | 3 +- drivers/staging/vboxvideo/vbox_mode.c | 5 +-- include/drm/drm_atomic_helper.h | 3 +- include/drm/drm_modeset_helper_vtables.h | 6 ++-- 36 files changed, 155 insertions(+), 106 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c +18
-15@@ -135,7 +135,8 @@ int amdgpu_connector_get_monitor_bpc(struct drm_connector *connector)else {const struct drm_connector_helper_funcs *connector_funcs = connector->helper_private; -struct drm_encoder *encoder = connector_funcs->best_encoder (connector); +struct drm_encoder *encoder = connector_funcs->best_encoder (connector, +NULL );struct amdgpu_encoder *amdgpu_encoder =to_amdgpu_encoder (encoder);struct amdgpu_encoder_atom_dig *dig = amdgpu_encoder->enc_priv;@@ -218,7 +219,7 @@ amdgpu_connector_update_scratch_regs(struct drm_connector *connector,bool connected;int i; - best_encoder = connector_funcs->best_encoder (connector); + best_encoder = connector_funcs->best_encoder (connector,NULL );for (i =0 ; i <DRM_CONNECTOR_MAX_ENCODER ; i++) {if (connector->encoder_ids[i] ==0 )@@ -358,7 +359,8 @@ static int amdgpu_connector_ddc_get_modes(struct drm_connector *connector) }static struct drm_encoder * -amdgpu_connector_best_single_encoder (struct drm_connector *connector) +amdgpu_connector_best_single_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {int enc_id = connector->encoder_ids[0 ];@@ -370,7 +372,7 @@ amdgpu_connector_best_single_encoder(struct drm_connector *connector)static void amdgpu_get_native_mode (struct drm_connector *connector) { -struct drm_encoder *encoder =amdgpu_connector_best_single_encoder (connector); +struct drm_encoder *encoder =amdgpu_connector_best_single_encoder (connector,NULL );struct amdgpu_encoder *amdgpu_encoder;if (encoder ==NULL )@@ -593,7 +595,7 @@ static int amdgpu_connector_set_property(struct drm_connector *connector, amdgpu_encoder =to_amdgpu_encoder (connector->encoder); }else {const struct drm_connector_helper_funcs *connector_funcs = connector->helper_private; - amdgpu_encoder =to_amdgpu_encoder (connector_funcs->best_encoder (connector)); + amdgpu_encoder =to_amdgpu_encoder (connector_funcs->best_encoder (connector,NULL )); }switch (val) {@@ -663,7 +665,7 @@ static int amdgpu_connector_lvds_get_modes(struct drm_connector *connector)amdgpu_connector_get_edid (connector); ret =amdgpu_connector_ddc_get_modes (connector);if (ret >0 ) { - encoder =amdgpu_connector_best_single_encoder (connector); + encoder =amdgpu_connector_best_single_encoder (connector,NULL );if (encoder) {amdgpu_connector_fixup_lcd_native_mode (encoder, connector);/* add scaled modes */ @@ -672,7 +674,7 @@ static int amdgpu_connector_lvds_get_modes(struct drm_connector *connector)return ret; } - encoder =amdgpu_connector_best_single_encoder (connector); + encoder =amdgpu_connector_best_single_encoder (connector,NULL );if (!encoder)return 0 ;@@ -694,7 +696,7 @@ static int amdgpu_connector_lvds_get_modes(struct drm_connector *connector)static enum drm_mode_status amdgpu_connector_lvds_mode_valid (struct drm_connector *connector,struct drm_display_mode *mode) { -struct drm_encoder *encoder =amdgpu_connector_best_single_encoder (connector); +struct drm_encoder *encoder =amdgpu_connector_best_single_encoder (connector,NULL );if ((mode->hdisplay <320 ) || (mode->vdisplay <240 ))return MODE_PANEL ;@@ -725,7 +727,7 @@ static enum drm_connector_status amdgpu_connector_lvds_detect(struct drm_connector *connector, bool force) {struct amdgpu_connector *amdgpu_connector =to_amdgpu_connector (connector); -struct drm_encoder *encoder =amdgpu_connector_best_single_encoder (connector); +struct drm_encoder *encoder =amdgpu_connector_best_single_encoder (connector,NULL );enum drm_connector_status ret = connector_status_disconnected;int r;@@ -798,7 +800,7 @@ static int amdgpu_connector_set_lcd_property(struct drm_connector *connector, amdgpu_encoder =to_amdgpu_encoder (connector->encoder); else {const struct drm_connector_helper_funcs *connector_funcs = connector->helper_private; - amdgpu_encoder =to_amdgpu_encoder (connector_funcs->best_encoder (connector)); + amdgpu_encoder =to_amdgpu_encoder (connector_funcs->best_encoder (connector,NULL )); }switch (value) {@@ -873,7 +875,7 @@ amdgpu_connector_vga_detect(struct drm_connector *connector, bool force)return connector_status_disconnected; } - encoder =amdgpu_connector_best_single_encoder (connector); + encoder =amdgpu_connector_best_single_encoder (connector,NULL );if (!encoder) ret = connector_status_disconnected;@@ -1130,7 +1132,8 @@ amdgpu_connector_dvi_detect(struct drm_connector *connector, bool force)/* okay need to be smart in here about which encoder to pick */ static struct drm_encoder * -amdgpu_connector_dvi_encoder (struct drm_connector *connector) +amdgpu_connector_dvi_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {int enc_id = connector->encoder_ids[0 ];struct amdgpu_connector *amdgpu_connector =to_amdgpu_connector (connector);@@ -1224,7 +1227,7 @@ static int amdgpu_connector_dp_get_modes(struct drm_connector *connector) {struct amdgpu_connector *amdgpu_connector =to_amdgpu_connector (connector);struct amdgpu_connector_atom_dig *amdgpu_dig_connector = amdgpu_connector->con_priv; -struct drm_encoder *encoder =amdgpu_connector_best_single_encoder (connector); +struct drm_encoder *encoder =amdgpu_connector_best_single_encoder (connector,NULL );int ret; if ((connector->connector_type == DRM_MODE_CONNECTOR_eDP) ||@@ -1363,7 +1366,7 @@ amdgpu_connector_dp_detect(struct drm_connector *connector, bool force)struct amdgpu_connector *amdgpu_connector =to_amdgpu_connector (connector);enum drm_connector_status ret = connector_status_disconnected;struct amdgpu_connector_atom_dig *amdgpu_dig_connector = amdgpu_connector->con_priv; -struct drm_encoder *encoder =amdgpu_connector_best_single_encoder (connector); +struct drm_encoder *encoder =amdgpu_connector_best_single_encoder (connector,NULL );int r;if (!drm_kms_helper_is_poll_worker ()) {@@ -1458,7 +1461,7 @@ static enum drm_mode_status amdgpu_connector_dp_mode_valid(struct drm_connectorif ((connector->connector_type == DRM_MODE_CONNECTOR_eDP) || (connector->connector_type ==DRM_MODE_CONNECTOR_LVDS )) { -struct drm_encoder *encoder =amdgpu_connector_best_single_encoder (connector); +struct drm_encoder *encoder =amdgpu_connector_best_single_encoder (connector,NULL );if ((mode->hdisplay <320 ) || (mode->vdisplay <240 ))return MODE_PANEL ;drivers/gpu/drm/amd/amdgpu/dce_virtual.c +2
-1@@ -267,7 +267,8 @@ static int dce_virtual_early_init(void *handle) }static struct drm_encoder * -dce_virtual_encoder (struct drm_connector *connector) +dce_virtual_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {int enc_id = connector->encoder_ids[0 ];struct drm_encoder *encoder;drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +4
-3@@ -2758,7 +2758,8 @@ static const struct drm_connector_funcs amdgpu_dm_connector_funcs = { .atomic_get_property = amdgpu_dm_connector_atomic_get_property }; -static struct drm_encoder *best_encoder (struct drm_connector *connector) +static struct drm_encoder *best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {int enc_id = connector->encoder_ids[0 ];struct drm_mode_object *obj;@@ -3304,7 +3305,7 @@ static void amdgpu_dm_get_native_mode(struct drm_connector *connector)struct drm_encoder *encoder;struct amdgpu_encoder *amdgpu_encoder; - encoder = helper->best_encoder (connector); + encoder = helper->best_encoder (connector,NULL );if (encoder ==NULL )return ;@@ -3438,7 +3439,7 @@ static int amdgpu_dm_connector_get_modes(struct drm_connector *connector)struct drm_encoder *encoder;struct edid *edid = amdgpu_dm_connector->edid; - encoder = helper->best_encoder (connector); + encoder = helper->best_encoder (connector,NULL );amdgpu_dm_connector_ddc_get_modes (connector, edid);amdgpu_dm_connector_add_common_modes (encoder, connector);drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +3
-2@@ -269,7 +269,8 @@ static int dm_dp_mst_get_modes(struct drm_connector *connector)return ret; } -static struct drm_encoder *dm_mst_best_encoder (struct drm_connector *connector) +static struct drm_encoder *dm_mst_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {struct amdgpu_dm_connector *amdgpu_dm_connector =to_amdgpu_dm_connector (connector);@@ -302,7 +303,7 @@ dm_dp_create_fake_mst_encoder(struct amdgpu_dm_connector *connector)const struct drm_connector_helper_funcs *connector_funcs = connector->base.helper_private;struct drm_encoder *enc_master = - connector_funcs->best_encoder (&connector->base); + connector_funcs->best_encoder (&connector->base,NULL );DRM_DEBUG_KMS ("enc master is %p\n" , enc_master); amdgpu_encoder =kzalloc (sizeof (*amdgpu_encoder),GFP_KERNEL );drivers/gpu/drm/ast/ast_mode.c +2
-1@@ -709,7 +709,8 @@ static void ast_encoder_destroy(struct drm_encoder *encoder) } -static struct drm_encoder *ast_best_single_encoder (struct drm_connector *connector) +static struct drm_encoder *ast_best_single_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {int enc_id = connector->encoder_ids[0 ];/* pick the encoder ids */ drivers/gpu/drm/bochs/bochs_kms.c +2
-1@@ -208,7 +208,8 @@ static enum drm_mode_status bochs_connector_mode_valid(struct drm_connector *con }static struct drm_encoder * -bochs_connector_best_encoder (struct drm_connector *connector) +bochs_connector_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {int enc_id = connector->encoder_ids[0 ];/* pick the encoder ids */ drivers/gpu/drm/bridge/analogix/analogix_dp_core.c +2
-1@@ -1137,7 +1137,8 @@ static int analogix_dp_get_modes(struct drm_connector *connector) }static struct drm_encoder * -analogix_dp_best_encoder (struct drm_connector *connector) +analogix_dp_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {struct analogix_dp_device *dp =to_dp (connector);drivers/gpu/drm/bridge/tc358767.c +2
-1@@ -1155,7 +1155,8 @@ static void tc_connector_set_polling(struct tc_data *tc, }static struct drm_encoder * -tc_connector_best_encoder (struct drm_connector *connector) +tc_connector_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {struct tc_data *tc =connector_to_tc (connector);drivers/gpu/drm/cirrus/cirrus_mode.c +3
-2@@ -451,8 +451,9 @@ static int cirrus_vga_get_modes(struct drm_connector *connector)return count; } -static struct drm_encoder *cirrus_connector_best_encoder (struct drm_connector - *connector) +static struct drm_encoder * +cirrus_connector_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {int enc_id = connector->encoder_ids[0 ];/* pick the encoder ids */ drivers/gpu/drm/drm_atomic_helper.c +11
-5@@ -115,9 +115,11 @@ static int handle_conflicting_encoders(struct drm_atomic_state *state,if (funcs->atomic_best_encoder) new_encoder = funcs->atomic_best_encoder (connector, new_conn_state);else if (funcs->best_encoder) - new_encoder = funcs->best_encoder (connector); + new_encoder = funcs->best_encoder (connector, + new_conn_state->crtc);else - new_encoder =drm_atomic_helper_best_encoder (connector); + new_encoder =drm_atomic_helper_best_encoder (connector, + new_conn_state->crtc);if (new_encoder) {if (encoder_mask & (1 <<drm_encoder_index (new_encoder))) {@@ -312,9 +314,11 @@ update_connector_routing(struct drm_atomic_state *state, new_encoder = funcs->atomic_best_encoder (connector, new_connector_state); else if (funcs->best_encoder) - new_encoder = funcs->best_encoder (connector); + new_encoder = funcs->best_encoder (connector, + new_connector_state->crtc); else - new_encoder =drm_atomic_helper_best_encoder (connector); + new_encoder =drm_atomic_helper_best_encoder (connector, + new_connector_state->crtc);if (!new_encoder) { DRM_DEBUG_ATOMIC("No suitable encoder found for [CONNECTOR:%d:%s]\n",@@ -3318,13 +3322,15 @@ EXPORT_SYMBOL(drm_atomic_helper_page_flip_target);* drm_atomic_helper_best_encoder - Helper for * &drm_connector_helper_funcs.best_encoder callback * @connector: Connector control structure +* @crtc: DRM crtc * * This is a &drm_connector_helper_funcs.best_encoder callback helper for * connectors that support exactly 1 encoder, statically determined at driver * init time. */ struct drm_encoder * -drm_atomic_helper_best_encoder (struct drm_connector *connector) +drm_atomic_helper_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {WARN_ON (connector->encoder_ids[1 ]);return drm_encoder_find (connector->dev,NULL , connector->encoder_ids[0 ]);drivers/gpu/drm/drm_crtc_helper.c +2
-1@@ -637,7 +637,8 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set, new_encoder = connector->encoder;for (ro =0 ; ro < set->num_connectors; ro++) {if (set->connectors[ro] == connector) { - new_encoder = connector_funcs->best_encoder (connector); + new_encoder = connector_funcs->best_encoder (connector, + set->crtc);/* if we can't get an encoder for a connector we are setting now - then fail */ if (new_encoder ==NULL )drivers/gpu/drm/drm_fb_helper.c +22
-19@@ -2331,9 +2331,8 @@ static int drm_pick_crtcs(struct drm_fb_helper *fb_helper,int c, o;struct drm_connector *connector;const struct drm_connector_helper_funcs *connector_funcs; -struct drm_encoder *encoder;int my_score, best_score, score; -struct drm_fb_helper_crtc **crtcs, *crtc; +struct drm_fb_helper_crtc **crtcs;struct drm_fb_helper_connector *fb_helper_conn;if (n == fb_helper->connector_count)@@ -2362,28 +2361,32 @@ static int drm_pick_crtcs(struct drm_fb_helper *fb_helper, connector_funcs = connector->helper_private; -/* -* If the DRM device implements atomic hooks and ->best_encoder() is -* NULL we fallback to the default drm_atomic_helper_best_encoder() -* helper. -*/ -if (drm_drv_uses_atomic_modeset (fb_helper->dev) && - !connector_funcs->best_encoder) - encoder =drm_atomic_helper_best_encoder (connector); -else - encoder = connector_funcs->best_encoder (connector); - -if (!encoder) - goto out; -/* * select a crtc for this connector and then attempt to configure * remaining connectors */ for (c =0 ; c < fb_helper->crtc_count; c++) { - crtc = &fb_helper->crtc_info[c]; +struct drm_encoder *encoder; +struct drm_fb_helper_crtc *crtc = &fb_helper->crtc_info[c]; -if ((encoder->possible_crtcs & (1 << c)) ==0 ) +/* +* If the DRM device implements atomic hooks and ->best_encoder() is +* NULL we fallback to the default drm_atomic_helper_best_encoder() +* helper. +*/ +if (drm_drv_uses_atomic_modeset (fb_helper->dev) && + !connector_funcs->best_encoder) + encoder =drm_atomic_helper_best_encoder (connector, + crtc->mode_set.crtc); +else + encoder = connector_funcs->best_encoder (connector, + crtc->mode_set.crtc); + +if (!encoder) +continue ; + +if ((encoder->possible_crtcs & +drm_crtc_mask (crtc->mode_set.crtc)) ==0 )continue ;for (o =0 ; o < n; o++)@@ -2410,7 +2413,7 @@ static int drm_pick_crtcs(struct drm_fb_helper *fb_helper, sizeof(struct drm_fb_helper_crtc *)); } } -out: +kfree (crtcs);return best_score; }drivers/gpu/drm/gma500/gma_display.c +2
-1@@ -652,7 +652,8 @@ void gma_encoder_destroy(struct drm_encoder *encoder) }/* Currently there is only a 1:1 mapping of encoders and connectors */ -struct drm_encoder *gma_best_encoder (struct drm_connector *connector) +struct drm_encoder *gma_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {struct gma_encoder *gma_encoder =gma_attached_encoder (connector);drivers/gpu/drm/gma500/mdfld_dsi_output.c +3
-2@@ -377,8 +377,9 @@ static enum drm_mode_status mdfld_dsi_connector_mode_valid(struct drm_connectorreturn MODE_OK ; } -static struct drm_encoder *mdfld_dsi_connector_best_encoder ( -struct drm_connector *connector) +static struct drm_encoder * +mdfld_dsi_connector_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {struct mdfld_dsi_connector *dsi_connector =mdfld_dsi_connector (connector);drivers/gpu/drm/gma500/psb_intel_drv.h +2
-1@@ -230,7 +230,8 @@ extern void oaktrail_lvds_i2c_init(struct drm_encoder *encoder);extern void mid_dsi_init (struct drm_device *dev,struct psb_intel_mode_device *mode_dev,int dsi_num); -extern struct drm_encoder *gma_best_encoder (struct drm_connector *connector); +extern struct drm_encoder *gma_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc);extern void gma_connector_attach_encoder (struct gma_connector *connector,struct gma_encoder *encoder);drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c +2
-1@@ -34,7 +34,8 @@ static enum drm_mode_status hibmc_connector_mode_valid(struct drm_connector *con }static struct drm_encoder * -hibmc_connector_best_encoder (struct drm_connector *connector) +hibmc_connector_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {return drm_encoder_find (connector->dev,NULL , connector->encoder_ids[0 ]); }drivers/gpu/drm/i2c/tda998x_drv.c +2
-1@@ -1267,7 +1267,8 @@ static enum drm_mode_status tda998x_connector_mode_valid(struct drm_connector *c }static struct drm_encoder * -tda998x_connector_best_encoder (struct drm_connector *connector) +tda998x_connector_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {struct tda998x_priv *priv =conn_to_tda998x_priv (connector);drivers/gpu/drm/i915/intel_dp_mst.c +6
-3@@ -403,20 +403,23 @@ static struct drm_encoder *intel_mst_atomic_best_encoder(struct drm_connector *creturn &intel_dp->mst_encoders[crtc->pipe]->base.base; } -static struct drm_encoder *intel_mst_best_encoder (struct drm_connector *connector) +static struct drm_encoder *intel_mst_best_encoder (struct drm_connector *connector, +struct drm_crtc *_crtc) {struct intel_connector *intel_connector =to_intel_connector (connector);struct intel_dp *intel_dp = intel_connector->mst_port; +struct intel_crtc *crtc =to_intel_crtc (_crtc); +if (!intel_dp)return NULL ; -return &intel_dp->mst_encoders[0 ]->base.base; +return &intel_dp->mst_encoders[crtc->pipe]->base.base; }static const struct drm_connector_helper_funcs intel_dp_mst_connector_helper_funcs = { .get_modes = intel_dp_mst_get_modes, .mode_valid = intel_dp_mst_mode_valid, .atomic_best_encoder = intel_mst_atomic_best_encoder, - .best_encoder = intel_mst_best_encoder, + .best_encoder = intel_mst_best_encoder,/* only for fb_helper */ .atomic_check = intel_dp_mst_atomic_check, };drivers/gpu/drm/imx/imx-ldb.c +3
-2@@ -163,8 +163,9 @@ static int imx_ldb_connector_get_modes(struct drm_connector *connector)return num_modes; } -static struct drm_encoder *imx_ldb_connector_best_encoder ( -struct drm_connector *connector) +static struct drm_encoder * +imx_ldb_connector_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {struct imx_ldb_channel *imx_ldb_ch =con_to_imx_ldb_ch (connector);drivers/gpu/drm/imx/imx-tve.c +3
-2@@ -265,8 +265,9 @@ static int imx_tve_connector_mode_valid(struct drm_connector *connector,return MODE_BAD ; } -static struct drm_encoder *imx_tve_connector_best_encoder ( -struct drm_connector *connector) +static struct drm_encoder * +imx_tve_connector_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {struct imx_tve *tve =con_to_tve (connector);drivers/gpu/drm/imx/parallel-display.c +3
-2@@ -89,8 +89,9 @@ static int imx_pd_connector_get_modes(struct drm_connector *connector)return num_modes; } -static struct drm_encoder *imx_pd_connector_best_encoder ( -struct drm_connector *connector) +static struct drm_encoder * +imx_pd_connector_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {struct imx_parallel_display *imxpd =con_to_imxpd (connector);drivers/gpu/drm/mediatek/mtk_hdmi.c +2
-1@@ -1253,7 +1253,8 @@ static int mtk_hdmi_conn_mode_valid(struct drm_connector *conn,return drm_mode_validate_size (mode,0x1fff ,0x1fff ); } -static struct drm_encoder *mtk_hdmi_conn_best_enc (struct drm_connector *conn) +static struct drm_encoder *mtk_hdmi_conn_best_enc (struct drm_connector *conn, +struct drm_crtc *crtc) {struct mtk_hdmi *hdmi =hdmi_ctx_from_conn (conn);drivers/gpu/drm/mgag200/mgag200_mode.c +3
-2@@ -1664,8 +1664,9 @@ static enum drm_mode_status mga_vga_mode_valid(struct drm_connector *connector,return MODE_OK ; } -static struct drm_encoder *mga_connector_best_encoder (struct drm_connector - *connector) +static struct drm_encoder * +mga_connector_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {int enc_id = connector->encoder_ids[0 ];/* pick the encoder ids */ drivers/gpu/drm/msm/dsi/dsi_manager.c +2
-1@@ -426,7 +426,8 @@ static int dsi_mgr_connector_mode_valid(struct drm_connector *connector, }static struct drm_encoder * -dsi_mgr_connector_best_encoder (struct drm_connector *connector) +dsi_mgr_connector_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {int id =dsi_mgr_connector_get_id (connector);struct msm_dsi *msm_dsi =dsi_mgr_get_dsi (id);drivers/gpu/drm/nouveau/dispnv50/disp.c +2
-1@@ -826,7 +826,8 @@ nv50_mstc_atomic_best_encoder(struct drm_connector *connector, }static struct drm_encoder * -nv50_mstc_best_encoder (struct drm_connector *connector) +nv50_mstc_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {struct nv50_mstc *mstc =nv50_mstc (connector);if (mstc->port) {drivers/gpu/drm/nouveau/nouveau_connector.c +2
-1@@ -1063,7 +1063,8 @@ nouveau_connector_mode_valid(struct drm_connector *connector, }static struct drm_encoder * -nouveau_connector_best_encoder (struct drm_connector *connector) +nouveau_connector_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {struct nouveau_connector *nv_connector =nouveau_connector (connector);drivers/gpu/drm/qxl/qxl_display.c +2
-1@@ -978,7 +978,8 @@ static enum drm_mode_status qxl_conn_mode_valid(struct drm_connector *connector,return MODE_BAD ; } -static struct drm_encoder *qxl_best_encoder (struct drm_connector *connector) +static struct drm_encoder *qxl_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {struct qxl_output *qxl_output =drm_connector_to_qxl_output (connector);drivers/gpu/drm/radeon/radeon_connectors.c +21
-19@@ -158,7 +158,7 @@ int radeon_get_monitor_bpc(struct drm_connector *connector)else if (ASIC_IS_DCE41 (rdev) ||ASIC_IS_DCE5 (rdev)) {const struct drm_connector_helper_funcs *connector_funcs = connector->helper_private; -struct drm_encoder *encoder = connector_funcs->best_encoder (connector); +struct drm_encoder *encoder = connector_funcs->best_encoder (connector,NULL );struct radeon_encoder *radeon_encoder =to_radeon_encoder (encoder);struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv;@@ -250,7 +250,7 @@ radeon_connector_update_scratch_regs(struct drm_connector *connector, enum drm_cbool connected;int i; - best_encoder = connector_funcs->best_encoder (connector); + best_encoder = connector_funcs->best_encoder (connector,NULL );for (i =0 ; i <DRM_CONNECTOR_MAX_ENCODER ; i++) {if (connector->encoder_ids[i] ==0 )@@ -391,7 +391,8 @@ static int radeon_ddc_get_modes(struct drm_connector *connector)return 0 ; } -static struct drm_encoder *radeon_best_single_encoder (struct drm_connector *connector) +static struct drm_encoder *radeon_best_single_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {int enc_id = connector->encoder_ids[0 ];/* pick the encoder ids */ @@ -402,7 +403,7 @@ static struct drm_encoder *radeon_best_single_encoder(struct drm_connector *connstatic void radeon_get_native_mode (struct drm_connector *connector) { -struct drm_encoder *encoder =radeon_best_single_encoder (connector); +struct drm_encoder *encoder =radeon_best_single_encoder (connector,NULL );struct radeon_encoder *radeon_encoder;if (encoder ==NULL )@@ -728,7 +729,7 @@ static int radeon_connector_set_property(struct drm_connector *connector, struct radeon_encoder =to_radeon_encoder (connector->encoder); else {const struct drm_connector_helper_funcs *connector_funcs = connector->helper_private; - radeon_encoder =to_radeon_encoder (connector_funcs->best_encoder (connector)); + radeon_encoder =to_radeon_encoder (connector_funcs->best_encoder (connector,NULL )); }switch (val) {@@ -755,7 +756,7 @@ static int radeon_connector_set_property(struct drm_connector *connector, struct radeon_encoder =to_radeon_encoder (connector->encoder); else {const struct drm_connector_helper_funcs *connector_funcs = connector->helper_private; - radeon_encoder =to_radeon_encoder (connector_funcs->best_encoder (connector)); + radeon_encoder =to_radeon_encoder (connector_funcs->best_encoder (connector,NULL )); }if (radeon_encoder->output_csc == val)@@ -824,7 +825,7 @@ static int radeon_lvds_get_modes(struct drm_connector *connector)radeon_connector_get_edid (connector); ret =radeon_ddc_get_modes (connector);if (ret >0 ) { - encoder =radeon_best_single_encoder (connector); + encoder =radeon_best_single_encoder (connector,NULL );if (encoder) {radeon_fixup_lvds_native_mode (encoder, connector);/* add scaled modes */ @@ -833,7 +834,7 @@ static int radeon_lvds_get_modes(struct drm_connector *connector)return ret; } - encoder =radeon_best_single_encoder (connector); + encoder =radeon_best_single_encoder (connector,NULL );if (!encoder)return 0 ;@@ -855,7 +856,7 @@ static int radeon_lvds_get_modes(struct drm_connector *connector)static enum drm_mode_status radeon_lvds_mode_valid (struct drm_connector *connector,struct drm_display_mode *mode) { -struct drm_encoder *encoder =radeon_best_single_encoder (connector); +struct drm_encoder *encoder =radeon_best_single_encoder (connector,NULL );if ((mode->hdisplay <320 ) || (mode->vdisplay <240 ))return MODE_PANEL ;@@ -888,7 +889,7 @@ radeon_lvds_detect(struct drm_connector *connector, bool force)struct drm_device *dev = connector->dev;struct radeon_device *rdev = dev->dev_private;struct radeon_connector *radeon_connector =to_radeon_connector (connector); -struct drm_encoder *encoder =radeon_best_single_encoder (connector); +struct drm_encoder *encoder =radeon_best_single_encoder (connector,NULL );enum drm_connector_status ret = connector_status_disconnected;int r;@@ -965,7 +966,7 @@ static int radeon_lvds_set_property(struct drm_connector *connector, radeon_encoder =to_radeon_encoder (connector->encoder); else {const struct drm_connector_helper_funcs *connector_funcs = connector->helper_private; - radeon_encoder =to_radeon_encoder (connector_funcs->best_encoder (connector)); + radeon_encoder =to_radeon_encoder (connector_funcs->best_encoder (connector,NULL )); }switch (value) {@@ -1044,7 +1045,7 @@ radeon_vga_detect(struct drm_connector *connector, bool force)return connector_status_disconnected; } - encoder =radeon_best_single_encoder (connector); + encoder =radeon_best_single_encoder (connector,NULL );if (!encoder) ret = connector_status_disconnected;@@ -1139,7 +1140,7 @@ static int radeon_tv_get_modes(struct drm_connector *connector)struct drm_display_mode *tv_mode;struct drm_encoder *encoder; - encoder =radeon_best_single_encoder (connector); + encoder =radeon_best_single_encoder (connector,NULL );if (!encoder)return 0 ;@@ -1182,7 +1183,7 @@ radeon_tv_detect(struct drm_connector *connector, bool force)return connector_status_disconnected; } - encoder =radeon_best_single_encoder (connector); + encoder =radeon_best_single_encoder (connector,NULL );if (!encoder) ret = connector_status_disconnected;else {@@ -1439,7 +1440,7 @@ radeon_dvi_detect(struct drm_connector *connector, bool force)const struct drm_connector_helper_funcs *connector_funcs = connector->helper_private; - encoder = connector_funcs->best_encoder (connector); + encoder = connector_funcs->best_encoder (connector,NULL );if (encoder && (encoder->encoder_type ==DRM_MODE_ENCODER_TMDS )) {radeon_connector_get_edid (connector);radeon_audio_detect (connector, encoder, ret);@@ -1456,7 +1457,8 @@ radeon_dvi_detect(struct drm_connector *connector, bool force) }/* okay need to be smart in here about which encoder to pick */ -static struct drm_encoder *radeon_dvi_encoder (struct drm_connector *connector) +static struct drm_encoder *radeon_dvi_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {int enc_id = connector->encoder_ids[0 ];struct radeon_connector *radeon_connector =to_radeon_connector (connector);@@ -1556,7 +1558,7 @@ static int radeon_dp_get_modes(struct drm_connector *connector) {struct radeon_connector *radeon_connector =to_radeon_connector (connector);struct radeon_connector_atom_dig *radeon_dig_connector = radeon_connector->con_priv; -struct drm_encoder *encoder =radeon_best_single_encoder (connector); +struct drm_encoder *encoder =radeon_best_single_encoder (connector,NULL );int ret; if ((connector->connector_type == DRM_MODE_CONNECTOR_eDP) ||@@ -1695,7 +1697,7 @@ radeon_dp_detect(struct drm_connector *connector, bool force)struct radeon_connector *radeon_connector =to_radeon_connector (connector);enum drm_connector_status ret = connector_status_disconnected;struct radeon_connector_atom_dig *radeon_dig_connector = radeon_connector->con_priv; -struct drm_encoder *encoder =radeon_best_single_encoder (connector); +struct drm_encoder *encoder =radeon_best_single_encoder (connector,NULL );int r;if (radeon_dig_connector->is_mst)@@ -1812,7 +1814,7 @@ static enum drm_mode_status radeon_dp_mode_valid(struct drm_connector *connectorif ((connector->connector_type == DRM_MODE_CONNECTOR_eDP) || (connector->connector_type ==DRM_MODE_CONNECTOR_LVDS )) { -struct drm_encoder *encoder =radeon_best_single_encoder (connector); +struct drm_encoder *encoder =radeon_best_single_encoder (connector,NULL );if ((mode->hdisplay <320 ) || (mode->vdisplay <240 ))return MODE_PANEL ;drivers/gpu/drm/radeon/radeon_dp_mst.c +3
-2@@ -224,7 +224,8 @@ radeon_dp_mst_mode_valid(struct drm_connector *connector, }static struct -drm_encoder *radeon_mst_best_encoder (struct drm_connector *connector) +drm_encoder *radeon_mst_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {struct radeon_connector *radeon_connector =to_radeon_connector (connector);@@ -613,7 +614,7 @@ radeon_dp_create_fake_mst_encoder(struct radeon_connector *connector)struct radeon_encoder_mst *mst_enc;struct drm_encoder *encoder;const struct drm_connector_helper_funcs *connector_funcs = connector->base.helper_private; -struct drm_encoder *enc_master = connector_funcs->best_encoder (&connector->base); +struct drm_encoder *enc_master = connector_funcs->best_encoder (&connector->base,NULL );DRM_DEBUG_KMS ("enc master is %p\n" , enc_master); radeon_encoder =kzalloc (sizeof (*radeon_encoder),GFP_KERNEL );drivers/gpu/drm/shmobile/shmob_drm_crtc.c +2
-1@@ -668,7 +668,8 @@ static int shmob_drm_connector_get_modes(struct drm_connector *connector) }static struct drm_encoder * -shmob_drm_connector_best_encoder (struct drm_connector *connector) +shmob_drm_connector_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {struct shmob_drm_connector *scon =to_shmob_connector (connector);drivers/gpu/drm/tilcdc/tilcdc_panel.c +3
-2@@ -178,8 +178,9 @@ static int panel_connector_mode_valid(struct drm_connector *connector,return tilcdc_crtc_mode_valid (priv->crtc, mode); } -static struct drm_encoder *panel_connector_best_encoder ( -struct drm_connector *connector) +static struct drm_encoder * +panel_connector_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {struct panel_connector *panel_connector =to_panel_connector (connector);return panel_connector->encoder;drivers/gpu/drm/tilcdc/tilcdc_tfp410.c +3
-2@@ -191,8 +191,9 @@ static int tfp410_connector_mode_valid(struct drm_connector *connector,return tilcdc_crtc_mode_valid (priv->crtc, mode); } -static struct drm_encoder *tfp410_connector_best_encoder ( -struct drm_connector *connector) +static struct drm_encoder * +tfp410_connector_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {struct tfp410_connector *tfp410_connector =to_tfp410_connector (connector);return tfp410_connector->encoder;drivers/gpu/drm/udl/udl_connector.c +2
-1@@ -145,7 +145,8 @@ udl_detect(struct drm_connector *connector, bool force) }static struct drm_encoder * -udl_best_single_encoder (struct drm_connector *connector) +udl_best_single_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {int enc_id = connector->encoder_ids[0 ];return drm_encoder_find (connector->dev,NULL , enc_id);drivers/staging/vboxvideo/vbox_mode.c +3
-2@@ -370,8 +370,9 @@ static void vbox_encoder_destroy(struct drm_encoder *encoder)kfree (encoder); } -static struct drm_encoder *vbox_best_single_encoder (struct drm_connector - *connector) +static struct drm_encoder * +vbox_best_single_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {int enc_id = connector->encoder_ids[0 ];include/drm/drm_atomic_helper.h +2
-1@@ -143,7 +143,8 @@ int drm_atomic_helper_page_flip_target(uint32_t target, struct drm_modeset_acquire_ctx *ctx);struct drm_encoder * -drm_atomic_helper_best_encoder (struct drm_connector *connector); +drm_atomic_helper_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc);/* default implementations for state handling */ void drm_atomic_helper_crtc_reset (struct drm_crtc *crtc);include/drm/drm_modeset_helper_vtables.h +2
-1@@ -885,7 +885,8 @@ struct drm_connector_helper_funcs {/** * @best_encoder: * -* This function should select the best encoder for the given connector. +* This function should select the best encoder for the given connector +* and crtc. For some driver internal use crtc may be NULL. * * This function is used by both the atomic helpers (in the * drm_atomic_helper_check_modeset() function) and in the legacy CRTC
include/drm/drm_modeset_helper_vtables.h struct drm_connector_helper_funcs { · line 919
Quoted 9 lines
include/drm/drm_modeset_helper_vtables.h +2
-1@@ -911,7 +912,8 @@ struct drm_connector_helper_funcs {* will ensure that encoders aren't used twice, drivers should not check * for this. */ -struct drm_encoder *(*best_encoder)(struct drm_connector *connector); +struct drm_encoder *(*best_encoder)(struct drm_connector *connector, +struct drm_crtc *crtc);/** * @atomic_best_encoder:
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 28 lines · Harry Wentland
Quoted 20 lines · Ville Syrjala
From: Ville Syrjälä <[email protected]>
To pick the correct MST encoder i915 wants to know which crtc is going to be feeding us. To that end let's pass the crtc to the .best_encoder() hook. The atomic variant already knows the crtc via the connector state, but the non-atomic hooks is still being used by the
fb_helpereven on atomic drivers.This allows us to fix up the
possible_crtcsbitmask for the i915 MST encoders. We have one encoder for each crtc+port combination, and thus we have to know both the connector and the crtc to pick the right one. This has only worked so far because every MST encoder lied in itspossible_crtcsbitmask that they can be driven by any crtc.I took the easy way out and passed NULL as the crtc for all the driver internal uses of .best_encoder() in the amdgpu/radeon drivers. None of the other drivers have such internal uses. The other callers (
crtc_helper,atomic_helper,fb_helper) will pass in the proper crtc. but no one besides i915 will currently look at it.Quoted 6 lines
Cc Alex Deucher <[email protected]>Cc "Christian König" <[email protected]>Cc "David (ChunMing) Zhou" <[email protected]>Cc Harry Wentland <[email protected]>Signed-off-by Ville Syrjälä <[email protected]>
Quoted 3 lines
amdgpu parts are
Acked-by Harry Wentland <[email protected]>
Upgrading after proper review of the entire patch
Harry
Quoted 1,009 lines
Harry
Quoted 1,007 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 33 +++++++++-------- drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 3 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 7 ++-- .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 5 +-- drivers/gpu/drm/ast/ast_mode.c | 3 +- drivers/gpu/drm/bochs/bochs_kms.c | 3 +- drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 3 +- drivers/gpu/drm/bridge/tc358767.c | 3 +- drivers/gpu/drm/cirrus/cirrus_mode.c | 5 +-- drivers/gpu/drm/drm_atomic_helper.c | 16 ++++++--- drivers/gpu/drm/drm_crtc_helper.c | 3 +- drivers/gpu/drm/drm_fb_helper.c | 41 ++++++++++++---------- drivers/gpu/drm/gma500/gma_display.c | 3 +- drivers/gpu/drm/gma500/mdfld_dsi_output.c | 5 +-- drivers/gpu/drm/gma500/psb_intel_drv.h | 3 +- drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c | 3 +- drivers/gpu/drm/i2c/tda998x_drv.c | 3 +- drivers/gpu/drm/i915/intel_dp_mst.c | 9 +++-- drivers/gpu/drm/imx/imx-ldb.c | 5 +-- drivers/gpu/drm/imx/imx-tve.c | 5 +-- drivers/gpu/drm/imx/parallel-display.c | 5 +-- drivers/gpu/drm/mediatek/mtk_hdmi.c | 3 +- drivers/gpu/drm/mgag200/mgag200_mode.c | 5 +-- drivers/gpu/drm/msm/dsi/dsi_manager.c | 3 +- drivers/gpu/drm/nouveau/dispnv50/disp.c | 3 +- drivers/gpu/drm/nouveau/nouveau_connector.c | 3 +- drivers/gpu/drm/qxl/qxl_display.c | 3 +- drivers/gpu/drm/radeon/radeon_connectors.c | 40 +++++++++++---------- drivers/gpu/drm/radeon/radeon_dp_mst.c | 5 +-- drivers/gpu/drm/shmobile/shmob_drm_crtc.c | 3 +- drivers/gpu/drm/tilcdc/tilcdc_panel.c | 5 +-- drivers/gpu/drm/tilcdc/tilcdc_tfp410.c | 5 +-- drivers/gpu/drm/udl/udl_connector.c | 3 +- drivers/staging/vboxvideo/vbox_mode.c | 5 +-- include/drm/drm_atomic_helper.h | 3 +- include/drm/drm_modeset_helper_vtables.h | 6 ++-- 36 files changed, 155 insertions(+), 106 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c +18
-15@@ -135,7 +135,8 @@ int amdgpu_connector_get_monitor_bpc(struct drm_connector *connector)else {const struct drm_connector_helper_funcs *connector_funcs = connector->helper_private; -struct drm_encoder *encoder = connector_funcs->best_encoder (connector); +struct drm_encoder *encoder = connector_funcs->best_encoder (connector, +NULL );struct amdgpu_encoder *amdgpu_encoder =to_amdgpu_encoder (encoder);struct amdgpu_encoder_atom_dig *dig = amdgpu_encoder->enc_priv;@@ -218,7 +219,7 @@ amdgpu_connector_update_scratch_regs(struct drm_connector *connector,bool connected;int i; - best_encoder = connector_funcs->best_encoder (connector); + best_encoder = connector_funcs->best_encoder (connector,NULL );for (i =0 ; i <DRM_CONNECTOR_MAX_ENCODER ; i++) {if (connector->encoder_ids[i] ==0 )@@ -358,7 +359,8 @@ static int amdgpu_connector_ddc_get_modes(struct drm_connector *connector) }static struct drm_encoder * -amdgpu_connector_best_single_encoder (struct drm_connector *connector) +amdgpu_connector_best_single_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {int enc_id = connector->encoder_ids[0 ];@@ -370,7 +372,7 @@ amdgpu_connector_best_single_encoder(struct drm_connector *connector)static void amdgpu_get_native_mode (struct drm_connector *connector) { -struct drm_encoder *encoder =amdgpu_connector_best_single_encoder (connector); +struct drm_encoder *encoder =amdgpu_connector_best_single_encoder (connector,NULL );struct amdgpu_encoder *amdgpu_encoder;if (encoder ==NULL )@@ -593,7 +595,7 @@ static int amdgpu_connector_set_property(struct drm_connector *connector, amdgpu_encoder =to_amdgpu_encoder (connector->encoder); }else {const struct drm_connector_helper_funcs *connector_funcs = connector->helper_private; - amdgpu_encoder =to_amdgpu_encoder (connector_funcs->best_encoder (connector)); + amdgpu_encoder =to_amdgpu_encoder (connector_funcs->best_encoder (connector,NULL )); }switch (val) {@@ -663,7 +665,7 @@ static int amdgpu_connector_lvds_get_modes(struct drm_connector *connector)amdgpu_connector_get_edid (connector); ret =amdgpu_connector_ddc_get_modes (connector);if (ret >0 ) { - encoder =amdgpu_connector_best_single_encoder (connector); + encoder =amdgpu_connector_best_single_encoder (connector,NULL );if (encoder) {amdgpu_connector_fixup_lcd_native_mode (encoder, connector);/* add scaled modes */ @@ -672,7 +674,7 @@ static int amdgpu_connector_lvds_get_modes(struct drm_connector *connector)return ret; } - encoder =amdgpu_connector_best_single_encoder (connector); + encoder =amdgpu_connector_best_single_encoder (connector,NULL );if (!encoder)return 0 ;@@ -694,7 +696,7 @@ static int amdgpu_connector_lvds_get_modes(struct drm_connector *connector)static enum drm_mode_status amdgpu_connector_lvds_mode_valid (struct drm_connector *connector,struct drm_display_mode *mode) { -struct drm_encoder *encoder =amdgpu_connector_best_single_encoder (connector); +struct drm_encoder *encoder =amdgpu_connector_best_single_encoder (connector,NULL );if ((mode->hdisplay <320 ) || (mode->vdisplay <240 ))return MODE_PANEL ;@@ -725,7 +727,7 @@ static enum drm_connector_status amdgpu_connector_lvds_detect(struct drm_connector *connector, bool force) {struct amdgpu_connector *amdgpu_connector =to_amdgpu_connector (connector); -struct drm_encoder *encoder =amdgpu_connector_best_single_encoder (connector); +struct drm_encoder *encoder =amdgpu_connector_best_single_encoder (connector,NULL );enum drm_connector_status ret = connector_status_disconnected;int r;@@ -798,7 +800,7 @@ static int amdgpu_connector_set_lcd_property(struct drm_connector *connector, amdgpu_encoder =to_amdgpu_encoder (connector->encoder); else {const struct drm_connector_helper_funcs *connector_funcs = connector->helper_private; - amdgpu_encoder =to_amdgpu_encoder (connector_funcs->best_encoder (connector)); + amdgpu_encoder =to_amdgpu_encoder (connector_funcs->best_encoder (connector,NULL )); }switch (value) {@@ -873,7 +875,7 @@ amdgpu_connector_vga_detect(struct drm_connector *connector, bool force)return connector_status_disconnected; } - encoder =amdgpu_connector_best_single_encoder (connector); + encoder =amdgpu_connector_best_single_encoder (connector,NULL );if (!encoder) ret = connector_status_disconnected;@@ -1130,7 +1132,8 @@ amdgpu_connector_dvi_detect(struct drm_connector *connector, bool force)/* okay need to be smart in here about which encoder to pick */ static struct drm_encoder * -amdgpu_connector_dvi_encoder (struct drm_connector *connector) +amdgpu_connector_dvi_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {int enc_id = connector->encoder_ids[0 ];struct amdgpu_connector *amdgpu_connector =to_amdgpu_connector (connector);@@ -1224,7 +1227,7 @@ static int amdgpu_connector_dp_get_modes(struct drm_connector *connector) {struct amdgpu_connector *amdgpu_connector =to_amdgpu_connector (connector);struct amdgpu_connector_atom_dig *amdgpu_dig_connector = amdgpu_connector->con_priv; -struct drm_encoder *encoder =amdgpu_connector_best_single_encoder (connector); +struct drm_encoder *encoder =amdgpu_connector_best_single_encoder (connector,NULL );int ret; if ((connector->connector_type == DRM_MODE_CONNECTOR_eDP) ||@@ -1363,7 +1366,7 @@ amdgpu_connector_dp_detect(struct drm_connector *connector, bool force)struct amdgpu_connector *amdgpu_connector =to_amdgpu_connector (connector);enum drm_connector_status ret = connector_status_disconnected;struct amdgpu_connector_atom_dig *amdgpu_dig_connector = amdgpu_connector->con_priv; -struct drm_encoder *encoder =amdgpu_connector_best_single_encoder (connector); +struct drm_encoder *encoder =amdgpu_connector_best_single_encoder (connector,NULL );int r;if (!drm_kms_helper_is_poll_worker ()) {@@ -1458,7 +1461,7 @@ static enum drm_mode_status amdgpu_connector_dp_mode_valid(struct drm_connectorif ((connector->connector_type == DRM_MODE_CONNECTOR_eDP) || (connector->connector_type ==DRM_MODE_CONNECTOR_LVDS )) { -struct drm_encoder *encoder =amdgpu_connector_best_single_encoder (connector); +struct drm_encoder *encoder =amdgpu_connector_best_single_encoder (connector,NULL );if ((mode->hdisplay <320 ) || (mode->vdisplay <240 ))return MODE_PANEL ;drivers/gpu/drm/amd/amdgpu/dce_virtual.c +2
-1@@ -267,7 +267,8 @@ static int dce_virtual_early_init(void *handle) }static struct drm_encoder * -dce_virtual_encoder (struct drm_connector *connector) +dce_virtual_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {int enc_id = connector->encoder_ids[0 ];struct drm_encoder *encoder;drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +4
-3@@ -2758,7 +2758,8 @@ static const struct drm_connector_funcs amdgpu_dm_connector_funcs = { .atomic_get_property = amdgpu_dm_connector_atomic_get_property }; -static struct drm_encoder *best_encoder (struct drm_connector *connector) +static struct drm_encoder *best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {int enc_id = connector->encoder_ids[0 ];struct drm_mode_object *obj;@@ -3304,7 +3305,7 @@ static void amdgpu_dm_get_native_mode(struct drm_connector *connector)struct drm_encoder *encoder;struct amdgpu_encoder *amdgpu_encoder; - encoder = helper->best_encoder (connector); + encoder = helper->best_encoder (connector,NULL );if (encoder ==NULL )return ;@@ -3438,7 +3439,7 @@ static int amdgpu_dm_connector_get_modes(struct drm_connector *connector)struct drm_encoder *encoder;struct edid *edid = amdgpu_dm_connector->edid; - encoder = helper->best_encoder (connector); + encoder = helper->best_encoder (connector,NULL );amdgpu_dm_connector_ddc_get_modes (connector, edid);amdgpu_dm_connector_add_common_modes (encoder, connector);drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +3
-2@@ -269,7 +269,8 @@ static int dm_dp_mst_get_modes(struct drm_connector *connector)return ret; } -static struct drm_encoder *dm_mst_best_encoder (struct drm_connector *connector) +static struct drm_encoder *dm_mst_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {struct amdgpu_dm_connector *amdgpu_dm_connector =to_amdgpu_dm_connector (connector);@@ -302,7 +303,7 @@ dm_dp_create_fake_mst_encoder(struct amdgpu_dm_connector *connector)const struct drm_connector_helper_funcs *connector_funcs = connector->base.helper_private;struct drm_encoder *enc_master = - connector_funcs->best_encoder (&connector->base); + connector_funcs->best_encoder (&connector->base,NULL );DRM_DEBUG_KMS ("enc master is %p\n" , enc_master); amdgpu_encoder =kzalloc (sizeof (*amdgpu_encoder),GFP_KERNEL );drivers/gpu/drm/ast/ast_mode.c +2
-1@@ -709,7 +709,8 @@ static void ast_encoder_destroy(struct drm_encoder *encoder) } -static struct drm_encoder *ast_best_single_encoder (struct drm_connector *connector) +static struct drm_encoder *ast_best_single_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {int enc_id = connector->encoder_ids[0 ];/* pick the encoder ids */ drivers/gpu/drm/bochs/bochs_kms.c +2
-1@@ -208,7 +208,8 @@ static enum drm_mode_status bochs_connector_mode_valid(struct drm_connector *con }static struct drm_encoder * -bochs_connector_best_encoder (struct drm_connector *connector) +bochs_connector_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {int enc_id = connector->encoder_ids[0 ];/* pick the encoder ids */ drivers/gpu/drm/bridge/analogix/analogix_dp_core.c +2
-1@@ -1137,7 +1137,8 @@ static int analogix_dp_get_modes(struct drm_connector *connector) }static struct drm_encoder * -analogix_dp_best_encoder (struct drm_connector *connector) +analogix_dp_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {struct analogix_dp_device *dp =to_dp (connector);drivers/gpu/drm/bridge/tc358767.c +2
-1@@ -1155,7 +1155,8 @@ static void tc_connector_set_polling(struct tc_data *tc, }static struct drm_encoder * -tc_connector_best_encoder (struct drm_connector *connector) +tc_connector_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {struct tc_data *tc =connector_to_tc (connector);drivers/gpu/drm/cirrus/cirrus_mode.c +3
-2@@ -451,8 +451,9 @@ static int cirrus_vga_get_modes(struct drm_connector *connector)return count; } -static struct drm_encoder *cirrus_connector_best_encoder (struct drm_connector - *connector) +static struct drm_encoder * +cirrus_connector_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {int enc_id = connector->encoder_ids[0 ];/* pick the encoder ids */ drivers/gpu/drm/drm_atomic_helper.c +11
-5@@ -115,9 +115,11 @@ static int handle_conflicting_encoders(struct drm_atomic_state *state,if (funcs->atomic_best_encoder) new_encoder = funcs->atomic_best_encoder (connector, new_conn_state);else if (funcs->best_encoder) - new_encoder = funcs->best_encoder (connector); + new_encoder = funcs->best_encoder (connector, + new_conn_state->crtc);else - new_encoder =drm_atomic_helper_best_encoder (connector); + new_encoder =drm_atomic_helper_best_encoder (connector, + new_conn_state->crtc);if (new_encoder) {if (encoder_mask & (1 <<drm_encoder_index (new_encoder))) {@@ -312,9 +314,11 @@ update_connector_routing(struct drm_atomic_state *state, new_encoder = funcs->atomic_best_encoder (connector, new_connector_state); else if (funcs->best_encoder) - new_encoder = funcs->best_encoder (connector); + new_encoder = funcs->best_encoder (connector, + new_connector_state->crtc); else - new_encoder =drm_atomic_helper_best_encoder (connector); + new_encoder =drm_atomic_helper_best_encoder (connector, + new_connector_state->crtc);if (!new_encoder) { DRM_DEBUG_ATOMIC("No suitable encoder found for [CONNECTOR:%d:%s]\n",@@ -3318,13 +3322,15 @@ EXPORT_SYMBOL(drm_atomic_helper_page_flip_target);* drm_atomic_helper_best_encoder - Helper for * &drm_connector_helper_funcs.best_encoder callback * @connector: Connector control structure +* @crtc: DRM crtc * * This is a &drm_connector_helper_funcs.best_encoder callback helper for * connectors that support exactly 1 encoder, statically determined at driver * init time. */ struct drm_encoder * -drm_atomic_helper_best_encoder (struct drm_connector *connector) +drm_atomic_helper_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {WARN_ON (connector->encoder_ids[1 ]);return drm_encoder_find (connector->dev,NULL , connector->encoder_ids[0 ]);drivers/gpu/drm/drm_crtc_helper.c +2
-1@@ -637,7 +637,8 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set, new_encoder = connector->encoder;for (ro =0 ; ro < set->num_connectors; ro++) {if (set->connectors[ro] == connector) { - new_encoder = connector_funcs->best_encoder (connector); + new_encoder = connector_funcs->best_encoder (connector, + set->crtc);/* if we can't get an encoder for a connector we are setting now - then fail */ if (new_encoder ==NULL )drivers/gpu/drm/drm_fb_helper.c +22
-19@@ -2331,9 +2331,8 @@ static int drm_pick_crtcs(struct drm_fb_helper *fb_helper,int c, o;struct drm_connector *connector;const struct drm_connector_helper_funcs *connector_funcs; -struct drm_encoder *encoder;int my_score, best_score, score; -struct drm_fb_helper_crtc **crtcs, *crtc; +struct drm_fb_helper_crtc **crtcs;struct drm_fb_helper_connector *fb_helper_conn;if (n == fb_helper->connector_count)@@ -2362,28 +2361,32 @@ static int drm_pick_crtcs(struct drm_fb_helper *fb_helper, connector_funcs = connector->helper_private; -/* -* If the DRM device implements atomic hooks and ->best_encoder() is -* NULL we fallback to the default drm_atomic_helper_best_encoder() -* helper. -*/ -if (drm_drv_uses_atomic_modeset (fb_helper->dev) && - !connector_funcs->best_encoder) - encoder =drm_atomic_helper_best_encoder (connector); -else - encoder = connector_funcs->best_encoder (connector); - -if (!encoder) - goto out; -/* * select a crtc for this connector and then attempt to configure * remaining connectors */ for (c =0 ; c < fb_helper->crtc_count; c++) { - crtc = &fb_helper->crtc_info[c]; +struct drm_encoder *encoder; +struct drm_fb_helper_crtc *crtc = &fb_helper->crtc_info[c]; -if ((encoder->possible_crtcs & (1 << c)) ==0 ) +/* +* If the DRM device implements atomic hooks and ->best_encoder() is +* NULL we fallback to the default drm_atomic_helper_best_encoder() +* helper. +*/ +if (drm_drv_uses_atomic_modeset (fb_helper->dev) && + !connector_funcs->best_encoder) + encoder =drm_atomic_helper_best_encoder (connector, + crtc->mode_set.crtc); +else + encoder = connector_funcs->best_encoder (connector, + crtc->mode_set.crtc); + +if (!encoder) +continue ; + +if ((encoder->possible_crtcs & +drm_crtc_mask (crtc->mode_set.crtc)) ==0 )continue ;for (o =0 ; o < n; o++)@@ -2410,7 +2413,7 @@ static int drm_pick_crtcs(struct drm_fb_helper *fb_helper, sizeof(struct drm_fb_helper_crtc *)); } } -out: +kfree (crtcs);return best_score; }drivers/gpu/drm/gma500/gma_display.c +2
-1@@ -652,7 +652,8 @@ void gma_encoder_destroy(struct drm_encoder *encoder) }/* Currently there is only a 1:1 mapping of encoders and connectors */ -struct drm_encoder *gma_best_encoder (struct drm_connector *connector) +struct drm_encoder *gma_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {struct gma_encoder *gma_encoder =gma_attached_encoder (connector);drivers/gpu/drm/gma500/mdfld_dsi_output.c +3
-2@@ -377,8 +377,9 @@ static enum drm_mode_status mdfld_dsi_connector_mode_valid(struct drm_connectorreturn MODE_OK ; } -static struct drm_encoder *mdfld_dsi_connector_best_encoder ( -struct drm_connector *connector) +static struct drm_encoder * +mdfld_dsi_connector_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {struct mdfld_dsi_connector *dsi_connector =mdfld_dsi_connector (connector);drivers/gpu/drm/gma500/psb_intel_drv.h +2
-1@@ -230,7 +230,8 @@ extern void oaktrail_lvds_i2c_init(struct drm_encoder *encoder);extern void mid_dsi_init (struct drm_device *dev,struct psb_intel_mode_device *mode_dev,int dsi_num); -extern struct drm_encoder *gma_best_encoder (struct drm_connector *connector); +extern struct drm_encoder *gma_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc);extern void gma_connector_attach_encoder (struct gma_connector *connector,struct gma_encoder *encoder);drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c +2
-1@@ -34,7 +34,8 @@ static enum drm_mode_status hibmc_connector_mode_valid(struct drm_connector *con }static struct drm_encoder * -hibmc_connector_best_encoder (struct drm_connector *connector) +hibmc_connector_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {return drm_encoder_find (connector->dev,NULL , connector->encoder_ids[0 ]); }drivers/gpu/drm/i2c/tda998x_drv.c +2
-1@@ -1267,7 +1267,8 @@ static enum drm_mode_status tda998x_connector_mode_valid(struct drm_connector *c }static struct drm_encoder * -tda998x_connector_best_encoder (struct drm_connector *connector) +tda998x_connector_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {struct tda998x_priv *priv =conn_to_tda998x_priv (connector);drivers/gpu/drm/i915/intel_dp_mst.c +6
-3@@ -403,20 +403,23 @@ static struct drm_encoder *intel_mst_atomic_best_encoder(struct drm_connector *creturn &intel_dp->mst_encoders[crtc->pipe]->base.base; } -static struct drm_encoder *intel_mst_best_encoder (struct drm_connector *connector) +static struct drm_encoder *intel_mst_best_encoder (struct drm_connector *connector, +struct drm_crtc *_crtc) {struct intel_connector *intel_connector =to_intel_connector (connector);struct intel_dp *intel_dp = intel_connector->mst_port; +struct intel_crtc *crtc =to_intel_crtc (_crtc); +if (!intel_dp)return NULL ; -return &intel_dp->mst_encoders[0 ]->base.base; +return &intel_dp->mst_encoders[crtc->pipe]->base.base; }static const struct drm_connector_helper_funcs intel_dp_mst_connector_helper_funcs = { .get_modes = intel_dp_mst_get_modes, .mode_valid = intel_dp_mst_mode_valid, .atomic_best_encoder = intel_mst_atomic_best_encoder, - .best_encoder = intel_mst_best_encoder, + .best_encoder = intel_mst_best_encoder,/* only for fb_helper */ .atomic_check = intel_dp_mst_atomic_check, };drivers/gpu/drm/imx/imx-ldb.c +3
-2@@ -163,8 +163,9 @@ static int imx_ldb_connector_get_modes(struct drm_connector *connector)return num_modes; } -static struct drm_encoder *imx_ldb_connector_best_encoder ( -struct drm_connector *connector) +static struct drm_encoder * +imx_ldb_connector_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {struct imx_ldb_channel *imx_ldb_ch =con_to_imx_ldb_ch (connector);drivers/gpu/drm/imx/imx-tve.c +3
-2@@ -265,8 +265,9 @@ static int imx_tve_connector_mode_valid(struct drm_connector *connector,return MODE_BAD ; } -static struct drm_encoder *imx_tve_connector_best_encoder ( -struct drm_connector *connector) +static struct drm_encoder * +imx_tve_connector_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {struct imx_tve *tve =con_to_tve (connector);drivers/gpu/drm/imx/parallel-display.c +3
-2@@ -89,8 +89,9 @@ static int imx_pd_connector_get_modes(struct drm_connector *connector)return num_modes; } -static struct drm_encoder *imx_pd_connector_best_encoder ( -struct drm_connector *connector) +static struct drm_encoder * +imx_pd_connector_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {struct imx_parallel_display *imxpd =con_to_imxpd (connector);drivers/gpu/drm/mediatek/mtk_hdmi.c +2
-1@@ -1253,7 +1253,8 @@ static int mtk_hdmi_conn_mode_valid(struct drm_connector *conn,return drm_mode_validate_size (mode,0x1fff ,0x1fff ); } -static struct drm_encoder *mtk_hdmi_conn_best_enc (struct drm_connector *conn) +static struct drm_encoder *mtk_hdmi_conn_best_enc (struct drm_connector *conn, +struct drm_crtc *crtc) {struct mtk_hdmi *hdmi =hdmi_ctx_from_conn (conn);drivers/gpu/drm/mgag200/mgag200_mode.c +3
-2@@ -1664,8 +1664,9 @@ static enum drm_mode_status mga_vga_mode_valid(struct drm_connector *connector,return MODE_OK ; } -static struct drm_encoder *mga_connector_best_encoder (struct drm_connector - *connector) +static struct drm_encoder * +mga_connector_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {int enc_id = connector->encoder_ids[0 ];/* pick the encoder ids */ drivers/gpu/drm/msm/dsi/dsi_manager.c +2
-1@@ -426,7 +426,8 @@ static int dsi_mgr_connector_mode_valid(struct drm_connector *connector, }static struct drm_encoder * -dsi_mgr_connector_best_encoder (struct drm_connector *connector) +dsi_mgr_connector_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {int id =dsi_mgr_connector_get_id (connector);struct msm_dsi *msm_dsi =dsi_mgr_get_dsi (id);drivers/gpu/drm/nouveau/dispnv50/disp.c +2
-1@@ -826,7 +826,8 @@ nv50_mstc_atomic_best_encoder(struct drm_connector *connector, }static struct drm_encoder * -nv50_mstc_best_encoder (struct drm_connector *connector) +nv50_mstc_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {struct nv50_mstc *mstc =nv50_mstc (connector);if (mstc->port) {drivers/gpu/drm/nouveau/nouveau_connector.c +2
-1@@ -1063,7 +1063,8 @@ nouveau_connector_mode_valid(struct drm_connector *connector, }static struct drm_encoder * -nouveau_connector_best_encoder (struct drm_connector *connector) +nouveau_connector_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {struct nouveau_connector *nv_connector =nouveau_connector (connector);drivers/gpu/drm/qxl/qxl_display.c +2
-1@@ -978,7 +978,8 @@ static enum drm_mode_status qxl_conn_mode_valid(struct drm_connector *connector,return MODE_BAD ; } -static struct drm_encoder *qxl_best_encoder (struct drm_connector *connector) +static struct drm_encoder *qxl_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {struct qxl_output *qxl_output =drm_connector_to_qxl_output (connector);drivers/gpu/drm/radeon/radeon_connectors.c +21
-19@@ -158,7 +158,7 @@ int radeon_get_monitor_bpc(struct drm_connector *connector)else if (ASIC_IS_DCE41 (rdev) ||ASIC_IS_DCE5 (rdev)) {const struct drm_connector_helper_funcs *connector_funcs = connector->helper_private; -struct drm_encoder *encoder = connector_funcs->best_encoder (connector); +struct drm_encoder *encoder = connector_funcs->best_encoder (connector,NULL );struct radeon_encoder *radeon_encoder =to_radeon_encoder (encoder);struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv;@@ -250,7 +250,7 @@ radeon_connector_update_scratch_regs(struct drm_connector *connector, enum drm_cbool connected;int i; - best_encoder = connector_funcs->best_encoder (connector); + best_encoder = connector_funcs->best_encoder (connector,NULL );for (i =0 ; i <DRM_CONNECTOR_MAX_ENCODER ; i++) {if (connector->encoder_ids[i] ==0 )@@ -391,7 +391,8 @@ static int radeon_ddc_get_modes(struct drm_connector *connector)return 0 ; } -static struct drm_encoder *radeon_best_single_encoder (struct drm_connector *connector) +static struct drm_encoder *radeon_best_single_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {int enc_id = connector->encoder_ids[0 ];/* pick the encoder ids */ @@ -402,7 +403,7 @@ static struct drm_encoder *radeon_best_single_encoder(struct drm_connector *connstatic void radeon_get_native_mode (struct drm_connector *connector) { -struct drm_encoder *encoder =radeon_best_single_encoder (connector); +struct drm_encoder *encoder =radeon_best_single_encoder (connector,NULL );struct radeon_encoder *radeon_encoder;if (encoder ==NULL )@@ -728,7 +729,7 @@ static int radeon_connector_set_property(struct drm_connector *connector, struct radeon_encoder =to_radeon_encoder (connector->encoder); else {const struct drm_connector_helper_funcs *connector_funcs = connector->helper_private; - radeon_encoder =to_radeon_encoder (connector_funcs->best_encoder (connector)); + radeon_encoder =to_radeon_encoder (connector_funcs->best_encoder (connector,NULL )); }switch (val) {@@ -755,7 +756,7 @@ static int radeon_connector_set_property(struct drm_connector *connector, struct radeon_encoder =to_radeon_encoder (connector->encoder); else {const struct drm_connector_helper_funcs *connector_funcs = connector->helper_private; - radeon_encoder =to_radeon_encoder (connector_funcs->best_encoder (connector)); + radeon_encoder =to_radeon_encoder (connector_funcs->best_encoder (connector,NULL )); }if (radeon_encoder->output_csc == val)@@ -824,7 +825,7 @@ static int radeon_lvds_get_modes(struct drm_connector *connector)radeon_connector_get_edid (connector); ret =radeon_ddc_get_modes (connector);if (ret >0 ) { - encoder =radeon_best_single_encoder (connector); + encoder =radeon_best_single_encoder (connector,NULL );if (encoder) {radeon_fixup_lvds_native_mode (encoder, connector);/* add scaled modes */ @@ -833,7 +834,7 @@ static int radeon_lvds_get_modes(struct drm_connector *connector)return ret; } - encoder =radeon_best_single_encoder (connector); + encoder =radeon_best_single_encoder (connector,NULL );if (!encoder)return 0 ;@@ -855,7 +856,7 @@ static int radeon_lvds_get_modes(struct drm_connector *connector)static enum drm_mode_status radeon_lvds_mode_valid (struct drm_connector *connector,struct drm_display_mode *mode) { -struct drm_encoder *encoder =radeon_best_single_encoder (connector); +struct drm_encoder *encoder =radeon_best_single_encoder (connector,NULL );if ((mode->hdisplay <320 ) || (mode->vdisplay <240 ))return MODE_PANEL ;@@ -888,7 +889,7 @@ radeon_lvds_detect(struct drm_connector *connector, bool force)struct drm_device *dev = connector->dev;struct radeon_device *rdev = dev->dev_private;struct radeon_connector *radeon_connector =to_radeon_connector (connector); -struct drm_encoder *encoder =radeon_best_single_encoder (connector); +struct drm_encoder *encoder =radeon_best_single_encoder (connector,NULL );enum drm_connector_status ret = connector_status_disconnected;int r;@@ -965,7 +966,7 @@ static int radeon_lvds_set_property(struct drm_connector *connector, radeon_encoder =to_radeon_encoder (connector->encoder); else {const struct drm_connector_helper_funcs *connector_funcs = connector->helper_private; - radeon_encoder =to_radeon_encoder (connector_funcs->best_encoder (connector)); + radeon_encoder =to_radeon_encoder (connector_funcs->best_encoder (connector,NULL )); }switch (value) {@@ -1044,7 +1045,7 @@ radeon_vga_detect(struct drm_connector *connector, bool force)return connector_status_disconnected; } - encoder =radeon_best_single_encoder (connector); + encoder =radeon_best_single_encoder (connector,NULL );if (!encoder) ret = connector_status_disconnected;@@ -1139,7 +1140,7 @@ static int radeon_tv_get_modes(struct drm_connector *connector)struct drm_display_mode *tv_mode;struct drm_encoder *encoder; - encoder =radeon_best_single_encoder (connector); + encoder =radeon_best_single_encoder (connector,NULL );if (!encoder)return 0 ;@@ -1182,7 +1183,7 @@ radeon_tv_detect(struct drm_connector *connector, bool force)return connector_status_disconnected; } - encoder =radeon_best_single_encoder (connector); + encoder =radeon_best_single_encoder (connector,NULL );if (!encoder) ret = connector_status_disconnected;else {@@ -1439,7 +1440,7 @@ radeon_dvi_detect(struct drm_connector *connector, bool force)const struct drm_connector_helper_funcs *connector_funcs = connector->helper_private; - encoder = connector_funcs->best_encoder (connector); + encoder = connector_funcs->best_encoder (connector,NULL );if (encoder && (encoder->encoder_type ==DRM_MODE_ENCODER_TMDS )) {radeon_connector_get_edid (connector);radeon_audio_detect (connector, encoder, ret);@@ -1456,7 +1457,8 @@ radeon_dvi_detect(struct drm_connector *connector, bool force) }/* okay need to be smart in here about which encoder to pick */ -static struct drm_encoder *radeon_dvi_encoder (struct drm_connector *connector) +static struct drm_encoder *radeon_dvi_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {int enc_id = connector->encoder_ids[0 ];struct radeon_connector *radeon_connector =to_radeon_connector (connector);@@ -1556,7 +1558,7 @@ static int radeon_dp_get_modes(struct drm_connector *connector) {struct radeon_connector *radeon_connector =to_radeon_connector (connector);struct radeon_connector_atom_dig *radeon_dig_connector = radeon_connector->con_priv; -struct drm_encoder *encoder =radeon_best_single_encoder (connector); +struct drm_encoder *encoder =radeon_best_single_encoder (connector,NULL );int ret; if ((connector->connector_type == DRM_MODE_CONNECTOR_eDP) ||@@ -1695,7 +1697,7 @@ radeon_dp_detect(struct drm_connector *connector, bool force)struct radeon_connector *radeon_connector =to_radeon_connector (connector);enum drm_connector_status ret = connector_status_disconnected;struct radeon_connector_atom_dig *radeon_dig_connector = radeon_connector->con_priv; -struct drm_encoder *encoder =radeon_best_single_encoder (connector); +struct drm_encoder *encoder =radeon_best_single_encoder (connector,NULL );int r;if (radeon_dig_connector->is_mst)@@ -1812,7 +1814,7 @@ static enum drm_mode_status radeon_dp_mode_valid(struct drm_connector *connectorif ((connector->connector_type == DRM_MODE_CONNECTOR_eDP) || (connector->connector_type ==DRM_MODE_CONNECTOR_LVDS )) { -struct drm_encoder *encoder =radeon_best_single_encoder (connector); +struct drm_encoder *encoder =radeon_best_single_encoder (connector,NULL );if ((mode->hdisplay <320 ) || (mode->vdisplay <240 ))return MODE_PANEL ;drivers/gpu/drm/radeon/radeon_dp_mst.c +3
-2@@ -224,7 +224,8 @@ radeon_dp_mst_mode_valid(struct drm_connector *connector, }static struct -drm_encoder *radeon_mst_best_encoder (struct drm_connector *connector) +drm_encoder *radeon_mst_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {struct radeon_connector *radeon_connector =to_radeon_connector (connector);@@ -613,7 +614,7 @@ radeon_dp_create_fake_mst_encoder(struct radeon_connector *connector)struct radeon_encoder_mst *mst_enc;struct drm_encoder *encoder;const struct drm_connector_helper_funcs *connector_funcs = connector->base.helper_private; -struct drm_encoder *enc_master = connector_funcs->best_encoder (&connector->base); +struct drm_encoder *enc_master = connector_funcs->best_encoder (&connector->base,NULL );DRM_DEBUG_KMS ("enc master is %p\n" , enc_master); radeon_encoder =kzalloc (sizeof (*radeon_encoder),GFP_KERNEL );drivers/gpu/drm/shmobile/shmob_drm_crtc.c +2
-1@@ -668,7 +668,8 @@ static int shmob_drm_connector_get_modes(struct drm_connector *connector) }static struct drm_encoder * -shmob_drm_connector_best_encoder (struct drm_connector *connector) +shmob_drm_connector_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {struct shmob_drm_connector *scon =to_shmob_connector (connector);drivers/gpu/drm/tilcdc/tilcdc_panel.c +3
-2@@ -178,8 +178,9 @@ static int panel_connector_mode_valid(struct drm_connector *connector,return tilcdc_crtc_mode_valid (priv->crtc, mode); } -static struct drm_encoder *panel_connector_best_encoder ( -struct drm_connector *connector) +static struct drm_encoder * +panel_connector_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {struct panel_connector *panel_connector =to_panel_connector (connector);return panel_connector->encoder;drivers/gpu/drm/tilcdc/tilcdc_tfp410.c +3
-2@@ -191,8 +191,9 @@ static int tfp410_connector_mode_valid(struct drm_connector *connector,return tilcdc_crtc_mode_valid (priv->crtc, mode); } -static struct drm_encoder *tfp410_connector_best_encoder ( -struct drm_connector *connector) +static struct drm_encoder * +tfp410_connector_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {struct tfp410_connector *tfp410_connector =to_tfp410_connector (connector);return tfp410_connector->encoder;drivers/gpu/drm/udl/udl_connector.c +2
-1@@ -145,7 +145,8 @@ udl_detect(struct drm_connector *connector, bool force) }static struct drm_encoder * -udl_best_single_encoder (struct drm_connector *connector) +udl_best_single_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {int enc_id = connector->encoder_ids[0 ];return drm_encoder_find (connector->dev,NULL , enc_id);drivers/staging/vboxvideo/vbox_mode.c +3
-2@@ -370,8 +370,9 @@ static void vbox_encoder_destroy(struct drm_encoder *encoder)kfree (encoder); } -static struct drm_encoder *vbox_best_single_encoder (struct drm_connector - *connector) +static struct drm_encoder * +vbox_best_single_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {int enc_id = connector->encoder_ids[0 ];include/drm/drm_atomic_helper.h +2
-1@@ -143,7 +143,8 @@ int drm_atomic_helper_page_flip_target(uint32_t target, struct drm_modeset_acquire_ctx *ctx);struct drm_encoder * -drm_atomic_helper_best_encoder (struct drm_connector *connector); +drm_atomic_helper_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc);/* default implementations for state handling */ void drm_atomic_helper_crtc_reset (struct drm_crtc *crtc);include/drm/drm_modeset_helper_vtables.h +4
-2@@ -885,7 +885,8 @@ struct drm_connector_helper_funcs {/** * @best_encoder: * -* This function should select the best encoder for the given connector. +* This function should select the best encoder for the given connector +* and crtc. For some driver internal use crtc may be NULL. * * This function is used by both the atomic helpers (in the * drm_atomic_helper_check_modeset() function) and in the legacy CRTC @@ -911,7 +912,8 @@ struct drm_connector_helper_funcs {* will ensure that encoders aren't used twice, drivers should not check * for this. */ -struct drm_encoder *(*best_encoder)(struct drm_connector *connector); +struct drm_encoder *(*best_encoder)(struct drm_connector *connector, +struct drm_crtc *crtc);
Quoted 8 lines
include/drm/drm_modeset_helper_vtables.h struct drm_connector_helper_funcs { · line 919
Quoted 3 lines
include/drm/drm_modeset_helper_vtables.h +0
-0/** * @atomic_best_encoder: _______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
A message that is not in the archive (sent off-list or not yet received): 20180615195221.18119-1-ville.syrjala-VuQAYsv1563Yd54FQh9/[email protected]
Quoted 7 lines · Ville Syrjala
From: Ville Syrjälä <[email protected]>
To pick the correct MST encoder i915 wants to know which crtc is going to be feeding us. To that end let's pass the crtc to the .best_encoder() hook. The atomic variant already knows the crtc via the connector state, but the non-atomic hooks is still being used by the
fb_helpereven on atomic drivers.
Can't we instead fix the fb helpers to use atomic_best_encoder? Or just drop that code, userspace doesn't really know any better either and just needs to figure this out without the help of ->best_encoder, so it should be possible.
-Daniel
Quoted 1,035 lines
This allows us to fix up the
possible_crtcsbitmask for the i915 MST encoders. We have one encoder for each crtc+port combination, and thus we have to know both the connector and the crtc to pick the right one. This has only worked so far because every MST encoder lied in itspossible_crtcsbitmask that they can be driven by any crtc.I took the easy way out and passed NULL as the crtc for all the driver internal uses of .best_encoder() in the amdgpu/radeon drivers. None of the other drivers have such internal uses. The other callers (
crtc_helper,atomic_helper,fb_helper) will pass in the proper crtc. but no one besides i915 will currently look at it.Cc Alex Deucher <[email protected]>Cc "Christian König" <[email protected]>Cc "David (ChunMing) Zhou" <[email protected]>Cc Harry Wentland <[email protected]>Signed-off-by Ville Syrjälä <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 33 +++++++++-------- drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 3 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 7 ++-- .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 5 +-- drivers/gpu/drm/ast/ast_mode.c | 3 +- drivers/gpu/drm/bochs/bochs_kms.c | 3 +- drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 3 +- drivers/gpu/drm/bridge/tc358767.c | 3 +- drivers/gpu/drm/cirrus/cirrus_mode.c | 5 +-- drivers/gpu/drm/drm_atomic_helper.c | 16 ++++++--- drivers/gpu/drm/drm_crtc_helper.c | 3 +- drivers/gpu/drm/drm_fb_helper.c | 41 ++++++++++++---------- drivers/gpu/drm/gma500/gma_display.c | 3 +- drivers/gpu/drm/gma500/mdfld_dsi_output.c | 5 +-- drivers/gpu/drm/gma500/psb_intel_drv.h | 3 +- drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c | 3 +- drivers/gpu/drm/i2c/tda998x_drv.c | 3 +- drivers/gpu/drm/i915/intel_dp_mst.c | 9 +++-- drivers/gpu/drm/imx/imx-ldb.c | 5 +-- drivers/gpu/drm/imx/imx-tve.c | 5 +-- drivers/gpu/drm/imx/parallel-display.c | 5 +-- drivers/gpu/drm/mediatek/mtk_hdmi.c | 3 +- drivers/gpu/drm/mgag200/mgag200_mode.c | 5 +-- drivers/gpu/drm/msm/dsi/dsi_manager.c | 3 +- drivers/gpu/drm/nouveau/dispnv50/disp.c | 3 +- drivers/gpu/drm/nouveau/nouveau_connector.c | 3 +- drivers/gpu/drm/qxl/qxl_display.c | 3 +- drivers/gpu/drm/radeon/radeon_connectors.c | 40 +++++++++++---------- drivers/gpu/drm/radeon/radeon_dp_mst.c | 5 +-- drivers/gpu/drm/shmobile/shmob_drm_crtc.c | 3 +- drivers/gpu/drm/tilcdc/tilcdc_panel.c | 5 +-- drivers/gpu/drm/tilcdc/tilcdc_tfp410.c | 5 +-- drivers/gpu/drm/udl/udl_connector.c | 3 +- drivers/staging/vboxvideo/vbox_mode.c | 5 +-- include/drm/drm_atomic_helper.h | 3 +- include/drm/drm_modeset_helper_vtables.h | 6 ++-- 36 files changed, 155 insertions(+), 106 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c +18
-15@@ -135,7 +135,8 @@ int amdgpu_connector_get_monitor_bpc(struct drm_connector *connector)else {const struct drm_connector_helper_funcs *connector_funcs = connector->helper_private; -struct drm_encoder *encoder = connector_funcs->best_encoder (connector); +struct drm_encoder *encoder = connector_funcs->best_encoder (connector, +NULL );struct amdgpu_encoder *amdgpu_encoder =to_amdgpu_encoder (encoder);struct amdgpu_encoder_atom_dig *dig = amdgpu_encoder->enc_priv;@@ -218,7 +219,7 @@ amdgpu_connector_update_scratch_regs(struct drm_connector *connector,bool connected;int i; - best_encoder = connector_funcs->best_encoder (connector); + best_encoder = connector_funcs->best_encoder (connector,NULL );for (i =0 ; i <DRM_CONNECTOR_MAX_ENCODER ; i++) {if (connector->encoder_ids[i] ==0 )@@ -358,7 +359,8 @@ static int amdgpu_connector_ddc_get_modes(struct drm_connector *connector) }static struct drm_encoder * -amdgpu_connector_best_single_encoder (struct drm_connector *connector) +amdgpu_connector_best_single_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {int enc_id = connector->encoder_ids[0 ];@@ -370,7 +372,7 @@ amdgpu_connector_best_single_encoder(struct drm_connector *connector)static void amdgpu_get_native_mode (struct drm_connector *connector) { -struct drm_encoder *encoder =amdgpu_connector_best_single_encoder (connector); +struct drm_encoder *encoder =amdgpu_connector_best_single_encoder (connector,NULL );struct amdgpu_encoder *amdgpu_encoder;if (encoder ==NULL )@@ -593,7 +595,7 @@ static int amdgpu_connector_set_property(struct drm_connector *connector, amdgpu_encoder =to_amdgpu_encoder (connector->encoder); }else {const struct drm_connector_helper_funcs *connector_funcs = connector->helper_private; - amdgpu_encoder =to_amdgpu_encoder (connector_funcs->best_encoder (connector)); + amdgpu_encoder =to_amdgpu_encoder (connector_funcs->best_encoder (connector,NULL )); }switch (val) {@@ -663,7 +665,7 @@ static int amdgpu_connector_lvds_get_modes(struct drm_connector *connector)amdgpu_connector_get_edid (connector); ret =amdgpu_connector_ddc_get_modes (connector);if (ret >0 ) { - encoder =amdgpu_connector_best_single_encoder (connector); + encoder =amdgpu_connector_best_single_encoder (connector,NULL );if (encoder) {amdgpu_connector_fixup_lcd_native_mode (encoder, connector);/* add scaled modes */ @@ -672,7 +674,7 @@ static int amdgpu_connector_lvds_get_modes(struct drm_connector *connector)return ret; } - encoder =amdgpu_connector_best_single_encoder (connector); + encoder =amdgpu_connector_best_single_encoder (connector,NULL );if (!encoder)return 0 ;@@ -694,7 +696,7 @@ static int amdgpu_connector_lvds_get_modes(struct drm_connector *connector)static enum drm_mode_status amdgpu_connector_lvds_mode_valid (struct drm_connector *connector,struct drm_display_mode *mode) { -struct drm_encoder *encoder =amdgpu_connector_best_single_encoder (connector); +struct drm_encoder *encoder =amdgpu_connector_best_single_encoder (connector,NULL );if ((mode->hdisplay <320 ) || (mode->vdisplay <240 ))return MODE_PANEL ;@@ -725,7 +727,7 @@ static enum drm_connector_status amdgpu_connector_lvds_detect(struct drm_connector *connector, bool force) {struct amdgpu_connector *amdgpu_connector =to_amdgpu_connector (connector); -struct drm_encoder *encoder =amdgpu_connector_best_single_encoder (connector); +struct drm_encoder *encoder =amdgpu_connector_best_single_encoder (connector,NULL );enum drm_connector_status ret = connector_status_disconnected;int r;@@ -798,7 +800,7 @@ static int amdgpu_connector_set_lcd_property(struct drm_connector *connector, amdgpu_encoder =to_amdgpu_encoder (connector->encoder); else {const struct drm_connector_helper_funcs *connector_funcs = connector->helper_private; - amdgpu_encoder =to_amdgpu_encoder (connector_funcs->best_encoder (connector)); + amdgpu_encoder =to_amdgpu_encoder (connector_funcs->best_encoder (connector,NULL )); }switch (value) {@@ -873,7 +875,7 @@ amdgpu_connector_vga_detect(struct drm_connector *connector, bool force)return connector_status_disconnected; } - encoder =amdgpu_connector_best_single_encoder (connector); + encoder =amdgpu_connector_best_single_encoder (connector,NULL );if (!encoder) ret = connector_status_disconnected;@@ -1130,7 +1132,8 @@ amdgpu_connector_dvi_detect(struct drm_connector *connector, bool force)/* okay need to be smart in here about which encoder to pick */ static struct drm_encoder * -amdgpu_connector_dvi_encoder (struct drm_connector *connector) +amdgpu_connector_dvi_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {int enc_id = connector->encoder_ids[0 ];struct amdgpu_connector *amdgpu_connector =to_amdgpu_connector (connector);@@ -1224,7 +1227,7 @@ static int amdgpu_connector_dp_get_modes(struct drm_connector *connector) {struct amdgpu_connector *amdgpu_connector =to_amdgpu_connector (connector);struct amdgpu_connector_atom_dig *amdgpu_dig_connector = amdgpu_connector->con_priv; -struct drm_encoder *encoder =amdgpu_connector_best_single_encoder (connector); +struct drm_encoder *encoder =amdgpu_connector_best_single_encoder (connector,NULL );int ret; if ((connector->connector_type == DRM_MODE_CONNECTOR_eDP) ||@@ -1363,7 +1366,7 @@ amdgpu_connector_dp_detect(struct drm_connector *connector, bool force)struct amdgpu_connector *amdgpu_connector =to_amdgpu_connector (connector);enum drm_connector_status ret = connector_status_disconnected;struct amdgpu_connector_atom_dig *amdgpu_dig_connector = amdgpu_connector->con_priv; -struct drm_encoder *encoder =amdgpu_connector_best_single_encoder (connector); +struct drm_encoder *encoder =amdgpu_connector_best_single_encoder (connector,NULL );int r;if (!drm_kms_helper_is_poll_worker ()) {@@ -1458,7 +1461,7 @@ static enum drm_mode_status amdgpu_connector_dp_mode_valid(struct drm_connectorif ((connector->connector_type == DRM_MODE_CONNECTOR_eDP) || (connector->connector_type ==DRM_MODE_CONNECTOR_LVDS )) { -struct drm_encoder *encoder =amdgpu_connector_best_single_encoder (connector); +struct drm_encoder *encoder =amdgpu_connector_best_single_encoder (connector,NULL );if ((mode->hdisplay <320 ) || (mode->vdisplay <240 ))return MODE_PANEL ;drivers/gpu/drm/amd/amdgpu/dce_virtual.c +2
-1@@ -267,7 +267,8 @@ static int dce_virtual_early_init(void *handle) }static struct drm_encoder * -dce_virtual_encoder (struct drm_connector *connector) +dce_virtual_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {int enc_id = connector->encoder_ids[0 ];struct drm_encoder *encoder;drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +4
-3@@ -2758,7 +2758,8 @@ static const struct drm_connector_funcs amdgpu_dm_connector_funcs = { .atomic_get_property = amdgpu_dm_connector_atomic_get_property }; -static struct drm_encoder *best_encoder (struct drm_connector *connector) +static struct drm_encoder *best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {int enc_id = connector->encoder_ids[0 ];struct drm_mode_object *obj;@@ -3304,7 +3305,7 @@ static void amdgpu_dm_get_native_mode(struct drm_connector *connector)struct drm_encoder *encoder;struct amdgpu_encoder *amdgpu_encoder; - encoder = helper->best_encoder (connector); + encoder = helper->best_encoder (connector,NULL );if (encoder ==NULL )return ;@@ -3438,7 +3439,7 @@ static int amdgpu_dm_connector_get_modes(struct drm_connector *connector)struct drm_encoder *encoder;struct edid *edid = amdgpu_dm_connector->edid; - encoder = helper->best_encoder (connector); + encoder = helper->best_encoder (connector,NULL );amdgpu_dm_connector_ddc_get_modes (connector, edid);amdgpu_dm_connector_add_common_modes (encoder, connector);drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +3
-2@@ -269,7 +269,8 @@ static int dm_dp_mst_get_modes(struct drm_connector *connector)return ret; } -static struct drm_encoder *dm_mst_best_encoder (struct drm_connector *connector) +static struct drm_encoder *dm_mst_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {struct amdgpu_dm_connector *amdgpu_dm_connector =to_amdgpu_dm_connector (connector);@@ -302,7 +303,7 @@ dm_dp_create_fake_mst_encoder(struct amdgpu_dm_connector *connector)const struct drm_connector_helper_funcs *connector_funcs = connector->base.helper_private;struct drm_encoder *enc_master = - connector_funcs->best_encoder (&connector->base); + connector_funcs->best_encoder (&connector->base,NULL );DRM_DEBUG_KMS ("enc master is %p\n" , enc_master); amdgpu_encoder =kzalloc (sizeof (*amdgpu_encoder),GFP_KERNEL );drivers/gpu/drm/ast/ast_mode.c +2
-1@@ -709,7 +709,8 @@ static void ast_encoder_destroy(struct drm_encoder *encoder) } -static struct drm_encoder *ast_best_single_encoder (struct drm_connector *connector) +static struct drm_encoder *ast_best_single_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {int enc_id = connector->encoder_ids[0 ];/* pick the encoder ids */ drivers/gpu/drm/bochs/bochs_kms.c +2
-1@@ -208,7 +208,8 @@ static enum drm_mode_status bochs_connector_mode_valid(struct drm_connector *con }static struct drm_encoder * -bochs_connector_best_encoder (struct drm_connector *connector) +bochs_connector_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {int enc_id = connector->encoder_ids[0 ];/* pick the encoder ids */ drivers/gpu/drm/bridge/analogix/analogix_dp_core.c +2
-1@@ -1137,7 +1137,8 @@ static int analogix_dp_get_modes(struct drm_connector *connector) }static struct drm_encoder * -analogix_dp_best_encoder (struct drm_connector *connector) +analogix_dp_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {struct analogix_dp_device *dp =to_dp (connector);drivers/gpu/drm/bridge/tc358767.c +2
-1@@ -1155,7 +1155,8 @@ static void tc_connector_set_polling(struct tc_data *tc, }static struct drm_encoder * -tc_connector_best_encoder (struct drm_connector *connector) +tc_connector_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {struct tc_data *tc =connector_to_tc (connector);drivers/gpu/drm/cirrus/cirrus_mode.c +3
-2@@ -451,8 +451,9 @@ static int cirrus_vga_get_modes(struct drm_connector *connector)return count; } -static struct drm_encoder *cirrus_connector_best_encoder (struct drm_connector - *connector) +static struct drm_encoder * +cirrus_connector_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {int enc_id = connector->encoder_ids[0 ];/* pick the encoder ids */ drivers/gpu/drm/drm_atomic_helper.c +11
-5@@ -115,9 +115,11 @@ static int handle_conflicting_encoders(struct drm_atomic_state *state,if (funcs->atomic_best_encoder) new_encoder = funcs->atomic_best_encoder (connector, new_conn_state);else if (funcs->best_encoder) - new_encoder = funcs->best_encoder (connector); + new_encoder = funcs->best_encoder (connector, + new_conn_state->crtc);else - new_encoder =drm_atomic_helper_best_encoder (connector); + new_encoder =drm_atomic_helper_best_encoder (connector, + new_conn_state->crtc);if (new_encoder) {if (encoder_mask & (1 <<drm_encoder_index (new_encoder))) {@@ -312,9 +314,11 @@ update_connector_routing(struct drm_atomic_state *state, new_encoder = funcs->atomic_best_encoder (connector, new_connector_state); else if (funcs->best_encoder) - new_encoder = funcs->best_encoder (connector); + new_encoder = funcs->best_encoder (connector, + new_connector_state->crtc); else - new_encoder =drm_atomic_helper_best_encoder (connector); + new_encoder =drm_atomic_helper_best_encoder (connector, + new_connector_state->crtc);if (!new_encoder) { DRM_DEBUG_ATOMIC("No suitable encoder found for [CONNECTOR:%d:%s]\n",@@ -3318,13 +3322,15 @@ EXPORT_SYMBOL(drm_atomic_helper_page_flip_target);* drm_atomic_helper_best_encoder - Helper for * &drm_connector_helper_funcs.best_encoder callback * @connector: Connector control structure +* @crtc: DRM crtc * * This is a &drm_connector_helper_funcs.best_encoder callback helper for * connectors that support exactly 1 encoder, statically determined at driver * init time. */ struct drm_encoder * -drm_atomic_helper_best_encoder (struct drm_connector *connector) +drm_atomic_helper_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {WARN_ON (connector->encoder_ids[1 ]);return drm_encoder_find (connector->dev,NULL , connector->encoder_ids[0 ]);drivers/gpu/drm/drm_crtc_helper.c +2
-1@@ -637,7 +637,8 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set, new_encoder = connector->encoder;for (ro =0 ; ro < set->num_connectors; ro++) {if (set->connectors[ro] == connector) { - new_encoder = connector_funcs->best_encoder (connector); + new_encoder = connector_funcs->best_encoder (connector, + set->crtc);/* if we can't get an encoder for a connector we are setting now - then fail */ if (new_encoder ==NULL )drivers/gpu/drm/drm_fb_helper.c +22
-19@@ -2331,9 +2331,8 @@ static int drm_pick_crtcs(struct drm_fb_helper *fb_helper,int c, o;struct drm_connector *connector;const struct drm_connector_helper_funcs *connector_funcs; -struct drm_encoder *encoder;int my_score, best_score, score; -struct drm_fb_helper_crtc **crtcs, *crtc; +struct drm_fb_helper_crtc **crtcs;struct drm_fb_helper_connector *fb_helper_conn;if (n == fb_helper->connector_count)@@ -2362,28 +2361,32 @@ static int drm_pick_crtcs(struct drm_fb_helper *fb_helper, connector_funcs = connector->helper_private; -/* -* If the DRM device implements atomic hooks and ->best_encoder() is -* NULL we fallback to the default drm_atomic_helper_best_encoder() -* helper. -*/ -if (drm_drv_uses_atomic_modeset (fb_helper->dev) && - !connector_funcs->best_encoder) - encoder =drm_atomic_helper_best_encoder (connector); -else - encoder = connector_funcs->best_encoder (connector); - -if (!encoder) - goto out; -/* * select a crtc for this connector and then attempt to configure * remaining connectors */ for (c =0 ; c < fb_helper->crtc_count; c++) { - crtc = &fb_helper->crtc_info[c]; +struct drm_encoder *encoder; +struct drm_fb_helper_crtc *crtc = &fb_helper->crtc_info[c]; -if ((encoder->possible_crtcs & (1 << c)) ==0 ) +/* +* If the DRM device implements atomic hooks and ->best_encoder() is +* NULL we fallback to the default drm_atomic_helper_best_encoder() +* helper. +*/ +if (drm_drv_uses_atomic_modeset (fb_helper->dev) && + !connector_funcs->best_encoder) + encoder =drm_atomic_helper_best_encoder (connector, + crtc->mode_set.crtc); +else + encoder = connector_funcs->best_encoder (connector, + crtc->mode_set.crtc); + +if (!encoder) +continue ; + +if ((encoder->possible_crtcs & +drm_crtc_mask (crtc->mode_set.crtc)) ==0 )continue ;for (o =0 ; o < n; o++)@@ -2410,7 +2413,7 @@ static int drm_pick_crtcs(struct drm_fb_helper *fb_helper, sizeof(struct drm_fb_helper_crtc *)); } } -out: +kfree (crtcs);return best_score; }drivers/gpu/drm/gma500/gma_display.c +2
-1@@ -652,7 +652,8 @@ void gma_encoder_destroy(struct drm_encoder *encoder) }/* Currently there is only a 1:1 mapping of encoders and connectors */ -struct drm_encoder *gma_best_encoder (struct drm_connector *connector) +struct drm_encoder *gma_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {struct gma_encoder *gma_encoder =gma_attached_encoder (connector);drivers/gpu/drm/gma500/mdfld_dsi_output.c +3
-2@@ -377,8 +377,9 @@ static enum drm_mode_status mdfld_dsi_connector_mode_valid(struct drm_connectorreturn MODE_OK ; } -static struct drm_encoder *mdfld_dsi_connector_best_encoder ( -struct drm_connector *connector) +static struct drm_encoder * +mdfld_dsi_connector_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {struct mdfld_dsi_connector *dsi_connector =mdfld_dsi_connector (connector);drivers/gpu/drm/gma500/psb_intel_drv.h +2
-1@@ -230,7 +230,8 @@ extern void oaktrail_lvds_i2c_init(struct drm_encoder *encoder);extern void mid_dsi_init (struct drm_device *dev,struct psb_intel_mode_device *mode_dev,int dsi_num); -extern struct drm_encoder *gma_best_encoder (struct drm_connector *connector); +extern struct drm_encoder *gma_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc);extern void gma_connector_attach_encoder (struct gma_connector *connector,struct gma_encoder *encoder);drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c +2
-1@@ -34,7 +34,8 @@ static enum drm_mode_status hibmc_connector_mode_valid(struct drm_connector *con }static struct drm_encoder * -hibmc_connector_best_encoder (struct drm_connector *connector) +hibmc_connector_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {return drm_encoder_find (connector->dev,NULL , connector->encoder_ids[0 ]); }drivers/gpu/drm/i2c/tda998x_drv.c +2
-1@@ -1267,7 +1267,8 @@ static enum drm_mode_status tda998x_connector_mode_valid(struct drm_connector *c }static struct drm_encoder * -tda998x_connector_best_encoder (struct drm_connector *connector) +tda998x_connector_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {struct tda998x_priv *priv =conn_to_tda998x_priv (connector);drivers/gpu/drm/i915/intel_dp_mst.c +6
-3@@ -403,20 +403,23 @@ static struct drm_encoder *intel_mst_atomic_best_encoder(struct drm_connector *creturn &intel_dp->mst_encoders[crtc->pipe]->base.base; } -static struct drm_encoder *intel_mst_best_encoder (struct drm_connector *connector) +static struct drm_encoder *intel_mst_best_encoder (struct drm_connector *connector, +struct drm_crtc *_crtc) {struct intel_connector *intel_connector =to_intel_connector (connector);struct intel_dp *intel_dp = intel_connector->mst_port; +struct intel_crtc *crtc =to_intel_crtc (_crtc); +if (!intel_dp)return NULL ; -return &intel_dp->mst_encoders[0 ]->base.base; +return &intel_dp->mst_encoders[crtc->pipe]->base.base; }static const struct drm_connector_helper_funcs intel_dp_mst_connector_helper_funcs = { .get_modes = intel_dp_mst_get_modes, .mode_valid = intel_dp_mst_mode_valid, .atomic_best_encoder = intel_mst_atomic_best_encoder, - .best_encoder = intel_mst_best_encoder, + .best_encoder = intel_mst_best_encoder,/* only for fb_helper */ .atomic_check = intel_dp_mst_atomic_check, };drivers/gpu/drm/imx/imx-ldb.c +3
-2@@ -163,8 +163,9 @@ static int imx_ldb_connector_get_modes(struct drm_connector *connector)return num_modes; } -static struct drm_encoder *imx_ldb_connector_best_encoder ( -struct drm_connector *connector) +static struct drm_encoder * +imx_ldb_connector_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {struct imx_ldb_channel *imx_ldb_ch =con_to_imx_ldb_ch (connector);drivers/gpu/drm/imx/imx-tve.c +3
-2@@ -265,8 +265,9 @@ static int imx_tve_connector_mode_valid(struct drm_connector *connector,return MODE_BAD ; } -static struct drm_encoder *imx_tve_connector_best_encoder ( -struct drm_connector *connector) +static struct drm_encoder * +imx_tve_connector_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {struct imx_tve *tve =con_to_tve (connector);drivers/gpu/drm/imx/parallel-display.c +3
-2@@ -89,8 +89,9 @@ static int imx_pd_connector_get_modes(struct drm_connector *connector)return num_modes; } -static struct drm_encoder *imx_pd_connector_best_encoder ( -struct drm_connector *connector) +static struct drm_encoder * +imx_pd_connector_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {struct imx_parallel_display *imxpd =con_to_imxpd (connector);drivers/gpu/drm/mediatek/mtk_hdmi.c +2
-1@@ -1253,7 +1253,8 @@ static int mtk_hdmi_conn_mode_valid(struct drm_connector *conn,return drm_mode_validate_size (mode,0x1fff ,0x1fff ); } -static struct drm_encoder *mtk_hdmi_conn_best_enc (struct drm_connector *conn) +static struct drm_encoder *mtk_hdmi_conn_best_enc (struct drm_connector *conn, +struct drm_crtc *crtc) {struct mtk_hdmi *hdmi =hdmi_ctx_from_conn (conn);drivers/gpu/drm/mgag200/mgag200_mode.c +3
-2@@ -1664,8 +1664,9 @@ static enum drm_mode_status mga_vga_mode_valid(struct drm_connector *connector,return MODE_OK ; } -static struct drm_encoder *mga_connector_best_encoder (struct drm_connector - *connector) +static struct drm_encoder * +mga_connector_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {int enc_id = connector->encoder_ids[0 ];/* pick the encoder ids */ drivers/gpu/drm/msm/dsi/dsi_manager.c +2
-1@@ -426,7 +426,8 @@ static int dsi_mgr_connector_mode_valid(struct drm_connector *connector, }static struct drm_encoder * -dsi_mgr_connector_best_encoder (struct drm_connector *connector) +dsi_mgr_connector_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {int id =dsi_mgr_connector_get_id (connector);struct msm_dsi *msm_dsi =dsi_mgr_get_dsi (id);drivers/gpu/drm/nouveau/dispnv50/disp.c +2
-1@@ -826,7 +826,8 @@ nv50_mstc_atomic_best_encoder(struct drm_connector *connector, }static struct drm_encoder * -nv50_mstc_best_encoder (struct drm_connector *connector) +nv50_mstc_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {struct nv50_mstc *mstc =nv50_mstc (connector);if (mstc->port) {drivers/gpu/drm/nouveau/nouveau_connector.c +2
-1@@ -1063,7 +1063,8 @@ nouveau_connector_mode_valid(struct drm_connector *connector, }static struct drm_encoder * -nouveau_connector_best_encoder (struct drm_connector *connector) +nouveau_connector_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {struct nouveau_connector *nv_connector =nouveau_connector (connector);drivers/gpu/drm/qxl/qxl_display.c +2
-1@@ -978,7 +978,8 @@ static enum drm_mode_status qxl_conn_mode_valid(struct drm_connector *connector,return MODE_BAD ; } -static struct drm_encoder *qxl_best_encoder (struct drm_connector *connector) +static struct drm_encoder *qxl_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {struct qxl_output *qxl_output =drm_connector_to_qxl_output (connector);drivers/gpu/drm/radeon/radeon_connectors.c +21
-19@@ -158,7 +158,7 @@ int radeon_get_monitor_bpc(struct drm_connector *connector)else if (ASIC_IS_DCE41 (rdev) ||ASIC_IS_DCE5 (rdev)) {const struct drm_connector_helper_funcs *connector_funcs = connector->helper_private; -struct drm_encoder *encoder = connector_funcs->best_encoder (connector); +struct drm_encoder *encoder = connector_funcs->best_encoder (connector,NULL );struct radeon_encoder *radeon_encoder =to_radeon_encoder (encoder);struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv;@@ -250,7 +250,7 @@ radeon_connector_update_scratch_regs(struct drm_connector *connector, enum drm_cbool connected;int i; - best_encoder = connector_funcs->best_encoder (connector); + best_encoder = connector_funcs->best_encoder (connector,NULL );for (i =0 ; i <DRM_CONNECTOR_MAX_ENCODER ; i++) {if (connector->encoder_ids[i] ==0 )@@ -391,7 +391,8 @@ static int radeon_ddc_get_modes(struct drm_connector *connector)return 0 ; } -static struct drm_encoder *radeon_best_single_encoder (struct drm_connector *connector) +static struct drm_encoder *radeon_best_single_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {int enc_id = connector->encoder_ids[0 ];/* pick the encoder ids */ @@ -402,7 +403,7 @@ static struct drm_encoder *radeon_best_single_encoder(struct drm_connector *connstatic void radeon_get_native_mode (struct drm_connector *connector) { -struct drm_encoder *encoder =radeon_best_single_encoder (connector); +struct drm_encoder *encoder =radeon_best_single_encoder (connector,NULL );struct radeon_encoder *radeon_encoder;if (encoder ==NULL )@@ -728,7 +729,7 @@ static int radeon_connector_set_property(struct drm_connector *connector, struct radeon_encoder =to_radeon_encoder (connector->encoder); else {const struct drm_connector_helper_funcs *connector_funcs = connector->helper_private; - radeon_encoder =to_radeon_encoder (connector_funcs->best_encoder (connector)); + radeon_encoder =to_radeon_encoder (connector_funcs->best_encoder (connector,NULL )); }switch (val) {@@ -755,7 +756,7 @@ static int radeon_connector_set_property(struct drm_connector *connector, struct radeon_encoder =to_radeon_encoder (connector->encoder); else {const struct drm_connector_helper_funcs *connector_funcs = connector->helper_private; - radeon_encoder =to_radeon_encoder (connector_funcs->best_encoder (connector)); + radeon_encoder =to_radeon_encoder (connector_funcs->best_encoder (connector,NULL )); }if (radeon_encoder->output_csc == val)@@ -824,7 +825,7 @@ static int radeon_lvds_get_modes(struct drm_connector *connector)radeon_connector_get_edid (connector); ret =radeon_ddc_get_modes (connector);if (ret >0 ) { - encoder =radeon_best_single_encoder (connector); + encoder =radeon_best_single_encoder (connector,NULL );if (encoder) {radeon_fixup_lvds_native_mode (encoder, connector);/* add scaled modes */ @@ -833,7 +834,7 @@ static int radeon_lvds_get_modes(struct drm_connector *connector)return ret; } - encoder =radeon_best_single_encoder (connector); + encoder =radeon_best_single_encoder (connector,NULL );if (!encoder)return 0 ;@@ -855,7 +856,7 @@ static int radeon_lvds_get_modes(struct drm_connector *connector)static enum drm_mode_status radeon_lvds_mode_valid (struct drm_connector *connector,struct drm_display_mode *mode) { -struct drm_encoder *encoder =radeon_best_single_encoder (connector); +struct drm_encoder *encoder =radeon_best_single_encoder (connector,NULL );if ((mode->hdisplay <320 ) || (mode->vdisplay <240 ))return MODE_PANEL ;@@ -888,7 +889,7 @@ radeon_lvds_detect(struct drm_connector *connector, bool force)struct drm_device *dev = connector->dev;struct radeon_device *rdev = dev->dev_private;struct radeon_connector *radeon_connector =to_radeon_connector (connector); -struct drm_encoder *encoder =radeon_best_single_encoder (connector); +struct drm_encoder *encoder =radeon_best_single_encoder (connector,NULL );enum drm_connector_status ret = connector_status_disconnected;int r;@@ -965,7 +966,7 @@ static int radeon_lvds_set_property(struct drm_connector *connector, radeon_encoder =to_radeon_encoder (connector->encoder); else {const struct drm_connector_helper_funcs *connector_funcs = connector->helper_private; - radeon_encoder =to_radeon_encoder (connector_funcs->best_encoder (connector)); + radeon_encoder =to_radeon_encoder (connector_funcs->best_encoder (connector,NULL )); }switch (value) {@@ -1044,7 +1045,7 @@ radeon_vga_detect(struct drm_connector *connector, bool force)return connector_status_disconnected; } - encoder =radeon_best_single_encoder (connector); + encoder =radeon_best_single_encoder (connector,NULL );if (!encoder) ret = connector_status_disconnected;@@ -1139,7 +1140,7 @@ static int radeon_tv_get_modes(struct drm_connector *connector)struct drm_display_mode *tv_mode;struct drm_encoder *encoder; - encoder =radeon_best_single_encoder (connector); + encoder =radeon_best_single_encoder (connector,NULL );if (!encoder)return 0 ;@@ -1182,7 +1183,7 @@ radeon_tv_detect(struct drm_connector *connector, bool force)return connector_status_disconnected; } - encoder =radeon_best_single_encoder (connector); + encoder =radeon_best_single_encoder (connector,NULL );if (!encoder) ret = connector_status_disconnected;else {@@ -1439,7 +1440,7 @@ radeon_dvi_detect(struct drm_connector *connector, bool force)const struct drm_connector_helper_funcs *connector_funcs = connector->helper_private; - encoder = connector_funcs->best_encoder (connector); + encoder = connector_funcs->best_encoder (connector,NULL );if (encoder && (encoder->encoder_type ==DRM_MODE_ENCODER_TMDS )) {radeon_connector_get_edid (connector);radeon_audio_detect (connector, encoder, ret);@@ -1456,7 +1457,8 @@ radeon_dvi_detect(struct drm_connector *connector, bool force) }/* okay need to be smart in here about which encoder to pick */ -static struct drm_encoder *radeon_dvi_encoder (struct drm_connector *connector) +static struct drm_encoder *radeon_dvi_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {int enc_id = connector->encoder_ids[0 ];struct radeon_connector *radeon_connector =to_radeon_connector (connector);@@ -1556,7 +1558,7 @@ static int radeon_dp_get_modes(struct drm_connector *connector) {struct radeon_connector *radeon_connector =to_radeon_connector (connector);struct radeon_connector_atom_dig *radeon_dig_connector = radeon_connector->con_priv; -struct drm_encoder *encoder =radeon_best_single_encoder (connector); +struct drm_encoder *encoder =radeon_best_single_encoder (connector,NULL );int ret; if ((connector->connector_type == DRM_MODE_CONNECTOR_eDP) ||@@ -1695,7 +1697,7 @@ radeon_dp_detect(struct drm_connector *connector, bool force)struct radeon_connector *radeon_connector =to_radeon_connector (connector);enum drm_connector_status ret = connector_status_disconnected;struct radeon_connector_atom_dig *radeon_dig_connector = radeon_connector->con_priv; -struct drm_encoder *encoder =radeon_best_single_encoder (connector); +struct drm_encoder *encoder =radeon_best_single_encoder (connector,NULL );int r;if (radeon_dig_connector->is_mst)@@ -1812,7 +1814,7 @@ static enum drm_mode_status radeon_dp_mode_valid(struct drm_connector *connectorif ((connector->connector_type == DRM_MODE_CONNECTOR_eDP) || (connector->connector_type ==DRM_MODE_CONNECTOR_LVDS )) { -struct drm_encoder *encoder =radeon_best_single_encoder (connector); +struct drm_encoder *encoder =radeon_best_single_encoder (connector,NULL );if ((mode->hdisplay <320 ) || (mode->vdisplay <240 ))return MODE_PANEL ;drivers/gpu/drm/radeon/radeon_dp_mst.c +3
-2@@ -224,7 +224,8 @@ radeon_dp_mst_mode_valid(struct drm_connector *connector, }static struct -drm_encoder *radeon_mst_best_encoder (struct drm_connector *connector) +drm_encoder *radeon_mst_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {struct radeon_connector *radeon_connector =to_radeon_connector (connector);@@ -613,7 +614,7 @@ radeon_dp_create_fake_mst_encoder(struct radeon_connector *connector)struct radeon_encoder_mst *mst_enc;struct drm_encoder *encoder;const struct drm_connector_helper_funcs *connector_funcs = connector->base.helper_private; -struct drm_encoder *enc_master = connector_funcs->best_encoder (&connector->base); +struct drm_encoder *enc_master = connector_funcs->best_encoder (&connector->base,NULL );DRM_DEBUG_KMS ("enc master is %p\n" , enc_master); radeon_encoder =kzalloc (sizeof (*radeon_encoder),GFP_KERNEL );drivers/gpu/drm/shmobile/shmob_drm_crtc.c +2
-1@@ -668,7 +668,8 @@ static int shmob_drm_connector_get_modes(struct drm_connector *connector) }static struct drm_encoder * -shmob_drm_connector_best_encoder (struct drm_connector *connector) +shmob_drm_connector_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {struct shmob_drm_connector *scon =to_shmob_connector (connector);drivers/gpu/drm/tilcdc/tilcdc_panel.c +3
-2@@ -178,8 +178,9 @@ static int panel_connector_mode_valid(struct drm_connector *connector,return tilcdc_crtc_mode_valid (priv->crtc, mode); } -static struct drm_encoder *panel_connector_best_encoder ( -struct drm_connector *connector) +static struct drm_encoder * +panel_connector_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {struct panel_connector *panel_connector =to_panel_connector (connector);return panel_connector->encoder;drivers/gpu/drm/tilcdc/tilcdc_tfp410.c +3
-2@@ -191,8 +191,9 @@ static int tfp410_connector_mode_valid(struct drm_connector *connector,return tilcdc_crtc_mode_valid (priv->crtc, mode); } -static struct drm_encoder *tfp410_connector_best_encoder ( -struct drm_connector *connector) +static struct drm_encoder * +tfp410_connector_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {struct tfp410_connector *tfp410_connector =to_tfp410_connector (connector);return tfp410_connector->encoder;drivers/gpu/drm/udl/udl_connector.c +2
-1@@ -145,7 +145,8 @@ udl_detect(struct drm_connector *connector, bool force) }static struct drm_encoder * -udl_best_single_encoder (struct drm_connector *connector) +udl_best_single_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {int enc_id = connector->encoder_ids[0 ];return drm_encoder_find (connector->dev,NULL , enc_id);drivers/staging/vboxvideo/vbox_mode.c +3
-2@@ -370,8 +370,9 @@ static void vbox_encoder_destroy(struct drm_encoder *encoder)kfree (encoder); } -static struct drm_encoder *vbox_best_single_encoder (struct drm_connector - *connector) +static struct drm_encoder * +vbox_best_single_encoder (struct drm_connector *connector, +struct drm_crtc *crtc) {int enc_id = connector->encoder_ids[0 ];include/drm/drm_atomic_helper.h +2
-1@@ -143,7 +143,8 @@ int drm_atomic_helper_page_flip_target(uint32_t target, struct drm_modeset_acquire_ctx *ctx);struct drm_encoder * -drm_atomic_helper_best_encoder (struct drm_connector *connector); +drm_atomic_helper_best_encoder (struct drm_connector *connector, +struct drm_crtc *crtc);/* default implementations for state handling */ void drm_atomic_helper_crtc_reset (struct drm_crtc *crtc);include/drm/drm_modeset_helper_vtables.h +4
-2@@ -885,7 +885,8 @@ struct drm_connector_helper_funcs {/** * @best_encoder: * -* This function should select the best encoder for the given connector. +* This function should select the best encoder for the given connector +* and crtc. For some driver internal use crtc may be NULL. * * This function is used by both the atomic helpers (in the * drm_atomic_helper_check_modeset() function) and in the legacy CRTC @@ -911,7 +912,8 @@ struct drm_connector_helper_funcs {* will ensure that encoders aren't used twice, drivers should not check * for this. */ -struct drm_encoder *(*best_encoder)(struct drm_connector *connector); +struct drm_encoder *(*best_encoder)(struct drm_connector *connector, +struct drm_crtc *crtc);/** * @atomic_best_encoder: Signature · 6 lines
2.16.4 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 20180626152325.GC13978-dv86pmgwkMBes7Z6vYuT8azUEOm+Xw19@public.gmane.org
Quoted 10 lines · Daniel Vetter
Quoted 7 lines · Ville Syrjala
From: Ville Syrjälä <[email protected]>
To pick the correct MST encoder i915 wants to know which crtc is going to be feeding us. To that end let's pass the crtc to the .best_encoder() hook. The atomic variant already knows the crtc via the connector state, but the non-atomic hooks is still being used by the
fb_helpereven on atomic drivers.Can't we instead fix the fb helpers to use
atomic_best_encoder?
We'd need a connector state for that. Not sure we want to construct a fake one on demand or something.
Quoted 4 lines
Or just
drop that code, userspace doesn't really know any better either and just needs to figure this out without the help of ->best_encoder, so it should be possible.
I have to admit I don't even remmber how userspace does this. OK, yeah so each connector has a list of encoders and each encoder has the possible_crtcs bitmask. So we should be able to just iterate through all the encoders for the connector. Not sure there couldn't be some some false positives if best_encoder() doesn't quite agree with the answer for some reason.
But yeah, this does seem like a nicer option because we can then nuke the extra .best_encoder() hook for i915 mst.
Now the question becomes whether I get to review the connecor->encoder_ids[] assignments in every driver. I suppose they should be mostly OK if userspace manages to work.
Signature · 6 lines
Ville Syrjälä Intel _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx