drm/i915: Convert connector properties to atomic.
Subsystems (3)
Maarten Lankhorst
maintainerv6 cover drm/i915: Convert connector properties to atomic.
This is required to allow setting i915 connector properties using the atomic ioctl. This version shouldn't cause unbisectable changes in between.
CHanges since last version:
- Split out picture_aspect_ratio and atomic scaling mode property to separate commits.
- Make sure it bisects correctly, no breaking commits while drivers are not converted yet.
Maarten Lankhorst (12):
drm/atomic: Handle picture_aspect_ratio in atomic core drm/atomic: Add support for custom scaling mode properties, v2 drm/i915: Use atomic scaling_mode instead of panel.fitting_mode drm/i915: Use per-connector scaling mode property drm/i915: Add plumbing for digital connector state, v3. drm/i915: Convert DSI connector properties to atomic. drm/i915: Convert LVDS connector properties to atomic. drm/i915: Make intel_dp->has_audio reflect hw state only drm/i915: Convert intel_dp properties to atomic, v2. drm/i915: Convert intel_hdmi connector properties to atomic drm/i915: Handle force_audio correctly in intel_sdvo drm/i915: Convert intel_sdvo connector properties to atomic.
drivers/gpu/drm/drm_atomic.c | 8 + drivers/gpu/drm/drm_connector.c | 58 ++++ drivers/gpu/drm/i915/intel_atomic.c | 135 +++++++-- drivers/gpu/drm/i915/intel_display.c | 51 +--- drivers/gpu/drm/i915/intel_dp.c | 155 ++-------- drivers/gpu/drm/i915/intel_drv.h | 35 ++- drivers/gpu/drm/i915/intel_dsi.c | 71 ++--- drivers/gpu/drm/i915/intel_hdmi.c | 165 +++------- drivers/gpu/drm/i915/intel_lvds.c | 57 +--- drivers/gpu/drm/i915/intel_sdvo.c | 562 ++++++++++++++++++----------------- include/drm/drm_connector.h | 20 ++ 11 files changed, 607 insertions(+), 710 deletions(-)
Signature · 6 lines
2.9.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Maarten Lankhorst
maintainerPATCH v6 1/12 drm/atomic: Handle picture_aspect_ratio in atomic core
This is only used in i915, which had used its own non-taomic way to deal with the picture aspect ratio. Move selected aspect_ratio to atomic state and use the atomic state in the affected i915 connectors.
--- drivers/gpu/drm/drm_atomic.c | 4 ++++ drivers/gpu/drm/i915/intel_drv.h | 1 - drivers/gpu/drm/i915/intel_hdmi.c | 18 +++--------------- drivers/gpu/drm/i915/intel_sdvo.c | 23 +++-------------------- include/drm/drm_connector.h | 10 ++++++++++ 5 files changed, 20 insertions(+), 36 deletions(-)
drivers/gpu/drm/drm_atomic.c +4 -0
@@ -1123,6 +1123,8 @@ int drm_atomic_connector_set_property(struct drm_connector *connector,*/ if (state->link_status !=DRM_LINK_STATUS_GOOD ) state->link_status = val; + }else if (property == config->aspect_ratio_property) { + state->picture_aspect_ratio = val; }else if (connector->funcs->atomic_set_property) {return connector->funcs->atomic_set_property (connector, state, property, val);
@@ -1199,6 +1201,8 @@ drm_atomic_connector_get_property(struct drm_connector *connector, *val = state->tv.hue; }else if (property == config->link_status_property) { *val = state->link_status; + }else if (property == config->aspect_ratio_property) { + *val = state->picture_aspect_ratio; }else if (connector->funcs->atomic_get_property) {return connector->funcs->atomic_get_property (connector, state, property, val);
drivers/gpu/drm/i915/intel_drv.h +0 -1
@@ -877,7 +877,6 @@ struct intel_hdmi {bool has_audio;enum hdmi_force_audio force_audio;bool rgb_quant_range_selectable; -enum hdmi_picture_aspect aspect_ratio;struct intel_connector *attached_connector; void (*write_infoframe)(struct drm_encoder *encoder, const struct intel_crtc_state *crtc_state,
drivers/gpu/drm/i915/intel_hdmi.c +3 -15
@@ -1408,7 +1408,7 @@ bool intel_hdmi_compute_config(struct intel_encoder *encoder, }/* Set user selected PAR to incoming mode's member */ - adjusted_mode->picture_aspect_ratio = intel_hdmi->aspect_ratio; + adjusted_mode->picture_aspect_ratio = conn_state->picture_aspect_ratio; pipe_config->lane_count =4 ;
@@ -1654,19 +1654,7 @@ intel_hdmi_set_property(struct drm_connector *connector, }if (property == connector->dev->mode_config.aspect_ratio_property) { -switch (val) { -case DRM_MODE_PICTURE_ASPECT_NONE : - intel_hdmi->aspect_ratio =HDMI_PICTURE_ASPECT_NONE ; -break ; -case DRM_MODE_PICTURE_ASPECT_4_3 : - intel_hdmi->aspect_ratio =HDMI_PICTURE_ASPECT_4_3 ; -break ; -case DRM_MODE_PICTURE_ASPECT_16_9 : - intel_hdmi->aspect_ratio =HDMI_PICTURE_ASPECT_16_9 ; -break ; -default : -return -EINVAL ; - } + connector->state->picture_aspect_ratio = val; goto done; }
@@ -1828,7 +1816,7 @@ intel_hdmi_add_properties(struct intel_hdmi *intel_hdmi, struct drm_connector *cintel_attach_broadcast_rgb_property (connector); intel_hdmi->color_range_auto = true;intel_attach_aspect_ratio_property (connector); - intel_hdmi->aspect_ratio =HDMI_PICTURE_ASPECT_NONE ; + connector->state->picture_aspect_ratio =HDMI_PICTURE_ASPECT_NONE ; }/*
drivers/gpu/drm/i915/intel_sdvo.c +3 -20
@@ -107,11 +107,6 @@ struct intel_sdvo {bool color_range_auto;/** -* HDMI user specified aspect ratio -*/ -enum hdmi_picture_aspect aspect_ratio; - -/** * This is set if we're going to treat the device as TV-out. * * While we have these nice friendly flags for output types that ought
@@ -1186,7 +1181,7 @@ static bool intel_sdvo_compute_config(struct intel_encoder *encoder,/* Set user selected PAR to incoming mode's member */ if (intel_sdvo->is_hdmi) - adjusted_mode->picture_aspect_ratio = intel_sdvo->aspect_ratio; + adjusted_mode->picture_aspect_ratio = conn_state->picture_aspect_ratio;return true; }
@@ -2067,19 +2062,7 @@ intel_sdvo_set_property(struct drm_connector *connector, }if (property == connector->dev->mode_config.aspect_ratio_property) { -switch (val) { -case DRM_MODE_PICTURE_ASPECT_NONE : - intel_sdvo->aspect_ratio =HDMI_PICTURE_ASPECT_NONE ; -break ; -case DRM_MODE_PICTURE_ASPECT_4_3 : - intel_sdvo->aspect_ratio =HDMI_PICTURE_ASPECT_4_3 ; -break ; -case DRM_MODE_PICTURE_ASPECT_16_9 : - intel_sdvo->aspect_ratio =HDMI_PICTURE_ASPECT_16_9 ; -break ; -default : -return -EINVAL ; - } + connector->state->picture_aspect_ratio = val; goto done; }
@@ -2418,7 +2401,7 @@ intel_sdvo_add_hdmi_properties(struct intel_sdvo *intel_sdvo, intel_sdvo->color_range_auto = true; }intel_attach_aspect_ratio_property (&connector->base.base); - intel_sdvo->aspect_ratio =HDMI_PICTURE_ASPECT_NONE ; + connector->base.base.state->picture_aspect_ratio =HDMI_PICTURE_ASPECT_NONE ; }static struct intel_sdvo_connector *intel_sdvo_connector_alloc (void )
include/drm/drm_connector.h +10 -0
@@ -25,6 +25,7 @@#include <linux/list.h> #include <linux/ctype.h> +#include <linux/hdmi.h> #include <drm/drm_mode_object.h> #include <uapi/drm/drm_mode.h>
@@ -326,6 +327,15 @@ struct drm_connector_state {struct drm_atomic_state *state;struct drm_tv_connector_state tv; + +/** +* @picture_aspect_ratio: Connector property to control the +* HDMI infoframe aspect ratio setting. +* +* The DRM_MODE_PICTURE_ASPECT_\* values much match the +* values for &enum hdmi_picture_aspect +*/ +enum hdmi_picture_aspect picture_aspect_ratio; };/**
Signature · 6 lines
2.9.3 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v6 01/12] drm/atomic: Handle picture_aspect_ratio in atomic core
Quoted 4 lines · Maarten Lankhorst
This is only used in i915, which had used its own non-taomic way to deal with the picture aspect ratio. Move selected
aspect_ratioto atomic state and use the atomic state in the affected i915 connectors.
Please correct the typo, should be non-atomic instead of non-taomic.
Manasi
Quoted 176 lines
Signed-off-by Maarten Lankhorst <[email protected]>--- drivers/gpu/drm/drm_atomic.c | 4 ++++ drivers/gpu/drm/i915/intel_drv.h | 1 - drivers/gpu/drm/i915/intel_hdmi.c | 18 +++--------------- drivers/gpu/drm/i915/intel_sdvo.c | 23 +++-------------------- include/drm/drm_connector.h | 10 ++++++++++ 5 files changed, 20 insertions(+), 36 deletions(-)drivers/gpu/drm/drm_atomic.c +4
-0@@ -1123,6 +1123,8 @@ int drm_atomic_connector_set_property(struct drm_connector *connector,*/ if (state->link_status !=DRM_LINK_STATUS_GOOD ) state->link_status = val; + }else if (property == config->aspect_ratio_property) { + state->picture_aspect_ratio = val; }else if (connector->funcs->atomic_set_property) {return connector->funcs->atomic_set_property (connector, state, property, val);@@ -1199,6 +1201,8 @@ drm_atomic_connector_get_property(struct drm_connector *connector, *val = state->tv.hue; }else if (property == config->link_status_property) { *val = state->link_status; + }else if (property == config->aspect_ratio_property) { + *val = state->picture_aspect_ratio; }else if (connector->funcs->atomic_get_property) {return connector->funcs->atomic_get_property (connector, state, property, val);drivers/gpu/drm/i915/intel_drv.h +0
-1@@ -877,7 +877,6 @@ struct intel_hdmi {bool has_audio;enum hdmi_force_audio force_audio;bool rgb_quant_range_selectable; -enum hdmi_picture_aspect aspect_ratio;struct intel_connector *attached_connector; void (*write_infoframe)(struct drm_encoder *encoder, const struct intel_crtc_state *crtc_state,drivers/gpu/drm/i915/intel_hdmi.c +3
-15@@ -1408,7 +1408,7 @@ bool intel_hdmi_compute_config(struct intel_encoder *encoder, }/* Set user selected PAR to incoming mode's member */ - adjusted_mode->picture_aspect_ratio = intel_hdmi->aspect_ratio; + adjusted_mode->picture_aspect_ratio = conn_state->picture_aspect_ratio; pipe_config->lane_count =4 ;@@ -1654,19 +1654,7 @@ intel_hdmi_set_property(struct drm_connector *connector, }if (property == connector->dev->mode_config.aspect_ratio_property) { -switch (val) { -case DRM_MODE_PICTURE_ASPECT_NONE : - intel_hdmi->aspect_ratio =HDMI_PICTURE_ASPECT_NONE ; -break ; -case DRM_MODE_PICTURE_ASPECT_4_3 : - intel_hdmi->aspect_ratio =HDMI_PICTURE_ASPECT_4_3 ; -break ; -case DRM_MODE_PICTURE_ASPECT_16_9 : - intel_hdmi->aspect_ratio =HDMI_PICTURE_ASPECT_16_9 ; -break ; -default : -return -EINVAL ; - } + connector->state->picture_aspect_ratio = val; goto done; }@@ -1828,7 +1816,7 @@ intel_hdmi_add_properties(struct intel_hdmi *intel_hdmi, struct drm_connector *cintel_attach_broadcast_rgb_property (connector); intel_hdmi->color_range_auto = true;intel_attach_aspect_ratio_property (connector); - intel_hdmi->aspect_ratio =HDMI_PICTURE_ASPECT_NONE ; + connector->state->picture_aspect_ratio =HDMI_PICTURE_ASPECT_NONE ; }/* drivers/gpu/drm/i915/intel_sdvo.c +3
-20@@ -107,11 +107,6 @@ struct intel_sdvo {bool color_range_auto;/** -* HDMI user specified aspect ratio -*/ -enum hdmi_picture_aspect aspect_ratio; - -/** * This is set if we're going to treat the device as TV-out. * * While we have these nice friendly flags for output types that ought @@ -1186,7 +1181,7 @@ static bool intel_sdvo_compute_config(struct intel_encoder *encoder,/* Set user selected PAR to incoming mode's member */ if (intel_sdvo->is_hdmi) - adjusted_mode->picture_aspect_ratio = intel_sdvo->aspect_ratio; + adjusted_mode->picture_aspect_ratio = conn_state->picture_aspect_ratio;return true; }@@ -2067,19 +2062,7 @@ intel_sdvo_set_property(struct drm_connector *connector, }if (property == connector->dev->mode_config.aspect_ratio_property) { -switch (val) { -case DRM_MODE_PICTURE_ASPECT_NONE : - intel_sdvo->aspect_ratio =HDMI_PICTURE_ASPECT_NONE ; -break ; -case DRM_MODE_PICTURE_ASPECT_4_3 : - intel_sdvo->aspect_ratio =HDMI_PICTURE_ASPECT_4_3 ; -break ; -case DRM_MODE_PICTURE_ASPECT_16_9 : - intel_sdvo->aspect_ratio =HDMI_PICTURE_ASPECT_16_9 ; -break ; -default : -return -EINVAL ; - } + connector->state->picture_aspect_ratio = val; goto done; }@@ -2418,7 +2401,7 @@ intel_sdvo_add_hdmi_properties(struct intel_sdvo *intel_sdvo, intel_sdvo->color_range_auto = true; }intel_attach_aspect_ratio_property (&connector->base.base); - intel_sdvo->aspect_ratio =HDMI_PICTURE_ASPECT_NONE ; + connector->base.base.state->picture_aspect_ratio =HDMI_PICTURE_ASPECT_NONE ; }static struct intel_sdvo_connector *intel_sdvo_connector_alloc (void )include/drm/drm_connector.h +10
-0@@ -25,6 +25,7 @@#include <linux/list.h> #include <linux/ctype.h> +#include <linux/hdmi.h> #include <drm/drm_mode_object.h> #include <uapi/drm/drm_mode.h> @@ -326,6 +327,15 @@ struct drm_connector_state {struct drm_atomic_state *state;struct drm_tv_connector_state tv; + +/** +* @picture_aspect_ratio: Connector property to control the +* HDMI infoframe aspect ratio setting. +* +* The DRM_MODE_PICTURE_ASPECT_\* values much match the +* values for &enum hdmi_picture_aspect +*/ +enum hdmi_picture_aspect picture_aspect_ratio; };/** Signature · 6 lines
2.9.3 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v6 01/12] drm/atomic: Handle picture_aspect_ratio in atomic core
In reply to Maarten LankhorstQuoted 5 lines · Maarten Lankhorst
This is only used in i915, which had used its own non-taomic way to deal with the picture aspect ratio. Move selected
aspect_ratioto atomic state and use the atomic state in the affected i915 connectors.Signed-off-by Maarten Lankhorst <[email protected]>
Quoted 175 lines
--- drivers/gpu/drm/drm_atomic.c | 4 ++++ drivers/gpu/drm/i915/intel_drv.h | 1 - drivers/gpu/drm/i915/intel_hdmi.c | 18 +++--------------- drivers/gpu/drm/i915/intel_sdvo.c | 23 +++-------------------- include/drm/drm_connector.h | 10 ++++++++++ 5 files changed, 20 insertions(+), 36 deletions(-)drivers/gpu/drm/drm_atomic.c +4
-0@@ -1123,6 +1123,8 @@ int drm_atomic_connector_set_property(struct drm_connector *connector,*/ if (state->link_status !=DRM_LINK_STATUS_GOOD ) state->link_status = val; + }else if (property == config->aspect_ratio_property) { + state->picture_aspect_ratio = val; }else if (connector->funcs->atomic_set_property) {return connector->funcs->atomic_set_property (connector, state, property, val);@@ -1199,6 +1201,8 @@ drm_atomic_connector_get_property(struct drm_connector *connector, *val = state->tv.hue; }else if (property == config->link_status_property) { *val = state->link_status; + }else if (property == config->aspect_ratio_property) { + *val = state->picture_aspect_ratio; }else if (connector->funcs->atomic_get_property) {return connector->funcs->atomic_get_property (connector, state, property, val);drivers/gpu/drm/i915/intel_drv.h +0
-1@@ -877,7 +877,6 @@ struct intel_hdmi {bool has_audio;enum hdmi_force_audio force_audio;bool rgb_quant_range_selectable; -enum hdmi_picture_aspect aspect_ratio;struct intel_connector *attached_connector; void (*write_infoframe)(struct drm_encoder *encoder, const struct intel_crtc_state *crtc_state,drivers/gpu/drm/i915/intel_hdmi.c +3
-15@@ -1408,7 +1408,7 @@ bool intel_hdmi_compute_config(struct intel_encoder *encoder, }/* Set user selected PAR to incoming mode's member */ - adjusted_mode->picture_aspect_ratio = intel_hdmi->aspect_ratio; + adjusted_mode->picture_aspect_ratio = conn_state->picture_aspect_ratio; pipe_config->lane_count =4 ;@@ -1654,19 +1654,7 @@ intel_hdmi_set_property(struct drm_connector *connector, }if (property == connector->dev->mode_config.aspect_ratio_property) { -switch (val) { -case DRM_MODE_PICTURE_ASPECT_NONE : - intel_hdmi->aspect_ratio =HDMI_PICTURE_ASPECT_NONE ; -break ; -case DRM_MODE_PICTURE_ASPECT_4_3 : - intel_hdmi->aspect_ratio =HDMI_PICTURE_ASPECT_4_3 ; -break ; -case DRM_MODE_PICTURE_ASPECT_16_9 : - intel_hdmi->aspect_ratio =HDMI_PICTURE_ASPECT_16_9 ; -break ; -default : -return -EINVAL ; - } + connector->state->picture_aspect_ratio = val; goto done; }@@ -1828,7 +1816,7 @@ intel_hdmi_add_properties(struct intel_hdmi *intel_hdmi, struct drm_connector *cintel_attach_broadcast_rgb_property (connector); intel_hdmi->color_range_auto = true;intel_attach_aspect_ratio_property (connector); - intel_hdmi->aspect_ratio =HDMI_PICTURE_ASPECT_NONE ; + connector->state->picture_aspect_ratio =HDMI_PICTURE_ASPECT_NONE ; }/* drivers/gpu/drm/i915/intel_sdvo.c +3
-20@@ -107,11 +107,6 @@ struct intel_sdvo {bool color_range_auto;/** -* HDMI user specified aspect ratio -*/ -enum hdmi_picture_aspect aspect_ratio; - -/** * This is set if we're going to treat the device as TV-out. * * While we have these nice friendly flags for output types that ought @@ -1186,7 +1181,7 @@ static bool intel_sdvo_compute_config(struct intel_encoder *encoder,/* Set user selected PAR to incoming mode's member */ if (intel_sdvo->is_hdmi) - adjusted_mode->picture_aspect_ratio = intel_sdvo->aspect_ratio; + adjusted_mode->picture_aspect_ratio = conn_state->picture_aspect_ratio;return true; }@@ -2067,19 +2062,7 @@ intel_sdvo_set_property(struct drm_connector *connector, }if (property == connector->dev->mode_config.aspect_ratio_property) { -switch (val) { -case DRM_MODE_PICTURE_ASPECT_NONE : - intel_sdvo->aspect_ratio =HDMI_PICTURE_ASPECT_NONE ; -break ; -case DRM_MODE_PICTURE_ASPECT_4_3 : - intel_sdvo->aspect_ratio =HDMI_PICTURE_ASPECT_4_3 ; -break ; -case DRM_MODE_PICTURE_ASPECT_16_9 : - intel_sdvo->aspect_ratio =HDMI_PICTURE_ASPECT_16_9 ; -break ; -default : -return -EINVAL ; - } + connector->state->picture_aspect_ratio = val; goto done; }@@ -2418,7 +2401,7 @@ intel_sdvo_add_hdmi_properties(struct intel_sdvo *intel_sdvo, intel_sdvo->color_range_auto = true; }intel_attach_aspect_ratio_property (&connector->base.base); - intel_sdvo->aspect_ratio =HDMI_PICTURE_ASPECT_NONE ; + connector->base.base.state->picture_aspect_ratio =HDMI_PICTURE_ASPECT_NONE ; }static struct intel_sdvo_connector *intel_sdvo_connector_alloc (void )include/drm/drm_connector.h +10
-0@@ -25,6 +25,7 @@#include <linux/list.h> #include <linux/ctype.h> +#include <linux/hdmi.h> #include <drm/drm_mode_object.h> #include <uapi/drm/drm_mode.h> @@ -326,6 +327,15 @@ struct drm_connector_state {struct drm_atomic_state *state;struct drm_tv_connector_state tv; + +/** +* @picture_aspect_ratio: Connector property to control the +* HDMI infoframe aspect ratio setting. +* +* The DRM_MODE_PICTURE_ASPECT_\* values much match the +* values for &enum hdmi_picture_aspect +*/ +enum hdmi_picture_aspect picture_aspect_ratio; };/** Signature · 6 lines
2.9.3 _______________________________________________ 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 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Maarten Lankhorst
maintainerPATCH v6 2/12 drm/atomic: Add support for custom scaling mode properties, v2
In reply to Maarten LankhorstSome connectors may not allow all scaling mode properties, this function will allow creating the scaling mode property with only the supported subset. It also wires up this state for atomic.
This will make it possible to convert i915 connectors to atomic.
Changes since v1:
- Add DRM_MODE_PROP_ENUM flag to drm_property_create
- Use the correct index in drm_property_add_enum.
- Add DocBook for function (Sean Paul).
- Warn if less than 2 valid scaling modes are passed.
- Remove level of indent. (Sean Paul)
--- drivers/gpu/drm/drm_atomic.c | 4 +++ drivers/gpu/drm/drm_connector.c | 58 +++++++++++++++++++++++++++++++++++++++++ include/drm/drm_connector.h | 10 +++++++ 3 files changed, 72 insertions(+)
drivers/gpu/drm/drm_atomic.c +4 -0
@@ -1125,6 +1125,8 @@ int drm_atomic_connector_set_property(struct drm_connector *connector, state->link_status = val; }else if (property == config->aspect_ratio_property) { state->picture_aspect_ratio = val; + }else if (property == connector->scaling_mode_property) { + state->scaling_mode = val; }else if (connector->funcs->atomic_set_property) {return connector->funcs->atomic_set_property (connector, state, property, val);
@@ -1203,6 +1205,8 @@ drm_atomic_connector_get_property(struct drm_connector *connector, *val = state->link_status; }else if (property == config->aspect_ratio_property) { *val = state->picture_aspect_ratio; + }else if (property == connector->scaling_mode_property) { + *val = state->scaling_mode; }else if (connector->funcs->atomic_get_property) {return connector->funcs->atomic_get_property (connector, state, property, val);
drivers/gpu/drm/drm_connector.c +58 -0
64 lines not on this page · raw message
include/drm/drm_connector.h +10 -0
@@ -336,6 +336,12 @@ struct drm_connector_state {* values for &enum hdmi_picture_aspect */ enum hdmi_picture_aspect picture_aspect_ratio; + +/** +* @scaling_mode: Connector property to control the +* upscaling, mostly used for built-in panels. +*/ +unsigned int scaling_mode; };/**
@@ -764,6 +770,8 @@ struct drm_connector {struct drm_property_blob *edid_blob_ptr;struct drm_object_properties properties; +struct drm_property *scaling_mode_property; +/** * @path_blob_ptr: *
@@ -963,6 +971,8 @@ int drm_mode_create_tv_properties(struct drm_device *dev,unsigned int num_modes, const char * const modes[]);int drm_mode_create_scaling_mode_property (struct drm_device *dev); +int drm_mode_connector_attach_scaling_mode_property (struct drm_connector *connector, +u32 scaling_mode_mask);int drm_mode_create_aspect_ratio_property (struct drm_device *dev);int drm_mode_create_suggested_offset_properties (struct drm_device *dev);
Signature · 6 lines
2.9.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v6 02/12] drm/atomic: Add support for custom scaling mode properties, v2
Quoted 25 lines · Maarten Lankhorst
Some connectors may not allow all scaling mode properties, this function will allow creating the scaling mode property with only the supported subset. It also wires up this state for atomic.
This will make it possible to convert i915 connectors to atomic.
Changes since v1:
- AddDRM_MODE_PROP_ENUMflag todrm_property_create
- Use the correct index indrm_property_add_enum.
- Add DocBook for function (Sean Paul).
- Warn if less than 2 valid scaling modes are passed.
- Remove level of indent. (Sean Paul)Signed-off-by Maarten Lankhorst <[email protected]>--- drivers/gpu/drm/drm_atomic.c | 4 +++ drivers/gpu/drm/drm_connector.c | 58 +++++++++++++++++++++++++++++++++++++++++ include/drm/drm_connector.h | 10 +++++++ 3 files changed, 72 insertions(+)drivers/gpu/drm/drm_atomic.c +0
-0
drivers/gpu/drm/drm_atomic.c int drm_atomic_connector_set_property(struct drm_connector *connector, · line 1129
Quoted 5 lines
drivers/gpu/drm/drm_atomic.c +2
-0@@ -1125,6 +1125,8 @@ int drm_atomic_connector_set_property(struct drm_connector *connector, state->link_status = val; }else if (property == config->aspect_ratio_property) { state->picture_aspect_ratio = val; + }else if (property == connector->scaling_mode_property) { + state->scaling_mode = val;
Can't we still handle mode_config->scaling_mode_property as fallback? Seems a lot more consistent to me ...
Quoted 17 lines
drivers/gpu/drm/drm_atomic.c +2
-0}else if (connector->funcs->atomic_set_property) {return connector->funcs->atomic_set_property (connector, state, property, val);@@ -1203,6 +1205,8 @@ drm_atomic_connector_get_property(struct drm_connector *connector, *val = state->link_status; }else if (property == config->aspect_ratio_property) { *val = state->picture_aspect_ratio; + }else if (property == connector->scaling_mode_property) { + *val = state->scaling_mode; }else if (connector->funcs->atomic_get_property) {return connector->funcs->atomic_get_property (connector, state, property, val);drivers/gpu/drm/drm_connector.c +0
-0
drivers/gpu/drm/drm_connector.c int drm_mode_create_scaling_mode_property(struct drm_device *dev) · line 969
Quoted 9 lines
drivers/gpu/drm/drm_connector.c +6
-0@@ -961,6 +961,64 @@ int drm_mode_create_scaling_mode_property(struct drm_device *dev)EXPORT_SYMBOL (drm_mode_create_scaling_mode_property);/** +* drm_mode_connector_attach_scaling_mode_property - attach atomic scaling mode property +* @connector: connector to attach scaling mode property on. +* @scaling_mode_mask: or'ed mask of BIT(DRM_MODE_SCALE_\*). +* +* This is used to add support for scaling mode to atomic drivers. +* The scaling mode will be set to &struct drm_connector_state->picture_aspect_ratio
s/->/./ to get a real link
drivers/gpu/drm/drm_connector.c int drm_mode_create_scaling_mode_property(struct drm_device *dev) · line 970
Quoted 1 line
drivers/gpu/drm/drm_connector.c +1
-0+* and can be used from &struct drm_connector_helper_funcs->atomic_check for validation.
Same here, plus needs &.
Please check the html output when typing docs ...
Also please link to drm_mode_create_scaling_mode_property() and from the kerneldoc of that to this one here.
drivers/gpu/drm/drm_connector.c int drm_mode_create_scaling_mode_property(struct drm_device *dev) · line 976
Quoted 6 lines
drivers/gpu/drm/drm_connector.c +6
-0+* +* Returns: +* Zero on success, negative errno on failure. +*/ +int drm_mode_connector_attach_scaling_mode_property (struct drm_connector *connector, +u32 scaling_mode_mask)
Usual prefix is just drm_connector_ (yes I know we're not consistent here, yet).
With those nits: Reviewed-by: Daniel Vetter <[email protected]>
Quoted 90 lines
drivers/gpu/drm/drm_connector.c +45
-0+{ +struct drm_device *dev = connector->dev; +struct drm_property *scaling_mode_property; +int i, j =0 ; +const unsigned valid_scaling_mode_mask = + (1U <<ARRAY_SIZE (drm_scaling_mode_enum_list)) -1 ; + +if (WARN_ON (hweight32 (scaling_mode_mask) <2 || + scaling_mode_mask & ~valid_scaling_mode_mask)) +return -EINVAL ; + + scaling_mode_property = +drm_property_create (dev,DRM_MODE_PROP_ENUM ,"scaling mode" , +hweight32 (scaling_mode_mask)); + +if (!scaling_mode_property) +return -ENOMEM ; + +for (i =0 ; i <ARRAY_SIZE (drm_scaling_mode_enum_list); i++) { +int ret; + +if (!(BIT (i) & scaling_mode_mask)) +continue ; + + ret =drm_property_add_enum (scaling_mode_property, j++, + drm_scaling_mode_enum_list[i].type, + drm_scaling_mode_enum_list[i].name); + +if (ret) { +drm_property_destroy (dev, scaling_mode_property); + +return ret; + } + } + +drm_object_attach_property (&connector->base, + scaling_mode_property,0 ); + + connector->scaling_mode_property = scaling_mode_property; + +return 0 ; +} +EXPORT_SYMBOL (drm_mode_connector_attach_scaling_mode_property); + +/** * drm_mode_create_aspect_ratio_property - create aspect ratio property * @dev: DRM device * include/drm/drm_connector.h +10
-0@@ -336,6 +336,12 @@ struct drm_connector_state {* values for &enum hdmi_picture_aspect */ enum hdmi_picture_aspect picture_aspect_ratio; + +/** +* @scaling_mode: Connector property to control the +* upscaling, mostly used for built-in panels. +*/ +unsigned int scaling_mode; };/** @@ -764,6 +770,8 @@ struct drm_connector {struct drm_property_blob *edid_blob_ptr;struct drm_object_properties properties; +struct drm_property *scaling_mode_property; +/** * @path_blob_ptr: * @@ -963,6 +971,8 @@ int drm_mode_create_tv_properties(struct drm_device *dev,unsigned int num_modes, const char * const modes[]);int drm_mode_create_scaling_mode_property (struct drm_device *dev); +int drm_mode_connector_attach_scaling_mode_property (struct drm_connector *connector, +u32 scaling_mode_mask);int drm_mode_create_aspect_ratio_property (struct drm_device *dev);int drm_mode_create_suggested_offset_properties (struct drm_device *dev);Signature · 6 lines
2.9.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Maarten Lankhorst
maintainerRe: [PATCH v6 02/12] drm/atomic: Add support for custom scaling mode properties, v2
Op 02-05-17 om 11:44 schreef Daniel Vetter:
Quoted 62 lines · Maarten Lankhorst
Quoted 25 lines
Some connectors may not allow all scaling mode properties, this function will allow creating the scaling mode property with only the supported subset. It also wires up this state for atomic.
This will make it possible to convert i915 connectors to atomic.
Changes since v1:
- AddDRM_MODE_PROP_ENUMflag todrm_property_create
- Use the correct index indrm_property_add_enum.
- Add DocBook for function (Sean Paul).
- Warn if less than 2 valid scaling modes are passed.
- Remove level of indent. (Sean Paul)Signed-off-by Maarten Lankhorst <[email protected]>--- drivers/gpu/drm/drm_atomic.c | 4 +++ drivers/gpu/drm/drm_connector.c | 58 +++++++++++++++++++++++++++++++++++++++++ include/drm/drm_connector.h | 10 +++++++ 3 files changed, 72 insertions(+)drivers/gpu/drm/drm_atomic.c +0
-0drivers/gpu/drm/drm_atomic.c int drm_atomic_connector_set_property(struct drm_connector *connector, · line 1129
Quoted 5 lines
drivers/gpu/drm/drm_atomic.c +2
-0@@ -1125,6 +1125,8 @@ int drm_atomic_connector_set_property(struct drm_connector *connector, state->link_status = val; }else if (property == config->aspect_ratio_property) { state->picture_aspect_ratio = val; + }else if (property == connector->scaling_mode_property) { + state->scaling_mode = val;Can't we still handle
mode_config->scaling_mode_propertyas fallback? Seems a lot more consistent to me ...Quoted 17 lines
drivers/gpu/drm/drm_atomic.c +2
-0}else if (connector->funcs->atomic_set_property) {return connector->funcs->atomic_set_property (connector, state, property, val);@@ -1203,6 +1205,8 @@ drm_atomic_connector_get_property(struct drm_connector *connector, *val = state->link_status; }else if (property == config->aspect_ratio_property) { *val = state->picture_aspect_ratio; + }else if (property == connector->scaling_mode_property) { + *val = state->scaling_mode; }else if (connector->funcs->atomic_get_property) {return connector->funcs->atomic_get_property (connector, state, property, val);drivers/gpu/drm/drm_connector.c +0
-0drivers/gpu/drm/drm_connector.c int drm_mode_create_scaling_mode_property(struct drm_device *dev) · line 969
Quoted 9 lines
drivers/gpu/drm/drm_connector.c +6
-0@@ -961,6 +961,64 @@ int drm_mode_create_scaling_mode_property(struct drm_device *dev)EXPORT_SYMBOL (drm_mode_create_scaling_mode_property);/** +* drm_mode_connector_attach_scaling_mode_property - attach atomic scaling mode property +* @connector: connector to attach scaling mode property on. +* @scaling_mode_mask: or'ed mask of BIT(DRM_MODE_SCALE_\*). +* +* This is used to add support for scaling mode to atomic drivers. +* The scaling mode will be set to &struct drm_connector_state->picture_aspect_ratio s/->/./ to get a real link
Quoted 7 lines
drivers/gpu/drm/drm_connector.c int drm_mode_create_scaling_mode_property(struct drm_device *dev) · line 970
Quoted 1 line
drivers/gpu/drm/drm_connector.c +1
-0+* and can be used from &struct drm_connector_helper_funcs->atomic_check for validation. Same here, plus needs &.
Please check the html output when typing docs ...
Also please link to
drm_mode_create_scaling_mode_property()and from the kerneldoc of that to this one here.
Ah right, thanks.
Quoted 10 lines
drivers/gpu/drm/drm_connector.c int drm_mode_create_scaling_mode_property(struct drm_device *dev) · line 976
Quoted 7 lines
drivers/gpu/drm/drm_connector.c +6
-0+* +* Returns: +* Zero on success, negative errno on failure. +*/ +int drm_mode_connector_attach_scaling_mode_property (struct drm_connector *connector, +u32 scaling_mode_mask)Usual prefix is just
drm_connector_(yes I know we're not consistent here, yet).
Quoted 2 lines
With those nits: Reviewed-by: Daniel Vetter <[email protected]>
Will rename. :)
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Maarten Lankhorst
maintainerPATCH v6 3/12 drm/i915: Use atomic scaling_mode instead of panel.fitting_mode
In reply to Maarten LankhorstThe first step in converting connector properties to atomic is wiring up the atomic state. We're still not completely supoprting the scaling mode in the atomic case, but this is the first step towards it.
--- drivers/gpu/drm/i915/intel_dp.c | 13 +++++-------- drivers/gpu/drm/i915/intel_drv.h | 1 - drivers/gpu/drm/i915/intel_dsi.c | 11 +++++------ drivers/gpu/drm/i915/intel_lvds.c | 11 +++++------ 4 files changed, 15 insertions(+), 21 deletions(-)
drivers/gpu/drm/i915/intel_dp.c +5 -8
@@ -1686,10 +1686,10 @@ intel_dp_compute_config(struct intel_encoder *encoder,if (HAS_GMCH_DISPLAY (dev_priv))intel_gmch_panel_fitting (intel_crtc, pipe_config, - intel_connector->panel.fitting_mode); + conn_state->scaling_mode);else intel_pch_panel_fitting (intel_crtc, pipe_config, - intel_connector->panel.fitting_mode); + conn_state->scaling_mode); }if (adjusted_mode->flags &DRM_MODE_FLAG_DBLCLK )
@@ -4828,7 +4828,6 @@ intel_dp_set_property(struct drm_connector *connector, uint64_t val) {struct drm_i915_private *dev_priv =to_i915 (connector->dev); -struct intel_connector *intel_connector =to_intel_connector (connector);struct intel_encoder *intel_encoder =intel_attached_encoder (connector);struct intel_dp *intel_dp =enc_to_intel_dp (&intel_encoder->base);int ret;
@@ -4897,11 +4896,11 @@ intel_dp_set_property(struct drm_connector *connector,return -EINVAL ; } -if (intel_connector->panel.fitting_mode == val) { +if (connector->state->scaling_mode == val) {/* the eDP scaling property is not changed */ return 0 ; } - intel_connector->panel.fitting_mode = val; + connector->state->scaling_mode = val; goto done; }
@@ -5179,8 +5178,6 @@ bool intel_dp_is_edp(struct drm_i915_private *dev_priv, enum port port)static void intel_dp_add_properties (struct intel_dp *intel_dp,struct drm_connector *connector) { -struct intel_connector *intel_connector =to_intel_connector (connector); -intel_attach_force_audio_property (connector);intel_attach_broadcast_rgb_property (connector); intel_dp->color_range_auto = true;
@@ -5191,7 +5188,7 @@ intel_dp_add_properties(struct intel_dp *intel_dp, struct drm_connector *connect &connector->base, connector->dev->mode_config.scaling_mode_property, DRM_MODE_SCALE_ASPECT); - intel_connector->panel.fitting_mode =DRM_MODE_SCALE_ASPECT ; + connector->state->scaling_mode =DRM_MODE_SCALE_ASPECT ; } }
drivers/gpu/drm/i915/intel_drv.h +0 -1
@@ -266,7 +266,6 @@ struct intel_encoder {struct intel_panel {struct drm_display_mode *fixed_mode;struct drm_display_mode *downclock_mode; -int fitting_mode;/* backlight */ struct {
drivers/gpu/drm/i915/intel_dsi.c +5 -6
@@ -320,10 +320,10 @@ static bool intel_dsi_compute_config(struct intel_encoder *encoder,if (HAS_GMCH_DISPLAY (dev_priv))intel_gmch_panel_fitting (crtc, pipe_config, - intel_connector->panel.fitting_mode); + conn_state->scaling_mode);else intel_pch_panel_fitting (crtc, pipe_config, - intel_connector->panel.fitting_mode); + conn_state->scaling_mode); }/* DSI uses short packets for sync events, so clear mode flags for DSI */
@@ -1592,7 +1592,6 @@ static int intel_dsi_set_property(struct drm_connector *connector, uint64_t val) {struct drm_device *dev = connector->dev; -struct intel_connector *intel_connector =to_intel_connector (connector);struct drm_crtc *crtc;int ret;
@@ -1611,10 +1610,10 @@ static int intel_dsi_set_property(struct drm_connector *connector,return -EINVAL ; } -if (intel_connector->panel.fitting_mode == val) +if (connector->state->scaling_mode == val)return 0 ; - intel_connector->panel.fitting_mode = val; + connector->state->scaling_mode = val; } crtc = connector->state->crtc;
@@ -1680,7 +1679,7 @@ static void intel_dsi_add_properties(struct intel_connector *connector)drm_object_attach_property (&connector->base.base, dev->mode_config.scaling_mode_property,DRM_MODE_SCALE_ASPECT ); - connector->panel.fitting_mode =DRM_MODE_SCALE_ASPECT ; + connector->base.state->scaling_mode =DRM_MODE_SCALE_ASPECT ; } }
drivers/gpu/drm/i915/intel_lvds.c +5 -6
@@ -433,10 +433,10 @@ static bool intel_lvds_compute_config(struct intel_encoder *intel_encoder, pipe_config->has_pch_encoder = true;intel_pch_panel_fitting (intel_crtc, pipe_config, - intel_connector->panel.fitting_mode); + conn_state->scaling_mode); }else {intel_gmch_panel_fitting (intel_crtc, pipe_config, - intel_connector->panel.fitting_mode); + conn_state->scaling_mode); }
@@ -602,7 +602,6 @@ static int intel_lvds_set_property(struct drm_connector *connector, struct drm_property *property, uint64_t value) { -struct intel_connector *intel_connector =to_intel_connector (connector);struct drm_device *dev = connector->dev;if (property == dev->mode_config.scaling_mode_property) {
@@ -613,11 +612,11 @@ static int intel_lvds_set_property(struct drm_connector *connector,return -EINVAL ; } -if (intel_connector->panel.fitting_mode == value) { +if (connector->state->scaling_mode == value) {/* the LVDS scaling property is not changed */ return 0 ; } - intel_connector->panel.fitting_mode = value; + connector->state->scaling_mode = value; crtc =intel_attached_encoder (connector)->base.crtc;if (crtc && crtc->state->enable) {
@@ -1087,7 +1086,7 @@ void intel_lvds_init(struct drm_i915_private *dev_priv)drm_object_attach_property (&connector->base, dev->mode_config.scaling_mode_property,DRM_MODE_SCALE_ASPECT ); - intel_connector->panel.fitting_mode =DRM_MODE_SCALE_ASPECT ; + connector->state->scaling_mode =DRM_MODE_SCALE_ASPECT ;intel_lvds_pps_get_hw_state (dev_priv, &lvds_encoder->init_pps); lvds_encoder->init_lvds_val = lvds;
Signature · 6 lines
2.9.3 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Maarten Lankhorst
maintainerPATCH v6 4/12 drm/i915: Use per-connector scaling mode property
In reply to Maarten LankhorstNone of the intel connectors can use all types of scaling modes, so only try the ones that are possible. This is another preparation for connectors towards conversion to atomic.
--- drivers/gpu/drm/i915/intel_dp.c | 29 ++++++++++++----------------- drivers/gpu/drm/i915/intel_dsi.c | 28 +++++++++++----------------- drivers/gpu/drm/i915/intel_lvds.c | 17 ++++++----------- 3 files changed, 29 insertions(+), 45 deletions(-)
drivers/gpu/drm/i915/intel_dp.c +12 -17
@@ -4884,18 +4884,7 @@ intel_dp_set_property(struct drm_connector *connector, goto done; } -if (is_edp (intel_dp) && - property == connector->dev->mode_config.scaling_mode_property) { -if (val ==DRM_MODE_SCALE_NONE ) { -DRM_DEBUG_KMS ("no scaling not supported\n" ); -return -EINVAL ; - } -if (HAS_GMCH_DISPLAY (dev_priv) && - val ==DRM_MODE_SCALE_CENTER ) { -DRM_DEBUG_KMS ("centering not supported\n" ); -return -EINVAL ; - } - +if (property == connector->scaling_mode_property) {if (connector->state->scaling_mode == val) {/* the eDP scaling property is not changed */ return 0 ;
@@ -5178,17 +5167,23 @@ bool intel_dp_is_edp(struct drm_i915_private *dev_priv, enum port port)static void intel_dp_add_properties (struct intel_dp *intel_dp,struct drm_connector *connector) { +struct drm_i915_private *dev_priv =to_i915 (connector->dev); +intel_attach_force_audio_property (connector);intel_attach_broadcast_rgb_property (connector); intel_dp->color_range_auto = true;if (is_edp (intel_dp)) { -drm_mode_create_scaling_mode_property (connector->dev); -drm_object_attach_property ( - &connector->base, - connector->dev->mode_config.scaling_mode_property, -DRM_MODE_SCALE_ASPECT ); +u32 allowed_scalers; + + allowed_scalers =BIT (DRM_MODE_SCALE_ASPECT ) |BIT (DRM_MODE_SCALE_FULLSCREEN ); +if (!HAS_GMCH_DISPLAY (dev_priv)) + allowed_scalers |=BIT (DRM_MODE_SCALE_CENTER ); + +drm_mode_connector_attach_scaling_mode_property (connector, allowed_scalers); + connector->state->scaling_mode =DRM_MODE_SCALE_ASPECT ; + } }
drivers/gpu/drm/i915/intel_dsi.c +11 -17
@@ -1591,7 +1591,6 @@ static int intel_dsi_set_property(struct drm_connector *connector, struct drm_property *property, uint64_t val) { -struct drm_device *dev = connector->dev;struct drm_crtc *crtc;int ret;
@@ -1599,17 +1598,7 @@ static int intel_dsi_set_property(struct drm_connector *connector,if (ret)return ret; -if (property == dev->mode_config.scaling_mode_property) { -if (val ==DRM_MODE_SCALE_NONE ) { -DRM_DEBUG_KMS ("no scaling not supported\n" ); -return -EINVAL ; - } -if (HAS_GMCH_DISPLAY (to_i915 (dev)) && - val ==DRM_MODE_SCALE_CENTER ) { -DRM_DEBUG_KMS ("centering not supported\n" ); -return -EINVAL ; - } - +if (property == connector->scaling_mode_property) {if (connector->state->scaling_mode == val)return 0 ;
@@ -1672,13 +1661,18 @@ static const struct drm_connector_funcs intel_dsi_connector_funcs = {static void intel_dsi_add_properties (struct intel_connector *connector) { -struct drm_device *dev = connector->base.dev; +struct drm_i915_private *dev_priv =to_i915 (connector->base.dev);if (connector->panel.fixed_mode) { -drm_mode_create_scaling_mode_property (dev); -drm_object_attach_property (&connector->base.base, - dev->mode_config.scaling_mode_property, -DRM_MODE_SCALE_ASPECT ); +u32 allowed_scalers; + + allowed_scalers =BIT (DRM_MODE_SCALE_ASPECT ) |BIT (DRM_MODE_SCALE_FULLSCREEN ); +if (!HAS_GMCH_DISPLAY (dev_priv)) + allowed_scalers |=BIT (DRM_MODE_SCALE_CENTER ); + +drm_mode_connector_attach_scaling_mode_property (&connector->base, + allowed_scalers); + connector->base.state->scaling_mode =DRM_MODE_SCALE_ASPECT ; } }
drivers/gpu/drm/i915/intel_lvds.c +6 -11
@@ -602,16 +602,10 @@ static int intel_lvds_set_property(struct drm_connector *connector, struct drm_property *property, uint64_t value) { -struct drm_device *dev = connector->dev; -if (property == dev->mode_config.scaling_mode_property) { +if (property == connector->scaling_mode_property) {struct drm_crtc *crtc; -if (value ==DRM_MODE_SCALE_NONE ) { -DRM_DEBUG_KMS ("no scaling not supported\n" ); -return -EINVAL ; - } -if (connector->state->scaling_mode == value) {/* the LVDS scaling property is not changed */ return 0 ;
@@ -987,6 +981,7 @@ void intel_lvds_init(struct drm_i915_private *dev_priv)u32 lvds;int pipe;u8 pin; +u32 allowed_scalers;if (!intel_lvds_supported (dev_priv))return ;
@@ -1082,10 +1077,10 @@ void intel_lvds_init(struct drm_i915_private *dev_priv) lvds_encoder->reg = lvds_reg;/* create the scaling mode property */ -drm_mode_create_scaling_mode_property (dev); -drm_object_attach_property (&connector->base, - dev->mode_config.scaling_mode_property, -DRM_MODE_SCALE_ASPECT ); + allowed_scalers =BIT (DRM_MODE_SCALE_ASPECT ); + allowed_scalers |=BIT (DRM_MODE_SCALE_FULLSCREEN ); + allowed_scalers |=BIT (DRM_MODE_SCALE_CENTER ); +drm_mode_connector_attach_scaling_mode_property (connector, allowed_scalers); connector->state->scaling_mode =DRM_MODE_SCALE_ASPECT ;intel_lvds_pps_get_hw_state (dev_priv, &lvds_encoder->init_pps);
Signature · 6 lines
2.9.3 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Maarten Lankhorst
maintainerPATCH v6 5/12 drm/i915: Add plumbing for digital connector state, v3.
In reply to Maarten LankhorstSome atomic properties are common between the various kinds of connectors, for example a lot of them use panel fitting mode. It makes sense to put a lot of it in a common place, so each connector can use it while they're being converted.
Implement the properties required for the connectors:
- scaling mode property
- force audio property
- broadcast rgb
- aspect ratio
While at it, make clear that intel_digital_connector_atomic_get_property is a hack that has to be removed when all connector properties are converted to atomic.
Changes since v1:
- Scaling mode and aspect ratio are partly handled in core now. Changes since v2:
- Split out the scaling mode / aspect ratio changes to a preparation patch.
- Use mode_changed for panel fitter, changes to this property are checked by fastset.
- Allowed_scaling_modes is removed, handled through core now.
--- drivers/gpu/drm/i915/intel_atomic.c | 131 +++++++++++++++++++++++++++++++++-- drivers/gpu/drm/i915/intel_display.c | 14 +++- drivers/gpu/drm/i915/intel_drv.h | 23 ++++++ 3 files changed, 159 insertions(+), 9 deletions(-)
drivers/gpu/drm/i915/intel_atomic.c +124 -7
@@ -36,7 +36,7 @@#include "intel_drv.h" /** -* intel_connector_atomic_get_property - fetch connector property value +* intel_connector_atomic_get_property - fetch legacy connector property value * @connector: connector to fetch property for * @state: state containing the property value * @property: property to look up
@@ -45,12 +45,14 @@* The DRM core does not store shadow copies of properties for * atomic-capable drivers. This entrypoint is used to fetch * the current value of a driver-specific connector property. +* +* This is a intermediary solution until all connectors are +* converted to support full atomic properties. */ -int -intel_connector_atomic_get_property (struct drm_connector *connector, -const struct drm_connector_state *state, -struct drm_property *property, -uint64_t *val) +int intel_connector_atomic_get_property (struct drm_connector *connector, +const struct drm_connector_state *state, +struct drm_property *property, +uint64_t *val) {int i;
@@ -73,7 +75,122 @@ intel_connector_atomic_get_property(struct drm_connector *connector,return -EINVAL ; } -/* +/** +* intel_digital_connector_atomic_get_property - hook for connector->atomic_get_property. +* @connector: Connector to get the property for. +* @state: Connector state to retrieve the property from. +* @property: Property to retrieve. +* @val: Return value for the property. +* +* Returns the atomic property value for a digital connector. +*/ +int intel_digital_connector_atomic_get_property (struct drm_connector *connector, +const struct drm_connector_state *state, +struct drm_property *property, +uint64_t *val) +{ +struct drm_device *dev = connector->dev; +struct drm_i915_private *dev_priv =to_i915 (dev); +struct intel_digital_connector_state *intel_conn_state = +to_intel_digital_connector_state (state); + +if (property == dev_priv->force_audio_property) + *val = intel_conn_state->force_audio; +else if (property == dev_priv->broadcast_rgb_property) + *val = intel_conn_state->broadcast_rgb; +else { +DRM_DEBUG_ATOMIC ("Unknown property %s\n" , property->name); +return -EINVAL ; + } + +return 0 ; +} + +/** +* intel_digital_connector_atomic_set_property - hook for connector->atomic_set_property. +* @connector: Connector to set the property for. +* @state: Connector state to set the property on. +* @property: Property to set. +* @val: New value for the property. +* +* Sets the atomic property value for a digital connector. +*/ +int intel_digital_connector_atomic_set_property (struct drm_connector *connector, +struct drm_connector_state *state, +struct drm_property *property, +uint64_t val) +{ +struct drm_device *dev = connector->dev; +struct drm_i915_private *dev_priv =to_i915 (dev); +struct intel_digital_connector_state *intel_conn_state = +to_intel_digital_connector_state (state); + +if (property == dev_priv->force_audio_property) { + intel_conn_state->force_audio = val; +return 0 ; + } + +if (property == dev_priv->broadcast_rgb_property) { + intel_conn_state->broadcast_rgb = val; +return 0 ; + } + +DRM_DEBUG_ATOMIC ("Unknown property %s\n" , property->name); +return -EINVAL ; +} + +int intel_digital_connector_atomic_check (struct drm_connector *conn, +struct drm_connector_state *new_state) +{ +struct intel_digital_connector_state *new_conn_state = +to_intel_digital_connector_state (new_state); +struct drm_connector_state *old_state = +drm_atomic_get_old_connector_state (new_state->state, conn); +struct intel_digital_connector_state *old_conn_state = +to_intel_digital_connector_state (old_state); +struct drm_crtc_state *crtc_state; + +if (!new_state->crtc) +return 0 ; + + crtc_state =drm_atomic_get_new_crtc_state (new_state->state, new_state->crtc); + +/* +* These properties are handled by fastset, and might not end +* up in a modeset. +*/ +if (new_conn_state->force_audio != old_conn_state->force_audio || + new_conn_state->broadcast_rgb != old_conn_state->broadcast_rgb || + new_conn_state->base.picture_aspect_ratio != old_conn_state->base.picture_aspect_ratio || + new_conn_state->base.scaling_mode != old_conn_state->base.scaling_mode) + crtc_state->mode_changed = true; + +return 0 ; +} + +/** +* intel_digital_connector_duplicate_state - duplicate connector state +* @connector: digital connector +* +* Allocates and returns a copy of the connector state (both common and +* digital connector specific) for the specified connector. +* +* Returns: The newly allocated connector state, or NULL on failure. +*/ +struct drm_connector_state * +intel_digital_connector_duplicate_state (struct drm_connector *connector) +{ +struct intel_digital_connector_state *state; + + state =kmemdup (connector->state,sizeof (*state),GFP_KERNEL ); +if (!state) +return NULL ; + +__drm_atomic_helper_connector_duplicate_state (connector, &state->base); +return &state->base; +} + +/** * intel_crtc_duplicate_state - duplicate crtc state * @crtc: drm crtc *
drivers/gpu/drm/i915/intel_display.c +12 -2
@@ -5956,11 +5956,21 @@ static void intel_connector_verify_state(struct intel_connector *connector)int intel_connector_init (struct intel_connector *connector) { -drm_atomic_helper_connector_reset (&connector->base); +struct intel_digital_connector_state *conn_state; -if (!connector->base.state) +/* +* Allocate enough memory to hold intel_digital_connector_state, +* This might be a few bytes too many, but for connectors that don't +* need it we'll free the state and allocate a smaller one on the first +* succesful commit anyway. +*/ + conn_state =kzalloc (sizeof (*conn_state),GFP_KERNEL ); +if (!conn_state)return -ENOMEM ; +__drm_atomic_helper_connector_reset (&connector->base, + &conn_state->base); +return 0 ; }
drivers/gpu/drm/i915/intel_drv.h +23 -0
@@ -330,6 +330,15 @@ struct intel_connector {struct work_struct modeset_retry_work; }; +struct intel_digital_connector_state { +struct drm_connector_state base; + +enum hdmi_force_audio force_audio; +int broadcast_rgb; +}; + +#define to_intel_digital_connector_state (x) container_of(x, struct intel_digital_connector_state, base) +struct dpll {/* given values */ int n;
@@ -1885,6 +1894,20 @@ int intel_connector_atomic_get_property(struct drm_connector *connector,const struct drm_connector_state *state, struct drm_property *property, uint64_t *val); + +int intel_digital_connector_atomic_get_property (struct drm_connector *connector, +const struct drm_connector_state *state, +struct drm_property *property, +uint64_t *val); +int intel_digital_connector_atomic_set_property (struct drm_connector *connector, +struct drm_connector_state *state, +struct drm_property *property, +uint64_t val); +int intel_digital_connector_atomic_check (struct drm_connector *conn, +struct drm_connector_state *new_state); +struct drm_connector_state * +intel_digital_connector_duplicate_state (struct drm_connector *connector); +struct drm_crtc_state *intel_crtc_duplicate_state (struct drm_crtc *crtc);void intel_crtc_destroy_state (struct drm_crtc *crtc,struct drm_crtc_state *state);
Signature · 6 lines
2.9.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v6 05/12] drm/i915: Add plumbing for digital connector state, v3.
Quoted 24 lines · Maarten Lankhorst
Some atomic properties are common between the various kinds of connectors, for example a lot of them use panel fitting mode. It makes sense to put a lot of it in a common place, so each connector can use it while they're being converted.
Implement the properties required for the connectors:
- scaling mode property
- force audio property
- broadcast rgb
- aspect ratioWhile at it, make clear that
intel_digital_connector_atomic_get_propertyis a hack that has to be removed when all connector properties are converted to atomic.Changes since v1:
- Scaling mode and aspect ratio are partly handled in core now. Changes since v2:
- Split out the scaling mode / aspect ratio changes to a preparation patch.
- Usemode_changedfor panel fitter, changes to this property are checked by fastset.
-Allowed_scaling_modesis removed, handled through core now.
Quoted 1 line
Signed-off-by Maarten Lankhorst <[email protected]>
Patches 3-5: Reviewed-by: Daniel Vetter <[email protected]>
Pls ping Dave for an Ack for getting the first 2 landed through drm-intel (they'll still show up in the first pull request right after -rc1, so all good imo).
Cheers, Daniel
Quoted 239 lines
--- drivers/gpu/drm/i915/intel_atomic.c | 131 +++++++++++++++++++++++++++++++++-- drivers/gpu/drm/i915/intel_display.c | 14 +++- drivers/gpu/drm/i915/intel_drv.h | 23 ++++++ 3 files changed, 159 insertions(+), 9 deletions(-)drivers/gpu/drm/i915/intel_atomic.c +124
-7@@ -36,7 +36,7 @@#include "intel_drv.h" /** -* intel_connector_atomic_get_property - fetch connector property value +* intel_connector_atomic_get_property - fetch legacy connector property value * @connector: connector to fetch property for * @state: state containing the property value * @property: property to look up @@ -45,12 +45,14 @@* The DRM core does not store shadow copies of properties for * atomic-capable drivers. This entrypoint is used to fetch * the current value of a driver-specific connector property. +* +* This is a intermediary solution until all connectors are +* converted to support full atomic properties. */ -int -intel_connector_atomic_get_property (struct drm_connector *connector, -const struct drm_connector_state *state, -struct drm_property *property, -uint64_t *val) +int intel_connector_atomic_get_property (struct drm_connector *connector, +const struct drm_connector_state *state, +struct drm_property *property, +uint64_t *val) {int i;@@ -73,7 +75,122 @@ intel_connector_atomic_get_property(struct drm_connector *connector,return -EINVAL ; } -/* +/** +* intel_digital_connector_atomic_get_property - hook for connector->atomic_get_property. +* @connector: Connector to get the property for. +* @state: Connector state to retrieve the property from. +* @property: Property to retrieve. +* @val: Return value for the property. +* +* Returns the atomic property value for a digital connector. +*/ +int intel_digital_connector_atomic_get_property (struct drm_connector *connector, +const struct drm_connector_state *state, +struct drm_property *property, +uint64_t *val) +{ +struct drm_device *dev = connector->dev; +struct drm_i915_private *dev_priv =to_i915 (dev); +struct intel_digital_connector_state *intel_conn_state = +to_intel_digital_connector_state (state); + +if (property == dev_priv->force_audio_property) + *val = intel_conn_state->force_audio; +else if (property == dev_priv->broadcast_rgb_property) + *val = intel_conn_state->broadcast_rgb; +else { +DRM_DEBUG_ATOMIC ("Unknown property %s\n" , property->name); +return -EINVAL ; + } + +return 0 ; +} + +/** +* intel_digital_connector_atomic_set_property - hook for connector->atomic_set_property. +* @connector: Connector to set the property for. +* @state: Connector state to set the property on. +* @property: Property to set. +* @val: New value for the property. +* +* Sets the atomic property value for a digital connector. +*/ +int intel_digital_connector_atomic_set_property (struct drm_connector *connector, +struct drm_connector_state *state, +struct drm_property *property, +uint64_t val) +{ +struct drm_device *dev = connector->dev; +struct drm_i915_private *dev_priv =to_i915 (dev); +struct intel_digital_connector_state *intel_conn_state = +to_intel_digital_connector_state (state); + +if (property == dev_priv->force_audio_property) { + intel_conn_state->force_audio = val; +return 0 ; + } + +if (property == dev_priv->broadcast_rgb_property) { + intel_conn_state->broadcast_rgb = val; +return 0 ; + } + +DRM_DEBUG_ATOMIC ("Unknown property %s\n" , property->name); +return -EINVAL ; +} + +int intel_digital_connector_atomic_check (struct drm_connector *conn, +struct drm_connector_state *new_state) +{ +struct intel_digital_connector_state *new_conn_state = +to_intel_digital_connector_state (new_state); +struct drm_connector_state *old_state = +drm_atomic_get_old_connector_state (new_state->state, conn); +struct intel_digital_connector_state *old_conn_state = +to_intel_digital_connector_state (old_state); +struct drm_crtc_state *crtc_state; + +if (!new_state->crtc) +return 0 ; + + crtc_state =drm_atomic_get_new_crtc_state (new_state->state, new_state->crtc); + +/* +* These properties are handled by fastset, and might not end +* up in a modeset. +*/ +if (new_conn_state->force_audio != old_conn_state->force_audio || + new_conn_state->broadcast_rgb != old_conn_state->broadcast_rgb || + new_conn_state->base.picture_aspect_ratio != old_conn_state->base.picture_aspect_ratio || + new_conn_state->base.scaling_mode != old_conn_state->base.scaling_mode) + crtc_state->mode_changed = true; + +return 0 ; +} + +/** +* intel_digital_connector_duplicate_state - duplicate connector state +* @connector: digital connector +* +* Allocates and returns a copy of the connector state (both common and +* digital connector specific) for the specified connector. +* +* Returns: The newly allocated connector state, or NULL on failure. +*/ +struct drm_connector_state * +intel_digital_connector_duplicate_state (struct drm_connector *connector) +{ +struct intel_digital_connector_state *state; + + state =kmemdup (connector->state,sizeof (*state),GFP_KERNEL ); +if (!state) +return NULL ; + +__drm_atomic_helper_connector_duplicate_state (connector, &state->base); +return &state->base; +} + +/** * intel_crtc_duplicate_state - duplicate crtc state * @crtc: drm crtc * drivers/gpu/drm/i915/intel_display.c +12
-2@@ -5956,11 +5956,21 @@ static void intel_connector_verify_state(struct intel_connector *connector)int intel_connector_init (struct intel_connector *connector) { -drm_atomic_helper_connector_reset (&connector->base); +struct intel_digital_connector_state *conn_state; -if (!connector->base.state) +/* +* Allocate enough memory to hold intel_digital_connector_state, +* This might be a few bytes too many, but for connectors that don't +* need it we'll free the state and allocate a smaller one on the first +* succesful commit anyway. +*/ + conn_state =kzalloc (sizeof (*conn_state),GFP_KERNEL ); +if (!conn_state)return -ENOMEM ; +__drm_atomic_helper_connector_reset (&connector->base, + &conn_state->base); +return 0 ; }drivers/gpu/drm/i915/intel_drv.h +23
-0@@ -330,6 +330,15 @@ struct intel_connector {struct work_struct modeset_retry_work; }; +struct intel_digital_connector_state { +struct drm_connector_state base; + +enum hdmi_force_audio force_audio; +int broadcast_rgb; +}; + +#define to_intel_digital_connector_state (x) container_of(x, struct intel_digital_connector_state, base) +struct dpll {/* given values */ int n;@@ -1885,6 +1894,20 @@ int intel_connector_atomic_get_property(struct drm_connector *connector,const struct drm_connector_state *state, struct drm_property *property, uint64_t *val); + +int intel_digital_connector_atomic_get_property (struct drm_connector *connector, +const struct drm_connector_state *state, +struct drm_property *property, +uint64_t *val); +int intel_digital_connector_atomic_set_property (struct drm_connector *connector, +struct drm_connector_state *state, +struct drm_property *property, +uint64_t val); +int intel_digital_connector_atomic_check (struct drm_connector *conn, +struct drm_connector_state *new_state); +struct drm_connector_state * +intel_digital_connector_duplicate_state (struct drm_connector *connector); +struct drm_crtc_state *intel_crtc_duplicate_state (struct drm_crtc *crtc);void intel_crtc_destroy_state (struct drm_crtc *crtc,struct drm_crtc_state *state);Signature · 6 lines
2.9.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v6 05/12] drm/i915: Add plumbing for digital connector state, v3.
Hey,
Op 02-05-17 om 11:56 schreef Daniel Vetter:
Quoted 25 lines · Maarten Lankhorst
Quoted 24 lines
Some atomic properties are common between the various kinds of connectors, for example a lot of them use panel fitting mode. It makes sense to put a lot of it in a common place, so each connector can use it while they're being converted.
Implement the properties required for the connectors:
- scaling mode property
- force audio property
- broadcast rgb
- aspect ratioWhile at it, make clear that
intel_digital_connector_atomic_get_propertyis a hack that has to be removed when all connector properties are converted to atomic.Changes since v1:
- Scaling mode and aspect ratio are partly handled in core now. Changes since v2:
- Split out the scaling mode / aspect ratio changes to a preparation patch.
- Usemode_changedfor panel fitter, changes to this property are checked by fastset.
-Allowed_scaling_modesis removed, handled through core now.
Quoted 6 lines
Quoted 1 line
Signed-off-by Maarten Lankhorst <[email protected]>Patches 3-5: Reviewed-by: Daniel Vetter <[email protected]>
Pls ping Dave for an Ack for getting the first 2 landed through drm-intel (they'll still show up in the first pull request right after -rc1, so all good imo).
Merged, thanks for review.
~Maarten
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Maarten Lankhorst
maintainerPATCH v6 6/12 drm/i915: Convert DSI connector properties to atomic.
In reply to Maarten Lankhorst--- drivers/gpu/drm/i915/intel_dsi.c | 38 +++++--------------------------------- 1 file changed, 5 insertions(+), 33 deletions(-)
drivers/gpu/drm/i915/intel_dsi.c +5 -33
@@ -1587,36 +1587,6 @@ static int intel_dsi_get_modes(struct drm_connector *connector)return 1 ; } -static int intel_dsi_set_property (struct drm_connector *connector, -struct drm_property *property, -uint64_t val) -{ -struct drm_crtc *crtc; -int ret; - - ret =drm_object_property_set_value (&connector->base, property, val); -if (ret) -return ret; - -if (property == connector->scaling_mode_property) { -if (connector->state->scaling_mode == val) -return 0 ; - - connector->state->scaling_mode = val; - } - - crtc = connector->state->crtc; -if (crtc && crtc->state->enable) { -/* -* If the CRTC is enabled, the display will be changed -* according to the new panel fitting mode. -*/ -intel_crtc_restore_mode (crtc); - } - -return 0 ; -} -static void intel_dsi_connector_destroy (struct drm_connector *connector) {struct intel_connector *intel_connector =to_intel_connector (connector);
@@ -1645,6 +1615,7 @@ static const struct drm_encoder_funcs intel_dsi_funcs = {static const struct drm_connector_helper_funcs intel_dsi_connector_helper_funcs = { .get_modes = intel_dsi_get_modes, .mode_valid = intel_dsi_mode_valid, + .atomic_check = intel_digital_connector_atomic_check, };static const struct drm_connector_funcs intel_dsi_connector_funcs = {
@@ -1653,10 +1624,11 @@ static const struct drm_connector_funcs intel_dsi_connector_funcs = { .early_unregister = intel_connector_unregister, .destroy = intel_dsi_connector_destroy, .fill_modes = drm_helper_probe_single_connector_modes, - .set_property = intel_dsi_set_property, - .atomic_get_property = intel_connector_atomic_get_property, + .set_property = drm_atomic_helper_connector_set_property, + .atomic_get_property = intel_digital_connector_atomic_get_property, + .atomic_set_property = intel_digital_connector_atomic_set_property, .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, - .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, + .atomic_duplicate_state = intel_digital_connector_duplicate_state, };static void intel_dsi_add_properties (struct intel_connector *connector)
Signature · 6 lines
2.9.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Maarten Lankhorst
maintainerPATCH v6 7/12 drm/i915: Convert LVDS connector properties to atomic.
In reply to Maarten Lankhorst--- drivers/gpu/drm/i915/intel_lvds.c | 35 +++++------------------------------ 1 file changed, 5 insertions(+), 30 deletions(-)
drivers/gpu/drm/i915/intel_lvds.c +5 -30
@@ -598,49 +598,24 @@ static void intel_lvds_destroy(struct drm_connector *connector)kfree (connector); } -static int intel_lvds_set_property (struct drm_connector *connector, -struct drm_property *property, -uint64_t value) -{ - -if (property == connector->scaling_mode_property) { -struct drm_crtc *crtc; - -if (connector->state->scaling_mode == value) { -/* the LVDS scaling property is not changed */ -return 0 ; - } - connector->state->scaling_mode = value; - - crtc =intel_attached_encoder (connector)->base.crtc; -if (crtc && crtc->state->enable) { -/* -* If the CRTC is enabled, the display will be changed -* according to the new panel fitting mode. -*/ -intel_crtc_restore_mode (crtc); - } - } - -return 0 ; -} -static const struct drm_connector_helper_funcs intel_lvds_connector_helper_funcs = { .get_modes = intel_lvds_get_modes, .mode_valid = intel_lvds_mode_valid, + .atomic_check = intel_digital_connector_atomic_check, };static const struct drm_connector_funcs intel_lvds_connector_funcs = { .dpms = drm_atomic_helper_connector_dpms, .detect = intel_lvds_detect, .fill_modes = drm_helper_probe_single_connector_modes, - .set_property = intel_lvds_set_property, - .atomic_get_property = intel_connector_atomic_get_property, + .set_property = drm_atomic_helper_connector_set_property, + .atomic_get_property = intel_digital_connector_atomic_get_property, + .atomic_set_property = intel_digital_connector_atomic_set_property, .late_register = intel_connector_register, .early_unregister = intel_connector_unregister, .destroy = intel_lvds_destroy, .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, - .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, + .atomic_duplicate_state = intel_digital_connector_duplicate_state, };static const struct drm_encoder_funcs intel_lvds_enc_funcs = {
Signature · 6 lines
2.9.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Maarten Lankhorst
maintainerPATCH v6 8/12 drm/i915: Make intel_dp->has_audio reflect hw state only
In reply to Maarten LankhorstAlways detect if audio is available during edid detection. With less magic switching it's easier to convert the dp connector properties to atomic.
--- drivers/gpu/drm/i915/intel_dp.c | 38 ++++++++++++++++---------------------- 1 file changed, 16 insertions(+), 22 deletions(-)
drivers/gpu/drm/i915/intel_dp.c +16 -22
@@ -1671,7 +1671,12 @@ intel_dp_compute_config(struct intel_encoder *encoder, pipe_config->has_pch_encoder = true; pipe_config->has_drrs = false; - pipe_config->has_audio = intel_dp->has_audio && port !=PORT_A ; +if (port ==PORT_A ) + pipe_config->has_audio = false; +else if (intel_dp->force_audio ==HDMI_AUDIO_AUTO ) + pipe_config->has_audio = intel_dp->has_audio; +else + pipe_config->has_audio = intel_dp->force_audio ==HDMI_AUDIO_ON ;if (is_edp (intel_dp) && intel_connector->panel.fixed_mode) { intel_fixed_panel_mode(intel_connector->panel.fixed_mode,
@@ -4598,10 +4603,7 @@ intel_dp_set_edid(struct intel_dp *intel_dp) edid =intel_dp_get_edid (intel_dp); intel_connector->detect_edid = edid; -if (intel_dp->force_audio !=HDMI_AUDIO_AUTO ) - intel_dp->has_audio = intel_dp->force_audio ==HDMI_AUDIO_ON ; -else - intel_dp->has_audio =drm_detect_monitor_audio (edid); + intel_dp->has_audio =drm_detect_monitor_audio (edid); } static void
@@ -4809,19 +4811,6 @@ static int intel_dp_get_modes(struct drm_connector *connector)return 0 ; } -static bool -intel_dp_detect_audio (struct drm_connector *connector) -{ -bool has_audio = false; -struct edid *edid; - - edid =to_intel_connector (connector)->detect_edid; -if (edid) - has_audio =drm_detect_monitor_audio (edid); - -return has_audio; -} - static int intel_dp_set_property(struct drm_connector *connector, struct drm_property *property,
@@ -4838,22 +4827,27 @@ intel_dp_set_property(struct drm_connector *connector,if (property == dev_priv->force_audio_property) {int i = val; -bool has_audio; +bool has_audio, old_has_audio; +int old_force_audio = intel_dp->force_audio;if (i == intel_dp->force_audio)return 0 ; +if (old_force_audio ==HDMI_AUDIO_AUTO ) + old_has_audio = intel_dp->has_audio; +else + old_has_audio = old_force_audio; + intel_dp->force_audio = i;if (i ==HDMI_AUDIO_AUTO ) - has_audio =intel_dp_detect_audio (connector); + has_audio = intel_dp->has_audio;else has_audio = (i ==HDMI_AUDIO_ON ); -if (has_audio == intel_dp->has_audio) +if (has_audio == old_has_audio)return 0 ; - intel_dp->has_audio = has_audio; goto done; }
Signature · 6 lines
2.9.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Maarten Lankhorst
maintainerPATCH v6 9/12 drm/i915: Convert intel_dp properties to atomic, v2.
In reply to Maarten Lankhorstintel_dp supports 3 properties, scaling mode, broadcast rgb and force_audio. intel_digital_connector handles the plumbing, so we only have to hook this up in compute_config and init.
Changes since v1:
- Remove limited_color_range too, unused. (danvet)
--- drivers/gpu/drm/i915/intel_dp.c | 105 ++++----------------------------------- drivers/gpu/drm/i915/intel_drv.h | 3 -- 2 files changed, 11 insertions(+), 97 deletions(-)
drivers/gpu/drm/i915/intel_dp.c +11 -94
@@ -1648,6 +1648,8 @@ intel_dp_compute_config(struct intel_encoder *encoder,enum port port =dp_to_dig_port (intel_dp)->port;struct intel_crtc *intel_crtc =to_intel_crtc (pipe_config->base.crtc);struct intel_connector *intel_connector = intel_dp->attached_connector; +struct intel_digital_connector_state *intel_conn_state = +to_intel_digital_connector_state (conn_state);int lane_count, clock;int min_lane_count =1 ;int max_lane_count =intel_dp_max_lane_count (intel_dp);
@@ -1673,10 +1675,10 @@ intel_dp_compute_config(struct intel_encoder *encoder, pipe_config->has_drrs = false;if (port ==PORT_A ) pipe_config->has_audio = false; -else if (intel_dp->force_audio ==HDMI_AUDIO_AUTO ) +else if (intel_conn_state->force_audio ==HDMI_AUDIO_AUTO ) pipe_config->has_audio = intel_dp->has_audio;else - pipe_config->has_audio = intel_dp->force_audio ==HDMI_AUDIO_ON ; + pipe_config->has_audio = intel_conn_state->force_audio ==HDMI_AUDIO_ON ;if (is_edp (intel_dp) && intel_connector->panel.fixed_mode) { intel_fixed_panel_mode(intel_connector->panel.fixed_mode,
@@ -1763,7 +1765,7 @@ intel_dp_compute_config(struct intel_encoder *encoder,return false; found: -if (intel_dp->color_range_auto) { +if (intel_conn_state->broadcast_rgb ==INTEL_BROADCAST_RGB_AUTO ) {/* * See: * CEA-861-E - 5.1 Default Encoding Parameters
@@ -1775,7 +1777,7 @@ intel_dp_compute_config(struct intel_encoder *encoder,HDMI_QUANTIZATION_RANGE_LIMITED ; }else { pipe_config->limited_color_range = - intel_dp->limited_color_range; + intel_conn_state->broadcast_rgb ==INTEL_BROADCAST_RGB_LIMITED ; } pipe_config->lane_count = lane_count;
@@ -4812,92 +4814,6 @@ static int intel_dp_get_modes(struct drm_connector *connector) }static int -intel_dp_set_property (struct drm_connector *connector, -struct drm_property *property, -uint64_t val) -{ -struct drm_i915_private *dev_priv =to_i915 (connector->dev); -struct intel_encoder *intel_encoder =intel_attached_encoder (connector); -struct intel_dp *intel_dp =enc_to_intel_dp (&intel_encoder->base); -int ret; - - ret =drm_object_property_set_value (&connector->base, property, val); -if (ret) -return ret; - -if (property == dev_priv->force_audio_property) { -int i = val; -bool has_audio, old_has_audio; -int old_force_audio = intel_dp->force_audio; - -if (i == intel_dp->force_audio) -return 0 ; - -if (old_force_audio ==HDMI_AUDIO_AUTO ) - old_has_audio = intel_dp->has_audio; -else - old_has_audio = old_force_audio; - - intel_dp->force_audio = i; - -if (i ==HDMI_AUDIO_AUTO ) - has_audio = intel_dp->has_audio; -else - has_audio = (i ==HDMI_AUDIO_ON ); - -if (has_audio == old_has_audio) -return 0 ; - - goto done; - } - -if (property == dev_priv->broadcast_rgb_property) { -bool old_auto = intel_dp->color_range_auto; -bool old_range = intel_dp->limited_color_range; - -switch (val) { -case INTEL_BROADCAST_RGB_AUTO : - intel_dp->color_range_auto = true; -break ; -case INTEL_BROADCAST_RGB_FULL : - intel_dp->color_range_auto = false; - intel_dp->limited_color_range = false; -break ; -case INTEL_BROADCAST_RGB_LIMITED : - intel_dp->color_range_auto = false; - intel_dp->limited_color_range = true; -break ; -default : -return -EINVAL ; - } - -if (old_auto == intel_dp->color_range_auto && - old_range == intel_dp->limited_color_range) -return 0 ; - - goto done; - } - -if (property == connector->scaling_mode_property) { -if (connector->state->scaling_mode == val) { -/* the eDP scaling property is not changed */ -return 0 ; - } - connector->state->scaling_mode = val; - - goto done; - } - -return -EINVAL ; - -done: -if (intel_encoder->base.crtc) -intel_crtc_restore_mode (intel_encoder->base.crtc); - -return 0 ; -} - -static int intel_dp_connector_register (struct drm_connector *connector) {struct intel_dp *intel_dp =intel_attached_dp (connector);
@@ -5055,19 +4971,21 @@ static const struct drm_connector_funcs intel_dp_connector_funcs = { .dpms = drm_atomic_helper_connector_dpms, .force = intel_dp_force, .fill_modes = drm_helper_probe_single_connector_modes, - .set_property = intel_dp_set_property, - .atomic_get_property = intel_connector_atomic_get_property, + .set_property = drm_atomic_helper_connector_set_property, + .atomic_get_property = intel_digital_connector_atomic_get_property, + .atomic_set_property = intel_digital_connector_atomic_set_property, .late_register = intel_dp_connector_register, .early_unregister = intel_dp_connector_unregister, .destroy = intel_dp_connector_destroy, .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, - .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, + .atomic_duplicate_state = intel_digital_connector_duplicate_state, };static const struct drm_connector_helper_funcs intel_dp_connector_helper_funcs = { .detect_ctx = intel_dp_detect, .get_modes = intel_dp_get_modes, .mode_valid = intel_dp_mode_valid, + .atomic_check = intel_digital_connector_atomic_check, };static const struct drm_encoder_funcs intel_dp_enc_funcs = {
@@ -5165,7 +5083,6 @@ intel_dp_add_properties(struct intel_dp *intel_dp, struct drm_connector *connectintel_attach_force_audio_property (connector);intel_attach_broadcast_rgb_property (connector); - intel_dp->color_range_auto = true;if (is_edp (intel_dp)) {u32 allowed_scalers;
drivers/gpu/drm/i915/intel_drv.h +0 -3
@@ -957,9 +957,6 @@ struct intel_dp {bool detect_done;bool channel_eq_status;bool reset_link_params; -enum hdmi_force_audio force_audio; -bool limited_color_range; -bool color_range_auto;uint8_t dpcd[DP_RECEIVER_CAP_SIZE ];uint8_t psr_dpcd[EDP_PSR_RECEIVER_CAP_SIZE ];uint8_t downstream_ports[DP_MAX_DOWNSTREAM_PORTS ];
Signature · 6 lines
2.9.3 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Maarten Lankhorst
maintainerPATCH v6 10/12 drm/i915: Convert intel_hdmi connector properties to atomic
In reply to Maarten Lankhorstintel_hdmi supports 3 properties, force_audio, broadcast rgb and scaling mode. The last one is only created for eDP, so the is_eDP in set_property is not required.
panel fitting and broadcast rgb are straightforward and only requires changing compute_config.
force_audio is also used to force DVI mode, which means changes to compute_config and mode_valid. mode_valid is called with connection_mutex held, so it can safely dereference connector->state.
--- drivers/gpu/drm/i915/intel_drv.h | 3 - drivers/gpu/drm/i915/intel_hdmi.c | 149 +++++++++----------------------------- 2 files changed, 33 insertions(+), 119 deletions(-)
drivers/gpu/drm/i915/intel_drv.h +0 -3
@@ -879,11 +879,8 @@ struct intel_hdmi {enum drm_dp_dual_mode_type type;int max_tmds_clock; } dp_dual_mode; -bool limited_color_range; -bool color_range_auto;bool has_hdmi_sink;bool has_audio; -enum hdmi_force_audio force_audio;bool rgb_quant_range_selectable;struct intel_connector *attached_connector; void (*write_infoframe)(struct drm_encoder *encoder,
drivers/gpu/drm/i915/intel_hdmi.c +33 -116
257 lines not on this page · raw message
Signature · 6 lines
2.9.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Maarten Lankhorst
maintainerPATCH v6 11/12 drm/i915: Handle force_audio correctly in intel_sdvo
In reply to Maarten LankhorstDo the same as other connectors, attempt to detect hdmi audio in the detect() callback, and only use the force_audio property as override. Compute has_audio in pipe_config, and use that value instead of the probed value directly.
--- drivers/gpu/drm/i915/intel_sdvo.c | 51 ++++++++++++++------------------------- 1 file changed, 18 insertions(+), 33 deletions(-)
drivers/gpu/drm/i915/intel_sdvo.c +18 -33
@@ -1122,6 +1122,8 @@ static bool intel_sdvo_compute_config(struct intel_encoder *encoder, struct drm_connector_state *conn_state) {struct intel_sdvo *intel_sdvo =to_sdvo (encoder); +struct intel_sdvo_connector *intel_sdvo_connector = +to_intel_sdvo_connector (conn_state->connector);struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode;struct drm_display_mode *mode = &pipe_config->base.mode;
@@ -1160,7 +1162,12 @@ static bool intel_sdvo_compute_config(struct intel_encoder *encoder, pipe_config->pixel_multiplier =intel_sdvo_get_pixel_multiplier (adjusted_mode); - pipe_config->has_hdmi_sink = intel_sdvo->has_hdmi_monitor; +if (intel_sdvo_connector->force_audio !=HDMI_AUDIO_OFF_DVI ) + pipe_config->has_hdmi_sink = intel_sdvo->has_hdmi_monitor; + +if (intel_sdvo_connector->force_audio ==HDMI_AUDIO_ON || + (intel_sdvo_connector->force_audio ==HDMI_AUDIO_AUTO && intel_sdvo->has_hdmi_audio)) + pipe_config->has_audio = true;if (intel_sdvo->color_range_auto) {/* See CEA-861-E - 5.1 Default Encoding Parameters */
@@ -1285,7 +1292,7 @@ static void intel_sdvo_pre_enable(struct intel_encoder *intel_encoder,else sdvox |=SDVO_PIPE_SEL (crtc->pipe); -if (intel_sdvo->has_hdmi_audio) +if (crtc_state->has_audio) sdvox |=SDVO_AUDIO_ENABLE ;if (INTEL_GEN (dev_priv) >=4 ) {
@@ -1694,12 +1701,6 @@ intel_sdvo_tmds_sink_detect(struct drm_connector *connector)kfree (edid); } -if (status == connector_status_connected) { -struct intel_sdvo_connector *intel_sdvo_connector =to_intel_sdvo_connector (connector); -if (intel_sdvo_connector->force_audio !=HDMI_AUDIO_AUTO ) - intel_sdvo->has_hdmi_audio = (intel_sdvo_connector->force_audio ==HDMI_AUDIO_ON ); - } -return status; }
@@ -1978,23 +1979,6 @@ static void intel_sdvo_destroy(struct drm_connector *connector)kfree (intel_sdvo_connector); } -static bool intel_sdvo_detect_hdmi_audio (struct drm_connector *connector) -{ -struct intel_sdvo *intel_sdvo =intel_attached_sdvo (connector); -struct edid *edid; -bool has_audio = false; - -if (!intel_sdvo->is_hdmi) -return false; - - edid =intel_sdvo_get_edid (connector); -if (edid !=NULL && edid->input &DRM_EDID_INPUT_DIGITAL ) - has_audio =drm_detect_monitor_audio (edid); -kfree (edid); - -return has_audio; -} - static int intel_sdvo_set_property(struct drm_connector *connector, struct drm_property *property,
@@ -2013,22 +1997,23 @@ intel_sdvo_set_property(struct drm_connector *connector,if (property == dev_priv->force_audio_property) {int i = val; -bool has_audio; - -if (i == intel_sdvo_connector->force_audio) -return 0 ; +bool has_audio, old_audio; - intel_sdvo_connector->force_audio = i; +if (intel_sdvo_connector->force_audio ==HDMI_AUDIO_AUTO ) + old_audio = intel_sdvo->has_hdmi_audio; +else + old_audio = intel_sdvo_connector->force_audio ==HDMI_AUDIO_ON ;if (i ==HDMI_AUDIO_AUTO ) - has_audio =intel_sdvo_detect_hdmi_audio (connector); + has_audio = intel_sdvo->has_hdmi_audio;else has_audio = (i ==HDMI_AUDIO_ON ); -if (has_audio == intel_sdvo->has_hdmi_audio) + intel_sdvo_connector->force_audio = i; + +if (has_audio == old_audio)return 0 ; - intel_sdvo->has_hdmi_audio = has_audio; goto done; }
Signature · 6 lines
2.9.3 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Maarten Lankhorst
maintainerPATCH v6 12/12 drm/i915: Convert intel_sdvo connector properties to atomic.
In reply to Maarten LankhorstSDVO was the last connector that's still using the legacy paths for properties, and this is with a reason!
This connector implements a lot of properties dynamically, and some of them shared with the digital connector state, so sdvo_connector_state subclasses intel_digital_connector_state.
set_property had a lot of validation, but this is handled in the drm core, so most of the validation can die off. The properties are written right before enabling the connector, since there is no good way to update the properties without crtc.
--- drivers/gpu/drm/i915/intel_atomic.c | 40 --- drivers/gpu/drm/i915/intel_display.c | 37 --- drivers/gpu/drm/i915/intel_drv.h | 6 - drivers/gpu/drm/i915/intel_sdvo.c | 518 +++++++++++++++++++---------------- 4 files changed, 280 insertions(+), 321 deletions(-)
drivers/gpu/drm/i915/intel_atomic.c +0 -40
@@ -36,46 +36,6 @@#include "intel_drv.h" /** -* intel_connector_atomic_get_property - fetch legacy connector property value -* @connector: connector to fetch property for -* @state: state containing the property value -* @property: property to look up -* @val: pointer to write property value into -* -* The DRM core does not store shadow copies of properties for -* atomic-capable drivers. This entrypoint is used to fetch -* the current value of a driver-specific connector property. -* -* This is a intermediary solution until all connectors are -* converted to support full atomic properties. -*/ -int intel_connector_atomic_get_property (struct drm_connector *connector, -const struct drm_connector_state *state, -struct drm_property *property, -uint64_t *val) -{ -int i; - -/* -* TODO: We only have atomic modeset for planes at the moment, so the -* crtc/connector code isn't quite ready yet. Until it's ready, -* continue to look up all property values in the DRM's shadow copy -* in obj->properties->values[]. -* -* When the crtc/connector state work matures, this function should -* be updated to read the values out of the state structure instead. -*/ -for (i =0 ; i < connector->base.properties->count; i++) { -if (connector->base.properties->properties[i] == property) { - *val = connector->base.properties->values[i]; -return 0 ; - } - } - -return -EINVAL ; -} - -/** * intel_digital_connector_atomic_get_property - hook for connector->atomic_get_property. * @connector: Connector to get the property for. * @state: Connector state to retrieve the property from.
drivers/gpu/drm/i915/intel_display.c +0 -37
@@ -13077,43 +13077,6 @@ static int intel_atomic_commit(struct drm_device *dev,return 0 ; } -void intel_crtc_restore_mode (struct drm_crtc *crtc) -{ -struct drm_device *dev = crtc->dev; -struct drm_atomic_state *state; -struct drm_crtc_state *crtc_state; -int ret; - - state =drm_atomic_state_alloc (dev); -if (!state) { -DRM_DEBUG_KMS ("[CRTC:%d:%s] crtc restore failed, out of memory" , - crtc->base.id, crtc->name); -return ; - } - - state->acquire_ctx = crtc->dev->mode_config.acquire_ctx; - -retry: - crtc_state =drm_atomic_get_crtc_state (state, crtc); - ret =PTR_ERR_OR_ZERO (crtc_state); -if (!ret) { -if (!crtc_state->active) - goto out; - - crtc_state->mode_changed = true; - ret =drm_atomic_commit (state); - } - -if (ret == -EDEADLK ) { -drm_atomic_state_clear (state); -drm_modeset_backoff (state->acquire_ctx); - goto retry; - } - -out: -drm_atomic_state_put (state); -} -static const struct drm_crtc_funcs intel_crtc_funcs = { .gamma_set = drm_atomic_helper_legacy_gamma_set, .set_config = drm_atomic_helper_set_config,
drivers/gpu/drm/i915/intel_drv.h +0 -6
@@ -1324,7 +1324,6 @@ unsigned int intel_rotation_info_size(const struct intel_rotation_info *rot_infobool intel_has_pending_fb_unpin (struct drm_i915_private *dev_priv);void intel_mark_busy (struct drm_i915_private *dev_priv);void intel_mark_idle (struct drm_i915_private *dev_priv); -void intel_crtc_restore_mode (struct drm_crtc *crtc);int intel_display_suspend (struct drm_device *dev);void intel_pps_unlock_regs_wa (struct drm_i915_private *dev_priv);void intel_encoder_destroy (struct drm_encoder *encoder);
@@ -1884,11 +1883,6 @@ void intel_pipe_update_end(struct intel_crtc *crtc, struct intel_flip_work *workvoid intel_tv_init (struct drm_i915_private *dev_priv);/* intel_atomic.c */ -int intel_connector_atomic_get_property (struct drm_connector *connector, -const struct drm_connector_state *state, -struct drm_property *property, -uint64_t *val); - int intel_digital_connector_atomic_get_property(struct drm_connector *connector, const struct drm_connector_state *state, struct drm_property *property,
drivers/gpu/drm/i915/intel_sdvo.c +280 -238
772 lines not on this page · raw message
Signature · 6 lines
2.9.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for drm/i915: Convert connector properties to atomic. (rev7)
In reply to Maarten Lankhorst== Series Details ==
== Series Details ==
Series: drm/i915: Convert connector properties to atomic. (rev7)
URL : https://patchwork.freedesktop.org/series/22634/
State : failure
== Summary ==
Series 22634v7 drm/i915: Convert connector properties to atomic.
https://patchwork.freedesktop.org/api/1.0/series/22634/revisions/7/mbox/
Test gem_exec_flush:
Subgroup basic-batch-kernel-default-uc:
pass -> FAIL (fi-snb-2600) fdo#100007
Test kms_cursor_legacy:
Subgroup basic-flip-after-cursor-varying-size:
pass -> INCOMPLETE (fi-bxt-t5700)fdo#100007 https://bugs.freedesktop.org/show_bug.cgi?id=100007
fi-bdw-5557u total:278 pass:267 dwarn:0 dfail:0 fail:0 skip:11 time:432s fi-bdw-gvtdvm total:278 pass:256 dwarn:8 dfail:0 fail:0 skip:14 time:426s fi-bsw-n3050 total:278 pass:242 dwarn:0 dfail:0 fail:0 skip:36 time:573s fi-bxt-j4205 total:278 pass:259 dwarn:0 dfail:0 fail:0 skip:19 time:511s fi-bxt-t5700 total:203 pass:189 dwarn:0 dfail:0 fail:0 skip:13 fi-byt-j1900 total:278 pass:254 dwarn:0 dfail:0 fail:0 skip:24 time:489s fi-byt-n2820 total:278 pass:250 dwarn:0 dfail:0 fail:0 skip:28 time:479s fi-hsw-4770 total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 time:412s fi-hsw-4770r total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 time:404s fi-ilk-650 total:278 pass:228 dwarn:0 dfail:0 fail:0 skip:50 time:418s fi-ivb-3520m total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time:494s fi-ivb-3770 total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time:462s fi-kbl-7500u total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time:457s fi-kbl-7560u total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time:565s fi-skl-6260u total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time:456s fi-skl-6700hq total:278 pass:261 dwarn:0 dfail:0 fail:0 skip:17 time:572s fi-skl-6700k total:278 pass:256 dwarn:4 dfail:0 fail:0 skip:18 time:464s fi-skl-6770hq total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time:497s fi-skl-gvtdvm total:278 pass:265 dwarn:0 dfail:0 fail:0 skip:13 time:429s fi-snb-2520m total:278 pass:250 dwarn:0 dfail:0 fail:0 skip:28 time:531s fi-snb-2600 total:278 pass:248 dwarn:0 dfail:0 fail:1 skip:29 time:417s
1d490e4b6d5324cfbf8dc800cf4a99471252802c drm-tip: 2017y-04m-28d-14h-14m-47s UTC integration manifest a19e169 drm/i915: Convert intel_sdvo connector properties to atomic.
cc9a005 drm/i915: Handle force_audio correctly in intel_sdvo
e8d375f drm/i915: Convert intel_hdmi connector properties to atomic
a14800a drm/i915: Convert intel_dp properties to atomic, v2.
d381f3c drm/i915: Make intel_dp->has_audio reflect hw state only
ac661f4 drm/i915: Convert LVDS connector properties to atomic.
b1a4909 drm/i915: Convert DSI connector properties to atomic.
657436d drm/i915: Add plumbing for digital connector state, v3.
99a75d2 drm/i915: Use per-connector scaling mode property
9fc8494 drm/i915: Use atomic scaling_mode instead of panel.fitting_mode
fc9a906 drm/atomic: Add support for custom scaling mode properties, v2
1561141 drm/atomic: Handle picture_aspect_ratio in atomic core
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_4587/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for drm/i915: Convert connector properties to atomic. (rev7)
In reply to Maarten Lankhorst== Series Details ==
== Series Details ==
Series: drm/i915: Convert connector properties to atomic. (rev7)
URL : https://patchwork.freedesktop.org/series/22634/
State : success
== Summary ==
Series 22634v7 drm/i915: Convert connector properties to atomic.
https://patchwork.freedesktop.org/api/1.0/series/22634/revisions/7/mbox/
Test gem_exec_flush:
Subgroup basic-batch-kernel-default-uc:
pass -> FAIL (fi-snb-2600) fdo#100007
Test gem_exec_suspend:
Subgroup basic-s4-devices:
pass -> DMESG-WARN (fi-kbl-7560u) fdo#100125
Test kms_cursor_legacy:
Subgroup basic-flip-before-cursor-varying-size:
pass -> INCOMPLETE (fi-bxt-t5700) fdo#100706fdo#100007 https://bugs.freedesktop.org/show_bug.cgi?id=100007
fdo#100125 https://bugs.freedesktop.org/show_bug.cgi?id=100125
fdo#100706 https://bugs.freedesktop.org/show_bug.cgi?id=100706
fi-bdw-5557u total:278 pass:267 dwarn:0 dfail:0 fail:0 skip:11 time:434s fi-bdw-gvtdvm total:278 pass:256 dwarn:8 dfail:0 fail:0 skip:14 time:432s fi-bsw-n3050 total:278 pass:242 dwarn:0 dfail:0 fail:0 skip:36 time:568s fi-bxt-j4205 total:278 pass:259 dwarn:0 dfail:0 fail:0 skip:19 time:511s fi-bxt-t5700 total:206 pass:192 dwarn:0 dfail:0 fail:0 skip:13 fi-byt-j1900 total:278 pass:254 dwarn:0 dfail:0 fail:0 skip:24 time:489s fi-byt-n2820 total:278 pass:250 dwarn:0 dfail:0 fail:0 skip:28 time:488s fi-hsw-4770 total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 time:408s fi-hsw-4770r total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 time:405s fi-ilk-650 total:278 pass:228 dwarn:0 dfail:0 fail:0 skip:50 time:414s fi-ivb-3520m total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time:489s fi-ivb-3770 total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time:473s fi-kbl-7500u total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time:459s fi-kbl-7560u total:278 pass:267 dwarn:1 dfail:0 fail:0 skip:10 time:567s fi-skl-6260u total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time:448s fi-skl-6700hq total:278 pass:261 dwarn:0 dfail:0 fail:0 skip:17 time:566s fi-skl-6700k total:278 pass:256 dwarn:4 dfail:0 fail:0 skip:18 time:458s fi-skl-6770hq total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time:491s fi-skl-gvtdvm total:278 pass:265 dwarn:0 dfail:0 fail:0 skip:13 time:431s fi-snb-2520m total:278 pass:250 dwarn:0 dfail:0 fail:0 skip:28 time:530s fi-snb-2600 total:278 pass:248 dwarn:0 dfail:0 fail:1 skip:29 time:399s
1d490e4b6d5324cfbf8dc800cf4a99471252802c drm-tip: 2017y-04m-28d-14h-14m-47s UTC integration manifest 1dd5a05 drm/i915: Convert intel_sdvo connector properties to atomic.
ec20237 drm/i915: Handle force_audio correctly in intel_sdvo49d72274 drm/i915: Convert intel_hdmi connector properties to atomic
0f2b124 drm/i915: Convert intel_dp properties to atomic, v2.
576b049 drm/i915: Make intel_dp->has_audio reflect hw state only
10e25fa drm/i915: Convert LVDS connector properties to atomic.
7ede562 drm/i915: Convert DSI connector properties to atomic.78eeb6db drm/i915: Add plumbing for digital connector state, v3.
9b94848 drm/i915: Use per-connector scaling mode property
62e8693 drm/i915: Use atomic scaling_mode instead of panel.fitting_mode
af8cf3c drm/atomic: Add support for custom scaling mode properties, v2
b6cd286 drm/atomic: Handle picture_aspect_ratio in atomic core
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_4590/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx