drm: Define a work struct for scheduling a uevent for modeset retry
Subsystems (3)
PATCH 1/7 drm: Define a work struct for scheduling a uevent for modeset retry
This work struct will be used to schedule a uevent on a separate thread. This will be scheduled after a link train failure during modeset to indicate a modeset retry request. It will get executed after the current modeset is complete and all locks are released. This was required to avoid deadlock.
v2:
* Create a generic work func not i915 specific (Daniel Vetter)
--- include/drm/drm_connector.h | 5 +++++ 1 file changed, 5 insertions(+)
include/drm/drm_connector.h +5 -0
@@ -682,6 +682,11 @@ struct drm_connector {uint8_t num_h_tile, num_v_tile;uint8_t tile_h_loc, tile_v_loc;uint16_t tile_h_size, tile_v_size; + +/* Work struct to schedule a uevent on link train failure for +* DisplayPort. +*/ +struct work_struct modeset_retry_work; };#define obj_to_connector (x) container_of(x, struct drm_connector, base)
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/7 drm: Add a new connector property for link status
A new default connector property is added for keeping
track of whether the link is good (link training passed) or link is bad (link training failed). If the link status property is not good, then userspace should fire off a new modeset at the current mode even if there have not been any changes in the mode list or connector status.
v2:
* Make this a default connector property (Daniel Vetter)
--- drivers/gpu/drm/drm_connector.c | 17 +++++++++++++++++ include/drm/drm_connector.h | 1 - include/drm/drm_crtc.h | 5 +++++ include/uapi/drm/drm_mode.h | 4 ++++ 4 files changed, 26 insertions(+), 1 deletion(-)
drivers/gpu/drm/drm_connector.c +17 -0
@@ -243,6 +243,10 @@ int drm_connector_init(struct drm_device *dev,drm_object_attach_property (&connector->base, config->dpms_property,0 ); +drm_object_attach_property (&connector->base, + config->link_status_property, +0 ); +if (drm_core_check_feature (dev,DRIVER_ATOMIC )) {drm_object_attach_property (&connector->base, config->prop_crtc_id,0 ); }
@@ -506,6 +510,12 @@ const char *drm_get_subpixel_order_name(enum subpixel_order order) }; DRM_ENUM_NAME_FN(drm_get_dpms_name, drm_dpms_enum_list) +static const struct drm_prop_enum_list drm_link_status_enum_list[] = { + {DRM_MODE_LINK_STATUS_GOOD ,"Good" }, + {DRM_MODE_LINK_STATUS_BAD ,"Bad" }, +}; +DRM_ENUM_NAME_FN (drm_get_link_status_name, drm_link_status_enum_list) +/** * drm_display_info_set_bus_formats - set the supported bus formats * @info: display info to store bus formats in
@@ -622,6 +632,13 @@ int drm_connector_create_standard_properties(struct drm_device *dev)return -ENOMEM ; dev->mode_config.tile_property = prop; + prop =drm_property_create_enum (dev,0 ,"link-status" , + drm_link_status_enum_list, +ARRAY_SIZE (drm_link_status_enum_list)); +if (!prop) +return -ENOMEM ; + dev->mode_config.link_status_property = prop; +return 0 ; }
include/drm/drm_connector.h +0 -1
@@ -759,7 +759,6 @@ int drm_mode_create_tv_properties(struct drm_device *dev,int drm_mode_create_scaling_mode_property (struct drm_device *dev);int drm_mode_create_aspect_ratio_property (struct drm_device *dev);int drm_mode_create_suggested_offset_properties (struct drm_device *dev); -int drm_mode_connector_set_path_property (struct drm_connector *connector,const char *path);int drm_mode_connector_set_tile_property (struct drm_connector *connector);
include/drm/drm_crtc.h +5 -0
@@ -1151,6 +1151,11 @@ struct drm_mode_config {*/ struct drm_property *tile_property;/** +* @link_status_property: Default connector property for link status +* of a connector as a result of link training. +*/ +struct drm_property *link_status_property; +/** * @plane_type_property: Default plane property to differentiate * CURSOR, PRIMARY and OVERLAY legacy uses of planes. */
include/uapi/drm/drm_mode.h +4 -0
@@ -121,6 +121,10 @@#define DRM_MODE_DIRTY_ON 1#define DRM_MODE_DIRTY_ANNOTATE 2 +/* Link Status options */ +#define DRM_MODE_LINK_STATUS_GOOD 0 +#define DRM_MODE_LINK_STATUS_BAD 1 +struct drm_mode_modeinfo {__u32 clock;__u16 hdisplay;
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 3/7 drm/i915: Set link status property for DP connector
In reply to Manasi NavareThis defines a helper function to set the property value. This will be used to set the link status to Bad in case of link training failures.
--- drivers/gpu/drm/i915/intel_dp.c | 16 ++++++++++++++++ drivers/gpu/drm/i915/intel_drv.h | 2 ++ 2 files changed, 18 insertions(+)
drivers/gpu/drm/i915/intel_dp.c +16 -0
@@ -4673,6 +4673,22 @@ static int intel_dp_get_modes(struct drm_connector *connector)return 0 ; } +int +intel_dp_set_link_status_property (struct drm_connector *connector, +uint64_t val) +{ +struct drm_device *dev = connector->dev; +int ret =0 ; + + ret =drm_object_property_set_value (&connector->base, + dev->mode_config.link_status_property, + val); +if (ret) +return ret; + +return ret; +} +static int intel_dp_connector_register (struct drm_connector *connector) {
drivers/gpu/drm/i915/intel_drv.h +2 -0
@@ -1397,6 +1397,8 @@ u32 skl_plane_stride(const struct drm_framebuffer *fb, int plane,bool intel_dp_init (struct drm_device *dev,i915_reg_t output_reg,enum port port);bool intel_dp_init_connector (struct intel_digital_port *intel_dig_port,struct intel_connector *intel_connector); +int intel_dp_set_link_status_property (struct drm_connector *connector, +uint64_t val);void intel_dp_set_link_params (struct intel_dp *intel_dp,int link_rate,uint8_t lane_count,bool link_mst);
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Jani Nikula
maintainerRe: [PATCH 3/7] drm/i915: Set link status property for DP connector
Quoted 27 lines · Manasi Navare
This defines a helper function to set the property value. This will be used to set the link status to Bad in case of link training failures.
Cc Jani Nikula <[email protected]>Cc Daniel Vetter <[email protected]>Cc Ville Syrjala <[email protected]>Cc Chris Wilson <[email protected]>Signed-off-by Manasi Navare <[email protected]>--- drivers/gpu/drm/i915/intel_dp.c | 16 ++++++++++++++++ drivers/gpu/drm/i915/intel_drv.h | 2 ++ 2 files changed, 18 insertions(+)drivers/gpu/drm/i915/intel_dp.c +4
-0@@ -4673,6 +4673,22 @@ static int intel_dp_get_modes(struct drm_connector *connector)return 0 ; } +int +intel_dp_set_link_status_property (struct drm_connector *connector, +uint64_t val) +{
drivers/gpu/drm/i915/intel_dp.c static int intel_dp_get_modes(struct drm_connector *connector) · line 4689
Quoted 10 lines
drivers/gpu/drm/i915/intel_dp.c +10
-0+struct drm_device *dev = connector->dev; +int ret =0 ; + + ret =drm_object_property_set_value (&connector->base, + dev->mode_config.link_status_property, + val); +if (ret) +return ret; + +return ret;
That's a difficult way to say
return drm_object_property_set_value(...);
Quoted 18 lines
drivers/gpu/drm/i915/intel_dp.c +2
-0+} +static int intel_dp_connector_register (struct drm_connector *connector) {drivers/gpu/drm/i915/intel_drv.h +2
-0@@ -1397,6 +1397,8 @@ u32 skl_plane_stride(const struct drm_framebuffer *fb, int plane,bool intel_dp_init (struct drm_device *dev,i915_reg_t output_reg,enum port port);bool intel_dp_init_connector (struct intel_digital_port *intel_dig_port,struct intel_connector *intel_connector); +int intel_dp_set_link_status_property (struct drm_connector *connector, +uint64_t val);void intel_dp_set_link_params (struct intel_dp *intel_dp,int link_rate,uint8_t lane_count,bool link_mst);
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 4/7 drm/i915: Change the placement of some static functions in intel_dp.c
In reply to Manasi NavareFrom: "Navare, Manasi D" <[email protected]>
These static helper functions are required to be used during fallback link rate implemnetation so they need to be placed at the top of the file.
v3:
* Add cleanup to other patch (Mika Kahola)
v2:
* Dont move around functions declared in intel_drv.h (Rodrigo Vivi)
--- drivers/gpu/drm/i915/intel_dp.c | 150 ++++++++++++++++++++-------------------- 1 file changed, 75 insertions(+), 75 deletions(-)
drivers/gpu/drm/i915/intel_dp.c +75 -75
@@ -213,6 +213,81 @@ static u8 intel_dp_max_lane_count(struct intel_dp *intel_dp)return max_dotclk; } +static int +intel_dp_sink_rates (struct intel_dp *intel_dp,const int **sink_rates) +{ +if (intel_dp->num_sink_rates) { + *sink_rates = intel_dp->sink_rates; +return intel_dp->num_sink_rates; + } + + *sink_rates = default_rates; + +return (intel_dp_max_link_bw (intel_dp) >>3 ) +1 ; +} + +static int +intel_dp_source_rates (struct intel_dp *intel_dp,const int **source_rates) +{ +struct intel_digital_port *dig_port =dp_to_dig_port (intel_dp); +struct drm_i915_private *dev_priv =to_i915 (dig_port->base.base.dev); +int size; + +if (IS_BROXTON (dev_priv)) { + *source_rates = bxt_rates; + size =ARRAY_SIZE (bxt_rates); + }else if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) { + *source_rates = skl_rates; + size =ARRAY_SIZE (skl_rates); + }else { + *source_rates = default_rates; + size =ARRAY_SIZE (default_rates); + } + +/* This depends on the fact that 5.4 is last value in the array */ +if (!intel_dp_source_supports_hbr2 (intel_dp)) + size--; + +return size; +} + +static int intersect_rates (const int *source_rates,int source_len, +const int *sink_rates,int sink_len, +int *common_rates) +{ +int i =0 , j =0 , k =0 ; + +while (i < source_len && j < sink_len) { +if (source_rates[i] == sink_rates[j]) { +if (WARN_ON (k >=DP_MAX_SUPPORTED_RATES )) +return k; + common_rates[k] = source_rates[i]; + ++k; + ++i; + ++j; + }else if (source_rates[i] < sink_rates[j]) { + ++i; + }else { + ++j; + } + } +return k; +} + +static int intel_dp_common_rates (struct intel_dp *intel_dp, +int *common_rates) +{ +const int *source_rates, *sink_rates; +int source_len, sink_len; + + sink_len =intel_dp_sink_rates (intel_dp, &sink_rates); + source_len =intel_dp_source_rates (intel_dp, &source_rates); + +return intersect_rates (source_rates, source_len, + sink_rates, sink_len, + common_rates); +} +static enum drm_mode_status intel_dp_mode_valid (struct drm_connector *connector,struct drm_display_mode *mode)
@@ -1291,19 +1366,6 @@ static void intel_aux_reg_init(struct intel_dp *intel_dp) intel_dp->aux.transfer = intel_dp_aux_transfer; } -static int -intel_dp_sink_rates (struct intel_dp *intel_dp,const int **sink_rates) -{ -if (intel_dp->num_sink_rates) { - *sink_rates = intel_dp->sink_rates; -return intel_dp->num_sink_rates; - } - - *sink_rates = default_rates; - -return (intel_dp_max_link_bw (intel_dp) >>3 ) +1 ; -} -bool intel_dp_source_supports_hbr2 (struct intel_dp *intel_dp) {struct intel_digital_port *dig_port =dp_to_dig_port (intel_dp);
@@ -1316,31 +1378,6 @@ bool intel_dp_source_supports_hbr2(struct intel_dp *intel_dp)return false; } -static int -intel_dp_source_rates (struct intel_dp *intel_dp,const int **source_rates) -{ -struct intel_digital_port *dig_port =dp_to_dig_port (intel_dp); -struct drm_i915_private *dev_priv =to_i915 (dig_port->base.base.dev); -int size; - -if (IS_BROXTON (dev_priv)) { - *source_rates = bxt_rates; - size =ARRAY_SIZE (bxt_rates); - }else if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) { - *source_rates = skl_rates; - size =ARRAY_SIZE (skl_rates); - }else { - *source_rates = default_rates; - size =ARRAY_SIZE (default_rates); - } - -/* This depends on the fact that 5.4 is last value in the array */ -if (!intel_dp_source_supports_hbr2 (intel_dp)) - size--; - -return size; -} -static void intel_dp_set_clock (struct intel_encoder *encoder,struct intel_crtc_state *pipe_config)
@@ -1375,43 +1412,6 @@ bool intel_dp_source_supports_hbr2(struct intel_dp *intel_dp) } } -static int intersect_rates (const int *source_rates,int source_len, -const int *sink_rates,int sink_len, -int *common_rates) -{ -int i =0 , j =0 , k =0 ; - -while (i < source_len && j < sink_len) { -if (source_rates[i] == sink_rates[j]) { -if (WARN_ON (k >=DP_MAX_SUPPORTED_RATES )) -return k; - common_rates[k] = source_rates[i]; - ++k; - ++i; - ++j; - }else if (source_rates[i] < sink_rates[j]) { - ++i; - }else { - ++j; - } - } -return k; -} - -static int intel_dp_common_rates (struct intel_dp *intel_dp, -int *common_rates) -{ -const int *source_rates, *sink_rates; -int source_len, sink_len; - - sink_len =intel_dp_sink_rates (intel_dp, &sink_rates); - source_len =intel_dp_source_rates (intel_dp, &source_rates); - -return intersect_rates (source_rates, source_len, - sink_rates, sink_len, - common_rates); -} -static void snprintf_int_array (char *str,size_t len,const int *array,int nelem) {
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Jani Nikula
maintainerRe: [PATCH 4/7] drm/i915: Change the placement of some static functions in intel_dp.c
Quoted 11 lines · Manasi Navare
From: "Navare, Manasi D" <[email protected]>
These static helper functions are required to be used during fallback link rate implemnetation so they need to be placed at the top of the file.
v3:
* Add cleanup to other patch (Mika Kahola)
v2:
* Dont move around functions declared inintel_drv.h(Rodrigo Vivi)
Quoted 5 lines
Cc Jani Nikula <[email protected]>Cc Daniel Vetter <[email protected]>Cc Ville Syrjala <[email protected]>Signed-off-by Manasi Navare <[email protected]>Reviewed-by Mika Kahola <[email protected]>
Pushed this one so we don't have to keep carrying it around. Thanks for the patch and review.
BR,
Jani.
Quoted 186 lines
--- drivers/gpu/drm/i915/intel_dp.c | 150 ++++++++++++++++++++-------------------- 1 file changed, 75 insertions(+), 75 deletions(-)drivers/gpu/drm/i915/intel_dp.c +75
-75@@ -213,6 +213,81 @@ static u8 intel_dp_max_lane_count(struct intel_dp *intel_dp)return max_dotclk; } +static int +intel_dp_sink_rates (struct intel_dp *intel_dp,const int **sink_rates) +{ +if (intel_dp->num_sink_rates) { + *sink_rates = intel_dp->sink_rates; +return intel_dp->num_sink_rates; + } + + *sink_rates = default_rates; + +return (intel_dp_max_link_bw (intel_dp) >>3 ) +1 ; +} + +static int +intel_dp_source_rates (struct intel_dp *intel_dp,const int **source_rates) +{ +struct intel_digital_port *dig_port =dp_to_dig_port (intel_dp); +struct drm_i915_private *dev_priv =to_i915 (dig_port->base.base.dev); +int size; + +if (IS_BROXTON (dev_priv)) { + *source_rates = bxt_rates; + size =ARRAY_SIZE (bxt_rates); + }else if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) { + *source_rates = skl_rates; + size =ARRAY_SIZE (skl_rates); + }else { + *source_rates = default_rates; + size =ARRAY_SIZE (default_rates); + } + +/* This depends on the fact that 5.4 is last value in the array */ +if (!intel_dp_source_supports_hbr2 (intel_dp)) + size--; + +return size; +} + +static int intersect_rates (const int *source_rates,int source_len, +const int *sink_rates,int sink_len, +int *common_rates) +{ +int i =0 , j =0 , k =0 ; + +while (i < source_len && j < sink_len) { +if (source_rates[i] == sink_rates[j]) { +if (WARN_ON (k >=DP_MAX_SUPPORTED_RATES )) +return k; + common_rates[k] = source_rates[i]; + ++k; + ++i; + ++j; + }else if (source_rates[i] < sink_rates[j]) { + ++i; + }else { + ++j; + } + } +return k; +} + +static int intel_dp_common_rates (struct intel_dp *intel_dp, +int *common_rates) +{ +const int *source_rates, *sink_rates; +int source_len, sink_len; + + sink_len =intel_dp_sink_rates (intel_dp, &sink_rates); + source_len =intel_dp_source_rates (intel_dp, &source_rates); + +return intersect_rates (source_rates, source_len, + sink_rates, sink_len, + common_rates); +} +static enum drm_mode_status intel_dp_mode_valid (struct drm_connector *connector,struct drm_display_mode *mode)@@ -1291,19 +1366,6 @@ static void intel_aux_reg_init(struct intel_dp *intel_dp) intel_dp->aux.transfer = intel_dp_aux_transfer; } -static int -intel_dp_sink_rates (struct intel_dp *intel_dp,const int **sink_rates) -{ -if (intel_dp->num_sink_rates) { - *sink_rates = intel_dp->sink_rates; -return intel_dp->num_sink_rates; - } - - *sink_rates = default_rates; - -return (intel_dp_max_link_bw (intel_dp) >>3 ) +1 ; -} -bool intel_dp_source_supports_hbr2 (struct intel_dp *intel_dp) {struct intel_digital_port *dig_port =dp_to_dig_port (intel_dp);@@ -1316,31 +1378,6 @@ bool intel_dp_source_supports_hbr2(struct intel_dp *intel_dp)return false; } -static int -intel_dp_source_rates (struct intel_dp *intel_dp,const int **source_rates) -{ -struct intel_digital_port *dig_port =dp_to_dig_port (intel_dp); -struct drm_i915_private *dev_priv =to_i915 (dig_port->base.base.dev); -int size; - -if (IS_BROXTON (dev_priv)) { - *source_rates = bxt_rates; - size =ARRAY_SIZE (bxt_rates); - }else if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) { - *source_rates = skl_rates; - size =ARRAY_SIZE (skl_rates); - }else { - *source_rates = default_rates; - size =ARRAY_SIZE (default_rates); - } - -/* This depends on the fact that 5.4 is last value in the array */ -if (!intel_dp_source_supports_hbr2 (intel_dp)) - size--; - -return size; -} -static void intel_dp_set_clock (struct intel_encoder *encoder,struct intel_crtc_state *pipe_config)@@ -1375,43 +1412,6 @@ bool intel_dp_source_supports_hbr2(struct intel_dp *intel_dp) } } -static int intersect_rates (const int *source_rates,int source_len, -const int *sink_rates,int sink_len, -int *common_rates) -{ -int i =0 , j =0 , k =0 ; - -while (i < source_len && j < sink_len) { -if (source_rates[i] == sink_rates[j]) { -if (WARN_ON (k >=DP_MAX_SUPPORTED_RATES )) -return k; - common_rates[k] = source_rates[i]; - ++k; - ++i; - ++j; - }else if (source_rates[i] < sink_rates[j]) { - ++i; - }else { - ++j; - } - } -return k; -} - -static int intel_dp_common_rates (struct intel_dp *intel_dp, -int *common_rates) -{ -const int *source_rates, *sink_rates; -int source_len, sink_len; - - sink_len =intel_dp_sink_rates (intel_dp, &sink_rates); - source_len =intel_dp_source_rates (intel_dp, &source_rates); - -return intersect_rates (source_rates, source_len, - sink_rates, sink_len, - common_rates); -} -static void snprintf_int_array (char *str,size_t len,const int *array,int nelem) {
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 5/7 drm/i915; Add a function to return index of link rate
In reply to Manasi NavareThis is required to return the index of link rate into common_rates array. This gets used to retry the link training at lower link rate.
--- drivers/gpu/drm/i915/intel_dp.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
drivers/gpu/drm/i915/intel_dp.c +15 -0
@@ -288,6 +288,21 @@ static int intel_dp_common_rates(struct intel_dp *intel_dp, common_rates); } +static int intel_dp_link_rate_index (struct intel_dp *intel_dp, +int *common_rates,int link_rate) +{ +int common_len; +int index; + + common_len =intel_dp_common_rates (intel_dp, common_rates); +for (index =0 ; index < common_len; index++) { +if (link_rate == common_rates[common_len - index -1 ]) +return common_len - index -1 ; + } + +return -1 ; +} +static enum drm_mode_status intel_dp_mode_valid (struct drm_connector *connector,struct drm_display_mode *mode)
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Jani Nikula
maintainerRe: [PATCH 5/7] drm/i915; Add a function to return index of link rate
Quoted 8 lines · Manasi Navare
This is required to return the index of link rate into
common_ratesarray. This gets used to retry the link training at lower link rate.Cc Jani Nikula <[email protected]>Cc Daniel Vetter <[email protected]>Cc Ville Syrjala <[email protected]>Signed-off-by Manasi Navare <[email protected]>
Please squash this with the following patch that uses it. No need to have it separately.
BR,
Jani.
Quoted 30 lines
--- drivers/gpu/drm/i915/intel_dp.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)drivers/gpu/drm/i915/intel_dp.c +15
-0@@ -288,6 +288,21 @@ static int intel_dp_common_rates(struct intel_dp *intel_dp, common_rates); } +static int intel_dp_link_rate_index (struct intel_dp *intel_dp, +int *common_rates,int link_rate) +{ +int common_len; +int index; + + common_len =intel_dp_common_rates (intel_dp, common_rates); +for (index =0 ; index < common_len; index++) { +if (link_rate == common_rates[common_len - index -1 ]) +return common_len - index -1 ; + } + +return -1 ; +} +static enum drm_mode_status intel_dp_mode_valid (struct drm_connector *connector,struct drm_display_mode *mode)
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 6/7 drm/i915: Find fallback link rate/lane count
In reply to Manasi NavareIf link training fails, then we need to fallback to lower link rate first and if link training fails at RBR, then fallback to lower lane count.
--- drivers/gpu/drm/i915/intel_dp.c | 28 ++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_drv.h | 6 ++++++ 2 files changed, 34 insertions(+)
drivers/gpu/drm/i915/intel_dp.c +28 -0
@@ -303,6 +303,34 @@ static int intel_dp_link_rate_index(struct intel_dp *intel_dp,return -1 ; } +void intel_dp_get_link_train_fallback_values (struct intel_dp *intel_dp, +int link_rate,uint8_t lane_count) +{ +int common_rates[DP_MAX_SUPPORTED_RATES ] = {}; +int common_len; +int link_rate_index =-1 ; + +if (!intel_dp->link_train_failed) +return ; + + common_len =intel_dp_common_rates (intel_dp, common_rates); + link_rate_index =intel_dp_link_rate_index (intel_dp, + common_rates, + link_rate); +if (link_rate_index >0 ) { + intel_dp->fallback_link_rate_index = link_rate_index -1 ; + intel_dp->fallback_link_rate = common_rates[intel_dp->fallback_link_rate_index]; + intel_dp->fallback_lane_count =intel_dp_max_lane_count (intel_dp); + }else if (lane_count >1 ) { + intel_dp->fallback_link_rate_index = common_len -1 ; + intel_dp->fallback_link_rate = common_rates[intel_dp->fallback_link_rate_index]; + intel_dp->fallback_lane_count = lane_count -1 ; + }else { +DRM_ERROR ("Link Training Unsuccessful\n" ); + intel_dp->link_train_failed = false; + } +} +static enum drm_mode_status intel_dp_mode_valid (struct drm_connector *connector,struct drm_display_mode *mode)
drivers/gpu/drm/i915/intel_drv.h +6 -0
@@ -890,6 +890,10 @@ struct intel_dp {uint32_t DP ;int link_rate;uint8_t lane_count; +int fallback_link_rate; +uint8_t fallback_lane_count; +int fallback_link_rate_index; +bool link_train_failed;uint8_t sink_count;bool link_mst;bool has_audio;
@@ -1402,6 +1406,8 @@ int intel_dp_set_link_status_property(struct drm_connector *connector,void intel_dp_set_link_params (struct intel_dp *intel_dp,int link_rate,uint8_t lane_count,bool link_mst); +void intel_dp_get_link_train_fallback_values (struct intel_dp *intel_dp, +int link_rate,uint8_t lane_count);void intel_dp_start_link_train (struct intel_dp *intel_dp);void intel_dp_stop_link_train (struct intel_dp *intel_dp);void intel_dp_sink_dpms (struct intel_dp *intel_dp,int mode);
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 7/7 drm/i915: Link Rate fallback on Link training failure
In reply to Manasi NavareIf link training at a link rate optimal for a particular mode fails during modeset's atomic commit phase, then we let the modeset complete and then retry. We save the link rate value at which link training failed and use a lower link rate to prune the modes. It will redo the modeset on the current mode at lower link rate or if the current mode gets pruned due to lower link constraints then, it will send a hotplug uevent for userspace to handle it.
This is also required to pass DP CTS tests 4.3.1.3, 4.3.1.4, 4.3.1.6.
--- drivers/gpu/drm/i915/intel_ddi.c | 22 ++++++++++++- drivers/gpu/drm/i915/intel_dp.c | 47 +++++++++++++++++++++++++-- drivers/gpu/drm/i915/intel_dp_link_training.c | 12 +++++-- drivers/gpu/drm/i915/intel_drv.h | 2 +- 4 files changed, 75 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/intel_ddi.c +21 -1
@@ -1712,6 +1712,8 @@ static void intel_ddi_pre_enable_dp(struct intel_encoder *encoder,struct intel_dp *intel_dp =enc_to_intel_dp (&encoder->base);struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);enum port port =intel_ddi_get_encoder_port (encoder); +struct intel_connector *intel_connector = intel_dp->attached_connector; +struct drm_connector *connector = &intel_connector->base;intel_dp_set_link_params (intel_dp, link_rate, lane_count, link_mst);
@@ -1722,7 +1724,25 @@ static void intel_ddi_pre_enable_dp(struct intel_encoder *encoder,intel_prepare_dp_ddi_buffers (encoder);intel_ddi_init_dp_buf_reg (encoder);intel_dp_sink_dpms (intel_dp,DRM_MODE_DPMS_ON ); -intel_dp_start_link_train (intel_dp); +if (!intel_dp_start_link_train (intel_dp)) { +DRM_DEBUG_KMS ("Link Training failed at link rate = %d, lane count = %d" , + link_rate, lane_count); + intel_dp->link_train_failed = true; +intel_dp_get_link_train_fallback_values (intel_dp, link_rate, + lane_count); +/* Schedule a Hotplug Uevent to userspace to start modeset */ +schedule_work (&connector->modeset_retry_work); + }else { +DRM_DEBUG_KMS ("Link Training Passed at Link Rate = %d, Lane count = %d" , + link_rate, lane_count); + intel_dp->link_train_failed = false; + intel_dp->fallback_link_rate_index =-1 ; + intel_dp->fallback_link_rate =0 ; + intel_dp->fallback_lane_count =0 ; +intel_dp_set_link_status_property (connector, +DRM_MODE_LINK_STATUS_GOOD ); + } +if (port !=PORT_A ||INTEL_GEN (dev_priv) >=9 )intel_dp_stop_link_train (intel_dp); }
drivers/gpu/drm/i915/intel_dp.c +44 -3
77 lines not on this page · raw message
drivers/gpu/drm/i915/intel_dp_link_training.c +9 -3
@@ -310,9 +310,15 @@ void intel_dp_stop_link_train(struct intel_dp *intel_dp) DP_TRAINING_PATTERN_DISABLE); } -void +bool intel_dp_start_link_train (struct intel_dp *intel_dp) { -intel_dp_link_training_clock_recovery (intel_dp); -intel_dp_link_training_channel_equalization (intel_dp); +bool ret; + +if (intel_dp_link_training_clock_recovery (intel_dp)) { + ret =intel_dp_link_training_channel_equalization (intel_dp); +if (ret) +return true; + } +return false; }
drivers/gpu/drm/i915/intel_drv.h +1 -1
@@ -1408,7 +1408,7 @@ void intel_dp_set_link_params(struct intel_dp *intel_dp, bool link_mst);void intel_dp_get_link_train_fallback_values (struct intel_dp *intel_dp,int link_rate,uint8_t lane_count); -void intel_dp_start_link_train (struct intel_dp *intel_dp); +bool intel_dp_start_link_train (struct intel_dp *intel_dp);void intel_dp_stop_link_train (struct intel_dp *intel_dp);void intel_dp_sink_dpms (struct intel_dp *intel_dp,int mode);void intel_dp_encoder_reset (struct drm_encoder *encoder);
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for series starting with [1/7] drm: Define a work struct for scheduling a uevent for modeset retry
In reply to Manasi Navare== Series Details ==
== Series Details ==
Series: series starting with [1/7] drm: Define a work struct for scheduling a uevent for modeset retry
URL : https://patchwork.freedesktop.org/series/14442/
State : failure
== Summary ==
Series 14442v1 Series without cover letter
https://patchwork.freedesktop.org/api/1.0/series/14442/revisions/1/mbox/
Test kms_pipe_crc_basic:
Subgroup hang-read-crc-pipe-a:
pass -> TIMEOUT (fi-snb-2520m)
Subgroup hang-read-crc-pipe-b:
pass -> INCOMPLETE (fi-snb-2520m)fi-bdw-5557u total:246 pass:231 dwarn:0 dfail:0 fail:0 skip:15 fi-bsw-n3050 total:246 pass:204 dwarn:0 dfail:0 fail:0 skip:42 fi-bxt-t5700 total:246 pass:216 dwarn:0 dfail:0 fail:0 skip:30 fi-byt-j1900 total:246 pass:215 dwarn:0 dfail:0 fail:0 skip:31 fi-byt-n2820 total:246 pass:211 dwarn:0 dfail:0 fail:0 skip:35 fi-hsw-4770 total:246 pass:224 dwarn:0 dfail:0 fail:0 skip:22 fi-hsw-4770r total:246 pass:223 dwarn:0 dfail:0 fail:0 skip:23 fi-ilk-650 total:246 pass:185 dwarn:0 dfail:0 fail:0 skip:61 fi-ivb-3520m total:246 pass:220 dwarn:0 dfail:0 fail:0 skip:26 fi-ivb-3770 total:246 pass:220 dwarn:0 dfail:0 fail:0 skip:26 fi-kbl-7200u total:246 pass:222 dwarn:0 dfail:0 fail:0 skip:24 fi-skl-6260u total:246 pass:232 dwarn:0 dfail:0 fail:0 skip:14 fi-skl-6700hq total:246 pass:223 dwarn:0 dfail:0 fail:0 skip:23 fi-skl-6700k total:246 pass:222 dwarn:1 dfail:0 fail:0 skip:23 fi-skl-6770hq total:246 pass:232 dwarn:0 dfail:0 fail:0 skip:14 fi-snb-2520m total:194 pass:164 dwarn:0 dfail:0 fail:0 skip:28 fi-snb-2600 total:246 pass:208 dwarn:0 dfail:0 fail:0 skip:38
5854c608e6354948f1f5e6be53132c897d0d4902 drm-intel-nightly: 2016y-10m-26d-21h-22m-02s UTC integration manifest 2953a14 drm/i915: Find fallback link rate/lane count
e208699 drm/i915; Add a function to return index of link rate
119f0ef drm/i915: Change the placement of some static functions in intel_dp.c5e242c3b drm/i915: Set link status property for DP connector
63e66a6 drm: Add a new connector property for link status
41f2ca3 drm: Define a work struct for scheduling a uevent for modeset retry
Full results at https://intel-gfx-ci.01.org/CI/Patchwork_2834/
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_2834/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Jani Nikula
maintainerQuoted 24 lines · Manasi Navare
This work struct will be used to schedule a uevent on a separate thread. This will be scheduled after a link train failure during modeset to indicate a modeset retry request. It will get executed after the current modeset is complete and all locks are released. This was required to avoid deadlock.
v2:
* Create a generic work func not i915 specific (Daniel Vetter)Cc Jani Nikula <[email protected]>Cc Daniel Vetter <[email protected]>Cc Ville Syrjala <[email protected]>Signed-off-by Manasi Navare <[email protected]>--- include/drm/drm_connector.h | 5 +++++ 1 file changed, 5 insertions(+)include/drm/drm_connector.h +0
-0
include/drm/drm_connector.h struct drm_connector { · line 689
Quoted 8 lines
include/drm/drm_connector.h +5
-0@@ -682,6 +682,11 @@ struct drm_connector {uint8_t num_h_tile, num_v_tile;uint8_t tile_h_loc, tile_v_loc;uint16_t tile_h_size, tile_v_size; + +/* Work struct to schedule a uevent on link train failure for +* DisplayPort. +*/ +struct work_struct modeset_retry_work;
I think at least for now we should keep this in intel_connector. All the code using this will be in i915.
BR,
Jani.
Quoted 3 lines
include/drm/drm_connector.h +0
-0};#define obj_to_connector (x) container_of(x, struct drm_connector, base)
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Jani Nikula
maintainerQuoted 20 lines · Jani Nikula
Quoted 19 lines · Manasi Navare
This work struct will be used to schedule a uevent on a separate thread. This will be scheduled after a link train failure during modeset to indicate a modeset retry request. It will get executed after the current modeset is complete and all locks are released. This was required to avoid deadlock.
v2:
* Create a generic work func not i915 specific (Daniel Vetter)Cc Jani Nikula <[email protected]>Cc Daniel Vetter <[email protected]>Cc Ville Syrjala <[email protected]>Signed-off-by Manasi Navare <[email protected]>--- include/drm/drm_connector.h | 5 +++++ 1 file changed, 5 insertions(+)
Quoted 16 lines
include/drm/drm_connector.h struct drm_connector { · line 689
Quoted 13 lines
include/drm/drm_connector.h +5
-0@@ -682,6 +682,11 @@ struct drm_connector {uint8_t num_h_tile, num_v_tile;uint8_t tile_h_loc, tile_v_loc;uint16_t tile_h_size, tile_v_size; + +/* Work struct to schedule a uevent on link train failure for +* DisplayPort. +*/ +struct work_struct modeset_retry_work;I think at least for now we should keep this in
intel_connector. All the code using this will be in i915.
Oh, and you can just squash that in the first patch that uses it, i.e. patch 7/7 in this series.
Quoted 7 lines
BR,
Jani.Quoted 3 lines
include/drm/drm_connector.h +0
-0};#define obj_to_connector (x) container_of(x, struct drm_connector, base)
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx