drm/i915: Convert connector properties to atomic.
Subsystems (2)
v3 cover drm/i915: Convert connector properties to atomic.
Now that we solved all outstanding issues I think it's time to resubmit this. We now have a connector atomic_check() function which is great for validating properties, and connection_mutex that's held during the validation callbacks.
This will make all connector properties work correctly when using the atomic ioctl to update the properties.
This patch requires a backmerge of drm-misc to apply on dinq, but for reviewing it can be applied on top of drm-tip. :)
Maarten Lankhorst (13):
drm/i915: Remove unused members from intel_tv.c drm/i915: Convert intel_tv connector properties to atomic, v5. drm/i915: Convert intel_dp_mst connector properties to atomic. drm/i915: Convert intel_crt connector properties to atomic. drm/i915: Convert intel DVO connector to atomic drm/i915: Add plumbing for digital connector state. 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. 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/i915/intel_atomic.c | 177 +++++++++-- drivers/gpu/drm/i915/intel_crt.c | 10 +- drivers/gpu/drm/i915/intel_display.c | 51 +--- drivers/gpu/drm/i915/intel_dp.c | 154 ++-------- drivers/gpu/drm/i915/intel_dp_mst.c | 11 +- drivers/gpu/drm/i915/intel_drv.h | 43 ++- drivers/gpu/drm/i915/intel_dsi.c | 63 +--- drivers/gpu/drm/i915/intel_dvo.c | 4 +- drivers/gpu/drm/i915/intel_hdmi.c | 164 +++------- drivers/gpu/drm/i915/intel_lvds.c | 60 ++-- drivers/gpu/drm/i915/intel_panel.c | 4 +- drivers/gpu/drm/i915/intel_sdvo.c | 561 ++++++++++++++++++----------------- drivers/gpu/drm/i915/intel_tv.c | 208 ++++--------- 13 files changed, 644 insertions(+), 866 deletions(-)
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 1/13 drm/i915: Remove unused members from intel_tv.c
They have been unused since 2010, after the code for intel_tv_save/restore was removed.
--- drivers/gpu/drm/i915/intel_tv.c | 33 --------------------------------- 1 file changed, 33 deletions(-)
drivers/gpu/drm/i915/intel_tv.c +0 -33
@@ -50,39 +50,6 @@ struct intel_tv {int type;const char *tv_format;int margin[4 ]; -u32 save_TV_H_CTL_1; -u32 save_TV_H_CTL_2; -u32 save_TV_H_CTL_3; -u32 save_TV_V_CTL_1; -u32 save_TV_V_CTL_2; -u32 save_TV_V_CTL_3; -u32 save_TV_V_CTL_4; -u32 save_TV_V_CTL_5; -u32 save_TV_V_CTL_6; -u32 save_TV_V_CTL_7; -u32 save_TV_SC_CTL_1, save_TV_SC_CTL_2, save_TV_SC_CTL_3; - -u32 save_TV_CSC_Y; -u32 save_TV_CSC_Y2; -u32 save_TV_CSC_U; -u32 save_TV_CSC_U2; -u32 save_TV_CSC_V; -u32 save_TV_CSC_V2; -u32 save_TV_CLR_KNOBS; -u32 save_TV_CLR_LEVEL; -u32 save_TV_WIN_POS; -u32 save_TV_WIN_SIZE; -u32 save_TV_FILTER_CTL_1; -u32 save_TV_FILTER_CTL_2; -u32 save_TV_FILTER_CTL_3; - -u32 save_TV_H_LUMA[60 ]; -u32 save_TV_H_CHROMA[60 ]; -u32 save_TV_V_LUMA[43 ]; -u32 save_TV_V_CHROMA[43 ]; - -u32 save_TV_DAC; -u32 save_TV_CTL; };struct video_levels {
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v3 01/13] drm/i915: Remove unused members from intel_tv.c
Quoted 4 lines · Maarten Lankhorst
They have been unused since 2010, after the code for intel_tv_save/restore was removed.
Signed-off-by Maarten Lankhorst <[email protected]>
(I pick the easy ones ;)
-Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 2/13 drm/i915: Convert intel_tv connector properties to atomic, v5.
In reply to Maarten Lankhorstintel_tv has properties that are handled in the atomic core, but needs a modeset to update the properties inside the connector.
The detect(), get_mode() and mode_valid() probe callbacks also depend on the connector state, which made this a good connector to convert first. It helped find all the issues when converting connectors to atomic.
Because of these requirements, connector atomic_check() was added and connection_mutex is held during probing. The diffstat looks more favorable now. :)
Changes since v1:
- Add intel_encoder->swap_state to allow updating connector state.
- Add intel_tv->format for detect_mode and mode_valid, updated on atomic commit. Changes since v2:
- Fix typo in tv_choose_preferred modes function name.
- Assignment of tv properties is done in core, so intel_tv only needs a atomic_check function. Thanks Ville!
Changes since v3:
- connection_mutex is now held in mode_valid() and get_modes(), this removes the need for caching parts of the connector_state.
Changes since v4:
- Use the new atomic connector check function.
--- drivers/gpu/drm/i915/intel_tv.c | 175 +++++++++++++++------------------------- 1 file changed, 63 insertions(+), 112 deletions(-)
drivers/gpu/drm/i915/intel_tv.c +63 -112
@@ -48,8 +48,6 @@ struct intel_tv {struct intel_encoder base;int type; -const char *tv_format; -int margin[4 ]; };struct video_levels {
@@ -840,32 +838,18 @@ intel_disable_tv(struct intel_encoder *encoder,I915_WRITE (TV_CTL ,I915_READ (TV_CTL ) & ~TV_ENC_ENABLE ); } -static const struct tv_mode * -intel_tv_mode_lookup (const char *tv_format) +static const struct tv_mode *intel_tv_mode_find (struct drm_connector_state *conn_state) { -int i; - -for (i =0 ; i <ARRAY_SIZE (tv_modes); i++) { -const struct tv_mode *tv_mode = &tv_modes[i]; +int format = conn_state->tv.mode; -if (!strcmp (tv_format, tv_mode->name)) -return tv_mode; - } -return NULL ; -} - -static const struct tv_mode * -intel_tv_mode_find (struct intel_tv *intel_tv) -{ -return intel_tv_mode_lookup (intel_tv->tv_format); +return &tv_modes[format]; }static enum drm_mode_status intel_tv_mode_valid (struct drm_connector *connector,struct drm_display_mode *mode) { -struct intel_tv *intel_tv =intel_attached_tv (connector); -const struct tv_mode *tv_mode =intel_tv_mode_find (intel_tv); +const struct tv_mode *tv_mode =intel_tv_mode_find (connector->state);int max_dotclk =to_i915 (connector->dev)->max_dotclk_freq;if (mode->clock > max_dotclk)
@@ -892,8 +876,7 @@ intel_tv_compute_config(struct intel_encoder *encoder,struct intel_crtc_state *pipe_config, struct drm_connector_state *conn_state) { - struct intel_tv *intel_tv = enc_to_tv(encoder); -const struct tv_mode *tv_mode =intel_tv_mode_find (intel_tv); + const struct tv_mode *tv_mode = intel_tv_mode_find(conn_state);if (!tv_mode)return false;
@@ -999,7 +982,7 @@ static void intel_tv_pre_enable(struct intel_encoder *encoder,struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_crtc *intel_crtc =to_intel_crtc (encoder->base.crtc);struct intel_tv *intel_tv =enc_to_tv (encoder); -const struct tv_mode *tv_mode =intel_tv_mode_find (intel_tv); +const struct tv_mode *tv_mode =intel_tv_mode_find (conn_state);u32 tv_ctl;u32 scctl1, scctl2, scctl3;int i, j;
@@ -1102,12 +1085,12 @@ static void intel_tv_pre_enable(struct intel_encoder *encoder,else ysize =2 *tv_mode->nbr_end +1 ; - xpos += intel_tv->margin[TV_MARGIN_LEFT ]; - ypos += intel_tv->margin[TV_MARGIN_TOP ]; - xsize -= (intel_tv->margin[TV_MARGIN_LEFT ] + - intel_tv->margin[TV_MARGIN_RIGHT ]); - ysize -= (intel_tv->margin[TV_MARGIN_TOP ] + - intel_tv->margin[TV_MARGIN_BOTTOM ]); + xpos += conn_state->tv.margins.left; + ypos += conn_state->tv.margins.top; + xsize -= (conn_state->tv.margins.left + + conn_state->tv.margins.right); + ysize -= (conn_state->tv.margins.top + + conn_state->tv.margins.bottom);I915_WRITE (TV_WIN_POS , (xpos<<16 )|ypos);I915_WRITE (TV_WIN_SIZE , (xsize<<16 )|ysize);
@@ -1255,7 +1238,7 @@ intel_tv_detect_type(struct intel_tv *intel_tv,static void intel_tv_find_better_format (struct drm_connector *connector) {struct intel_tv *intel_tv =intel_attached_tv (connector); -const struct tv_mode *tv_mode =intel_tv_mode_find (intel_tv); +const struct tv_mode *tv_mode =intel_tv_mode_find (connector->state);int i; if ((intel_tv->type == DRM_MODE_CONNECTOR_Component) ==
@@ -1271,9 +1254,7 @@ static void intel_tv_find_better_format(struct drm_connector *connector)break ; } - intel_tv->tv_format = tv_mode->name; -drm_object_property_set_value (&connector->base, - connector->dev->mode_config.tv_mode_property, i); + connector->state->tv.mode = i; }/**
@@ -1314,16 +1295,15 @@ intel_tv_detect(struct drm_connector *connector, connector_status_connected; }else status = connector_status_unknown; - }else -return connector->status; -if (status != connector_status_connected) -return status; - - intel_tv->type = type; -intel_tv_find_better_format (connector); +if (status == connector_status_connected) { + intel_tv->type = type; +intel_tv_find_better_format (connector); + } -return connector_status_connected; +return status; + }else +return connector->status; } static const struct input_res {
@@ -1343,12 +1323,9 @@ static const struct input_res {* Chose preferred mode according to line number of TV format */ static void -intel_tv_chose_preferred_modes (struct drm_connector *connector, +intel_tv_choose_preferred_modes (const struct tv_mode *tv_mode,struct drm_display_mode *mode_ptr) { -struct intel_tv *intel_tv =intel_attached_tv (connector); -const struct tv_mode *tv_mode =intel_tv_mode_find (intel_tv); -if (tv_mode->nbr_end <480 && mode_ptr->vdisplay ==480 ) mode_ptr->type |=DRM_MODE_TYPE_PREFERRED ;else if (tv_mode->nbr_end >480 ) {
@@ -1371,8 +1348,7 @@ static int intel_tv_get_modes(struct drm_connector *connector) {struct drm_display_mode *mode_ptr; -struct intel_tv *intel_tv =intel_attached_tv (connector); -const struct tv_mode *tv_mode =intel_tv_mode_find (intel_tv); +const struct tv_mode *tv_mode =intel_tv_mode_find (connector->state);int j, count =0 ;u64 tmp;
@@ -1415,7 +1391,7 @@ intel_tv_get_modes(struct drm_connector *connector) mode_ptr->clock = (int ) tmp; mode_ptr->type =DRM_MODE_TYPE_DRIVER ; -intel_tv_chose_preferred_modes (connector, mode_ptr); +intel_tv_choose_preferred_modes (tv_mode, mode_ptr);drm_mode_probed_add (connector, mode_ptr); count++; }
@@ -1430,74 +1406,47 @@ intel_tv_destroy(struct drm_connector *connector)kfree (connector); } - -static int -intel_tv_set_property (struct drm_connector *connector,struct drm_property *property, -uint64_t val) -{ -struct drm_device *dev = connector->dev; -struct intel_tv *intel_tv =intel_attached_tv (connector); -struct drm_crtc *crtc = intel_tv->base.base.crtc; -int ret =0 ; -bool changed = false; - - ret =drm_object_property_set_value (&connector->base, property, val); -if (ret <0 ) - goto out; - -if (property == dev->mode_config.tv_left_margin_property && - intel_tv->margin[TV_MARGIN_LEFT ] != val) { - intel_tv->margin[TV_MARGIN_LEFT ] = val; - changed = true; - }else if (property == dev->mode_config.tv_right_margin_property && - intel_tv->margin[TV_MARGIN_RIGHT ] != val) { - intel_tv->margin[TV_MARGIN_RIGHT ] = val; - changed = true; - }else if (property == dev->mode_config.tv_top_margin_property && - intel_tv->margin[TV_MARGIN_TOP ] != val) { - intel_tv->margin[TV_MARGIN_TOP ] = val; - changed = true; - }else if (property == dev->mode_config.tv_bottom_margin_property && - intel_tv->margin[TV_MARGIN_BOTTOM ] != val) { - intel_tv->margin[TV_MARGIN_BOTTOM ] = val; - changed = true; - }else if (property == dev->mode_config.tv_mode_property) { -if (val >=ARRAY_SIZE (tv_modes)) { - ret = -EINVAL ; - goto out; - } -if (!strcmp (intel_tv->tv_format, tv_modes[val].name)) - goto out; - - intel_tv->tv_format = tv_modes[val].name; - changed = true; - }else { - ret = -EINVAL ; - goto out; - } - -if (changed && crtc) -intel_crtc_restore_mode (crtc); -out: -return ret; -} -static const struct drm_connector_funcs intel_tv_connector_funcs = { .dpms = drm_atomic_helper_connector_dpms, .late_register = intel_connector_register, .early_unregister = intel_connector_unregister, .destroy = intel_tv_destroy, - .set_property = intel_tv_set_property, - .atomic_get_property = intel_connector_atomic_get_property, + .set_property = drm_atomic_helper_connector_set_property, .fill_modes = drm_helper_probe_single_connector_modes, .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, }; +static int intel_tv_atomic_check (struct drm_connector *connector, +struct drm_connector_state *new_state) +{ +struct drm_crtc_state *new_crtc_state; +struct drm_connector_state *old_state; + +if (!new_state->crtc) +return 0 ; + + old_state =drm_atomic_get_old_connector_state (new_state->state, connector); + new_crtc_state =drm_atomic_get_new_crtc_state (new_state->state, new_state->crtc); + +if (old_state->tv.mode != new_state->tv.mode || + old_state->tv.margins.left != new_state->tv.margins.left || + old_state->tv.margins.right != new_state->tv.margins.right || + old_state->tv.margins.top != new_state->tv.margins.top || + old_state->tv.margins.bottom != new_state->tv.margins.bottom) { +/* Force a modeset. */ + + new_crtc_state->connectors_changed = true; + } + +return 0 ; +} +static const struct drm_connector_helper_funcs intel_tv_connector_helper_funcs = { .detect_ctx = intel_tv_detect, .mode_valid = intel_tv_mode_valid, .get_modes = intel_tv_get_modes, + .atomic_check = intel_tv_atomic_check, };static const struct drm_encoder_funcs intel_tv_enc_funcs = {
@@ -1515,6 +1464,7 @@ intel_tv_init(struct drm_i915_private *dev_priv)u32 tv_dac_on, tv_dac_off, save_tv_dac;const char *tv_format_names[ARRAY_SIZE (tv_modes)];int i, initial_mode =0 ; +struct drm_connector_state *state;if ((I915_READ (TV_CTL ) &TV_FUSE_STATE_MASK ) ==TV_FUSE_STATE_DISABLED )return ;
@@ -1560,6 +1510,7 @@ intel_tv_init(struct drm_i915_private *dev_priv) intel_encoder = &intel_tv->base; connector = &intel_connector->base; + state = connector->state;/* The documentation, for the older chipsets at least, recommend * using a polling method rather than hotplug detection for TVs.
@@ -1597,12 +1548,12 @@ intel_tv_init(struct drm_i915_private *dev_priv) intel_tv->type = DRM_MODE_CONNECTOR_Unknown;/* BIOS margin values */ - intel_tv->margin[TV_MARGIN_LEFT ] =54 ; - intel_tv->margin[TV_MARGIN_TOP ] =36 ; - intel_tv->margin[TV_MARGIN_RIGHT ] =46 ; - intel_tv->margin[TV_MARGIN_BOTTOM ] =37 ; + state->tv.margins.left =54 ; + state->tv.margins.top =36 ; + state->tv.margins.right =46 ; + state->tv.margins.bottom =37 ; - intel_tv->tv_format = tv_modes[initial_mode].name; + state->tv.mode = initial_mode;drm_connector_helper_add (connector, &intel_tv_connector_helper_funcs); connector->interlace_allowed = false;
@@ -1616,17 +1567,17 @@ intel_tv_init(struct drm_i915_private *dev_priv) tv_format_names);drm_object_attach_property (&connector->base, dev->mode_config.tv_mode_property, - initial_mode); + state->tv.mode);drm_object_attach_property (&connector->base, dev->mode_config.tv_left_margin_property, - intel_tv->margin[TV_MARGIN_LEFT ]); + state->tv.margins.left);drm_object_attach_property (&connector->base, dev->mode_config.tv_top_margin_property, - intel_tv->margin[TV_MARGIN_TOP ]); + state->tv.margins.top);drm_object_attach_property (&connector->base, dev->mode_config.tv_right_margin_property, - intel_tv->margin[TV_MARGIN_RIGHT ]); + state->tv.margins.right);drm_object_attach_property (&connector->base, dev->mode_config.tv_bottom_margin_property, - intel_tv->margin[TV_MARGIN_BOTTOM ]); + state->tv.margins.bottom); }
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 3/13 drm/i915: Convert intel_dp_mst connector properties to atomic.
In reply to Maarten LankhorstMST doesn't support setting any properties, but it should still use the atomic helper for setting properties.
Only path and tile properties are supported (read-only). Those are immutable, and handled by drm core.
--- drivers/gpu/drm/i915/intel_dp_mst.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-)
drivers/gpu/drm/i915/intel_dp_mst.c +1 -10
@@ -294,14 +294,6 @@ intel_dp_mst_detect(struct drm_connector *connector, bool force)return drm_dp_mst_detect_port (connector, &intel_dp->mst_mgr, intel_connector->port); } -static int -intel_dp_mst_set_property (struct drm_connector *connector, -struct drm_property *property, -uint64_t val) -{ -return 0 ; -} -static void intel_dp_mst_connector_destroy (struct drm_connector *connector) {
@@ -318,8 +310,7 @@ static const struct drm_connector_funcs intel_dp_mst_connector_funcs = { .dpms = drm_atomic_helper_connector_dpms, .detect = intel_dp_mst_detect, .fill_modes = drm_helper_probe_single_connector_modes, - .set_property = intel_dp_mst_set_property, - .atomic_get_property = intel_connector_atomic_get_property, + .set_property = drm_atomic_helper_connector_set_property, .late_register = intel_connector_register, .early_unregister = intel_connector_unregister, .destroy = intel_dp_mst_connector_destroy,
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 1/1 drm/i915: Remove unused dp properties for dp-mst.
Those properties are not hooked up on MST and were ignored. Best not expose them at all. Without this the next patch fails to start on X.org, because the DP-MST properties could not be read.
---
drivers/gpu/drm/i915/intel_dp.c +1 -1
@@ -5054,7 +5054,7 @@ bool intel_dp_is_edp(struct drm_i915_private *dev_priv, enum port port)return intel_bios_is_port_edp (dev_priv, port); } -void +static void intel_dp_add_properties (struct intel_dp *intel_dp,struct drm_connector *connector) {intel_attach_force_audio_property (connector);
drivers/gpu/drm/i915/intel_dp_mst.c +0 -1
@@ -450,7 +450,6 @@ static struct drm_connector *intel_dp_add_mst_connector(struct drm_dp_mst_topolodrm_mode_connector_attach_encoder (&intel_connector->base, &intel_dp->mst_encoders[i]->base.base); } -intel_dp_add_properties (intel_dp, connector);drm_object_attach_property (&connector->base, dev->mode_config.path_property,0 );drm_object_attach_property (&connector->base, dev->mode_config.tile_property,0 );
drivers/gpu/drm/i915/intel_drv.h +0 -1
@@ -1503,7 +1503,6 @@ void intel_edp_backlight_off(struct intel_dp *intel_dp);void intel_edp_panel_vdd_on (struct intel_dp *intel_dp);void intel_edp_panel_on (struct intel_dp *intel_dp);void intel_edp_panel_off (struct intel_dp *intel_dp); -void intel_dp_add_properties (struct intel_dp *intel_dp,struct drm_connector *connector);void intel_dp_mst_suspend (struct drm_device *dev);void intel_dp_mst_resume (struct drm_device *dev);int intel_dp_max_link_rate (struct intel_dp *intel_dp);
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v3 2.5/13] drm/i915: Remove unused dp properties for dp-mst.
Quoted 5 lines · Maarten Lankhorst
Those properties are not hooked up on MST and were ignored. Best not expose them at all. Without this the next patch fails to start on X.org, because the DP-MST properties could not be read.
Signed-off-by Maarten Lankhorst <[email protected]>
Oops. Time for a kms_getproperty testcase to make sure we can read all the props at least?
I'm still owing Chris a kms_getproperty consistency testcase ... we could do some substests.
With the testcase added and listed in the commit message:
Quoted 43 lines
---
drivers/gpu/drm/i915/intel_dp.c +1
-1@@ -5054,7 +5054,7 @@ bool intel_dp_is_edp(struct drm_i915_private *dev_priv, enum port port)return intel_bios_is_port_edp (dev_priv, port); } -void +static void intel_dp_add_properties (struct intel_dp *intel_dp,struct drm_connector *connector) {intel_attach_force_audio_property (connector);drivers/gpu/drm/i915/intel_dp_mst.c +0
-1@@ -450,7 +450,6 @@ static struct drm_connector *intel_dp_add_mst_connector(struct drm_dp_mst_topolodrm_mode_connector_attach_encoder (&intel_connector->base, &intel_dp->mst_encoders[i]->base.base); } -intel_dp_add_properties (intel_dp, connector);drm_object_attach_property (&connector->base, dev->mode_config.path_property,0 );drm_object_attach_property (&connector->base, dev->mode_config.tile_property,0 );drivers/gpu/drm/i915/intel_drv.h +0
-1@@ -1503,7 +1503,6 @@ void intel_edp_backlight_off(struct intel_dp *intel_dp);void intel_edp_panel_vdd_on (struct intel_dp *intel_dp);void intel_edp_panel_on (struct intel_dp *intel_dp);void intel_edp_panel_off (struct intel_dp *intel_dp); -void intel_dp_add_properties (struct intel_dp *intel_dp,struct drm_connector *connector);void intel_dp_mst_suspend (struct drm_device *dev);void intel_dp_mst_resume (struct drm_device *dev);int intel_dp_max_link_rate (struct intel_dp *intel_dp);_______________________________________________
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
PATCH v3 4/13 drm/i915: Convert intel_crt connector properties to atomic.
In reply to Maarten LankhorstNo properties are supported, so just use the helper and reject everything.
--- drivers/gpu/drm/i915/intel_crt.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-)
drivers/gpu/drm/i915/intel_crt.c +1 -9
@@ -777,13 +777,6 @@ static int intel_crt_get_modes(struct drm_connector *connector)return ret; } -static int intel_crt_set_property (struct drm_connector *connector, -struct drm_property *property, -uint64_t value) -{ -return 0 ; -} -void intel_crt_reset (struct drm_encoder *encoder) {struct drm_i915_private *dev_priv =to_i915 (encoder->dev);
@@ -814,10 +807,9 @@ static const struct drm_connector_funcs intel_crt_connector_funcs = { .late_register = intel_connector_register, .early_unregister = intel_connector_unregister, .destroy = intel_crt_destroy, - .set_property = intel_crt_set_property, + .set_property = drm_atomic_helper_connector_set_property, .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, - .atomic_get_property = intel_connector_atomic_get_property, };static const struct drm_connector_helper_funcs intel_crt_connector_helper_funcs = {
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v3 04/13] drm/i915: Convert intel_crt connector properties to atomic.
Quoted 4 lines · Maarten Lankhorst
No properties are supported, so just use the helper and reject everything.
Signed-off-by Maarten Lankhorst <[email protected]>
Quoted 41 lines
--- drivers/gpu/drm/i915/intel_crt.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-)drivers/gpu/drm/i915/intel_crt.c +1
-9@@ -777,13 +777,6 @@ static int intel_crt_get_modes(struct drm_connector *connector)return ret; } -static int intel_crt_set_property (struct drm_connector *connector, -struct drm_property *property, -uint64_t value) -{ -return 0 ; -} -void intel_crt_reset (struct drm_encoder *encoder) {struct drm_i915_private *dev_priv =to_i915 (encoder->dev);@@ -814,10 +807,9 @@ static const struct drm_connector_funcs intel_crt_connector_funcs = { .late_register = intel_connector_register, .early_unregister = intel_connector_unregister, .destroy = intel_crt_destroy, - .set_property = intel_crt_set_property, + .set_property = drm_atomic_helper_connector_set_property, .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, - .atomic_get_property = intel_connector_atomic_get_property, };static const struct drm_connector_helper_funcs intel_crt_connector_helper_funcs = {Signature · 6 lines
2.7.4 _______________________________________________ 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
PATCH v3 5/13 drm/i915: Convert intel DVO connector to atomic
In reply to Maarten LankhorstNo properties are supported, so just use the helper and reject everything.
--- drivers/gpu/drm/i915/intel_dvo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_dvo.c +1 -1
@@ -350,7 +350,7 @@ static const struct drm_connector_funcs intel_dvo_connector_funcs = { .early_unregister = intel_connector_unregister, .destroy = intel_dvo_destroy, .fill_modes = drm_helper_probe_single_connector_modes, - .atomic_get_property = intel_connector_atomic_get_property, + .set_property = drm_atomic_helper_connector_set_property, .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, };
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v3 05/13] drm/i915: Convert intel DVO connector to atomic
Quoted 3 lines · Maarten Lankhorst
No properties are supported, so just use the helper and reject everything.
Signed-off-by Maarten Lankhorst <[email protected]>
Quoted 24 lines
--- drivers/gpu/drm/i915/intel_dvo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/i915/intel_dvo.c +1
-1@@ -350,7 +350,7 @@ static const struct drm_connector_funcs intel_dvo_connector_funcs = { .early_unregister = intel_connector_unregister, .destroy = intel_dvo_destroy, .fill_modes = drm_helper_probe_single_connector_modes, - .atomic_get_property = intel_connector_atomic_get_property, + .set_property = drm_atomic_helper_connector_set_property, .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, };Signature · 6 lines
2.7.4 _______________________________________________ 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
PATCH v3 6/13 drm/i915: Add plumbing for digital connector state.
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.
--- drivers/gpu/drm/i915/intel_atomic.c | 175 +++++++++++++++++++++++++++++++++-- drivers/gpu/drm/i915/intel_display.c | 14 ++- drivers/gpu/drm/i915/intel_dp.c | 2 +- drivers/gpu/drm/i915/intel_drv.h | 32 ++++++- drivers/gpu/drm/i915/intel_dsi.c | 2 +- drivers/gpu/drm/i915/intel_dvo.c | 2 +- drivers/gpu/drm/i915/intel_lvds.c | 2 +- drivers/gpu/drm/i915/intel_panel.c | 4 +- 8 files changed, 218 insertions(+), 15 deletions(-)
drivers/gpu/drm/i915/intel_atomic.c +168 -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,166 @@ 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->mode_config.scaling_mode_property) + *val = intel_conn_state->panel.fitting_mode; +else 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 if (property == dev->mode_config.aspect_ratio_property) { +switch (intel_conn_state->aspect_ratio) { +case HDMI_PICTURE_ASPECT_NONE : *val =DRM_MODE_PICTURE_ASPECT_NONE ;break ; +case HDMI_PICTURE_ASPECT_4_3 : *val =DRM_MODE_PICTURE_ASPECT_4_3 ;break ; +case HDMI_PICTURE_ASPECT_16_9 : *val =DRM_MODE_PICTURE_ASPECT_16_9 ;break ; +default : +MISSING_CASE (intel_conn_state->aspect_ratio); +return -EINVAL ; + } + }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 intel_connector *intel_connector =to_intel_connector (connector); +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->mode_config.scaling_mode_property) { +if (BIT (val) & ~intel_connector->panel.allowed_fitting_mode_mask) { +DRM_DEBUG_ATOMIC ("[CONNECTOR:%d:%s] Panel fitting mode %llu not allowed.\n" , + connector->base.id, connector->name, val); +return -EINVAL ; + } + + intel_conn_state->panel.fitting_mode = val; +return 0 ; + } + +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 ; + } + +if (property == dev->mode_config.aspect_ratio_property) { +switch (val) { +case DRM_MODE_PICTURE_ASPECT_NONE : + intel_conn_state->aspect_ratio =HDMI_PICTURE_ASPECT_NONE ; +break ; +case DRM_MODE_PICTURE_ASPECT_4_3 : + intel_conn_state->aspect_ratio =HDMI_PICTURE_ASPECT_4_3 ; +break ; +case DRM_MODE_PICTURE_ASPECT_16_9 : + intel_conn_state->aspect_ratio =HDMI_PICTURE_ASPECT_16_9 ; +break ; +default : +DRM_DEBUG_ATOMIC ("Unknown picture aspect ratio %lli\n" , val); +return -EINVAL ; + } +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); + +/* Invisible to fastset since it's a pure connector property */ +if (new_conn_state->panel.fitting_mode != old_conn_state->panel.fitting_mode) + crtc_state->connectors_changed = true; + +/* +* 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->aspect_ratio != old_conn_state->aspect_ratio) + 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_dp.c +1 -1
@@ -5905,7 +5905,7 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp, pipe_name(pipe)); } -intel_panel_init (&intel_connector->panel, fixed_mode, downclock_mode); +intel_panel_init (&intel_connector->panel, fixed_mode, downclock_mode,0 ); intel_connector->panel.backlight.power = intel_edp_backlight_power;intel_panel_setup_backlight (connector, pipe);
drivers/gpu/drm/i915/intel_drv.h +31 -1
@@ -262,6 +262,7 @@ struct intel_panel {struct drm_display_mode *fixed_mode;struct drm_display_mode *downclock_mode;int fitting_mode; +unsigned allowed_fitting_mode_mask;/* backlight */ struct {
@@ -323,6 +324,20 @@ struct intel_connector {struct intel_dp *mst_port; }; +struct intel_digital_connector_state { +struct drm_connector_state base; + +struct { +int fitting_mode; + } panel; + +enum hdmi_force_audio force_audio; +int broadcast_rgb; +enum hdmi_picture_aspect aspect_ratio; +}; + +#define to_intel_digital_connector_state (x) container_of(x, struct intel_digital_connector_state, base) +struct dpll {/* given values */ int n;
@@ -1665,7 +1680,8 @@ void intel_overlay_reset(struct drm_i915_private *dev_priv);/* intel_panel.c */ int intel_panel_init (struct intel_panel *panel,struct drm_display_mode *fixed_mode, -struct drm_display_mode *downclock_mode); +struct drm_display_mode *downclock_mode, +unsigned allowed_fitting_mode_mask);void intel_panel_fini (struct intel_panel *panel);void intel_fixed_panel_mode (const struct drm_display_mode *fixed_mode,struct drm_display_mode *adjusted_mode);
@@ -1876,6 +1892,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);
drivers/gpu/drm/i915/intel_dsi.c +1 -1
@@ -1853,7 +1853,7 @@ void intel_dsi_init(struct drm_i915_private *dev_priv) connector->display_info.width_mm = fixed_mode->width_mm; connector->display_info.height_mm = fixed_mode->height_mm; -intel_panel_init (&intel_connector->panel, fixed_mode,NULL ); +intel_panel_init (&intel_connector->panel, fixed_mode,NULL ,0 );intel_panel_setup_backlight (connector,INVALID_PIPE );intel_dsi_add_properties (intel_connector);
drivers/gpu/drm/i915/intel_dvo.c +1 -1
@@ -554,7 +554,7 @@ void intel_dvo_init(struct drm_i915_private *dev_priv)*/ intel_panel_init (&intel_connector->panel,intel_dvo_get_current_mode (connector), -NULL ); +NULL ,0 ); intel_dvo->panel_wants_dither = true; }
drivers/gpu/drm/i915/intel_lvds.c +1 -1
@@ -1181,7 +1181,7 @@ void intel_lvds_init(struct drm_i915_private *dev_priv) out:mutex_unlock (&dev->mode_config.mutex); -intel_panel_init (&intel_connector->panel, fixed_mode, downclock_mode); +intel_panel_init (&intel_connector->panel, fixed_mode, downclock_mode,0 );intel_panel_setup_backlight (connector,INVALID_PIPE ); lvds_encoder->is_dual_link =compute_is_dual_link_lvds (lvds_encoder);
drivers/gpu/drm/i915/intel_panel.c +3 -1
@@ -1801,12 +1801,14 @@ intel_panel_init_backlight_funcs(struct intel_panel *panel)int intel_panel_init (struct intel_panel *panel,struct drm_display_mode *fixed_mode, -struct drm_display_mode *downclock_mode) +struct drm_display_mode *downclock_mode, +unsigned allowed_fitting_mode_mask) {intel_panel_init_backlight_funcs (panel); panel->fixed_mode = fixed_mode; panel->downclock_mode = downclock_mode; + panel->allowed_fitting_mode_mask = allowed_fitting_mode_mask;return 0 ; }
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v3 06/13] drm/i915: Add plumbing for digital connector state.
Quoted 15 lines · Maarten Lankhorst
drivers/gpu/drm/i915/intel_atomic.c +15
-0+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->mode_config.scaling_mode_property) + *val = intel_conn_state->panel.fitting_mode; +else if (property == dev_priv->force_audio_property) + *val = intel_conn_state->force_audio; +else if (property == dev_priv->broadcast_rgb_property)
drivers/gpu/drm/i915/intel_atomic.c intel_connector_atomic_get_property(struct drm_connector *connector, · line 111
Quoted 10 lines
drivers/gpu/drm/i915/intel_atomic.c +10
-0+ *val = intel_conn_state->broadcast_rgb; + else if (property == dev->mode_config.aspect_ratio_property) { +switch (intel_conn_state->aspect_ratio) { +case HDMI_PICTURE_ASPECT_NONE : *val =DRM_MODE_PICTURE_ASPECT_NONE ;break ; +case HDMI_PICTURE_ASPECT_4_3 : *val =DRM_MODE_PICTURE_ASPECT_4_3 ;break ; +case HDMI_PICTURE_ASPECT_16_9 : *val =DRM_MODE_PICTURE_ASPECT_16_9 ;break ; +default : +MISSING_CASE (intel_conn_state->aspect_ratio); +return -EINVAL ; + }
So I'm annoying, but I think this is a really good time to standardize all these and push them into drm_connector_state. With docs and everything. They are already core properties, might as well properly decode them if they're present.
I can help with typing the kernel-doc for this stuff, right now the DOC:
section in drm_connector.c only documents the standard props, none of the ones you can add by calling one of the helpers.
Sorry I'm this late with this feedback, but I feel fairly strongly about decoding standardized props in the core and putting them into shared structs.
-Daniel
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
PATCH v3 7/13 drm/i915: Convert DSI connector properties to atomic.
In reply to Maarten Lankhorst--- drivers/gpu/drm/i915/intel_dsi.c | 61 +++++++++------------------------------- 1 file changed, 13 insertions(+), 48 deletions(-)
drivers/gpu/drm/i915/intel_dsi.c +13 -48
@@ -311,6 +311,8 @@ static bool intel_dsi_compute_config(struct intel_encoder *encoder,struct intel_crtc *crtc =to_intel_crtc (pipe_config->base.crtc);const struct drm_display_mode *fixed_mode = intel_connector->panel.fixed_mode;struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode; +struct intel_digital_connector_state *intel_conn_state = +to_intel_digital_connector_state (conn_state);int ret;DRM_DEBUG_KMS ("\n" );
@@ -320,10 +322,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); + intel_conn_state->panel.fitting_mode);else intel_pch_panel_fitting (crtc, pipe_config, - intel_connector->panel.fitting_mode); + intel_conn_state->panel.fitting_mode); }/* DSI uses short packets for sync events, so clear mode flags for DSI */
@@ -1588,48 +1590,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_device *dev = connector->dev; -struct intel_connector *intel_connector =to_intel_connector (connector); -struct drm_crtc *crtc; -int ret; - - ret =drm_object_property_set_value (&connector->base, property, val); -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 (intel_connector->panel.fitting_mode == val) -return 0 ; - - intel_connector->panel.fitting_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);
@@ -1658,6 +1618,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 = {
@@ -1666,10 +1627,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)
@@ -1677,11 +1639,14 @@ static void intel_dsi_add_properties(struct intel_connector *connector)struct drm_device *dev = connector->base.dev;if (connector->panel.fixed_mode) { +struct intel_digital_connector_state *conn_state = +to_intel_digital_connector_state (connector->base.state); +drm_mode_create_scaling_mode_property (dev);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 ; + conn_state->panel.fitting_mode =DRM_MODE_SCALE_ASPECT ; } }
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 8/13 drm/i915: Convert LVDS connector properties to atomic.
In reply to Maarten Lankhorst--- drivers/gpu/drm/i915/intel_lvds.c | 60 +++++++++++++-------------------------- 1 file changed, 19 insertions(+), 41 deletions(-)
drivers/gpu/drm/i915/intel_lvds.c +19 -41
@@ -401,6 +401,9 @@ static bool intel_lvds_compute_config(struct intel_encoder *intel_encoder, &lvds_encoder->attached_connector->base;struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode;struct intel_crtc *intel_crtc =to_intel_crtc (pipe_config->base.crtc); +struct intel_digital_connector_state *intel_conn_state = +to_intel_digital_connector_state (conn_state); +unsigned int lvds_bpp;/* Should never happen!! */
@@ -433,10 +436,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); + intel_conn_state->panel.fitting_mode); }else {intel_gmch_panel_fitting (intel_crtc, pipe_config, - intel_connector->panel.fitting_mode); + intel_conn_state->panel.fitting_mode); }
@@ -598,56 +601,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) -{ -struct intel_connector *intel_connector =to_intel_connector (connector); -struct drm_device *dev = connector->dev; - -if (property == dev->mode_config.scaling_mode_property) { -struct drm_crtc *crtc; - -if (value ==DRM_MODE_SCALE_NONE ) { -DRM_DEBUG_KMS ("no scaling not supported\n" ); -return -EINVAL ; - } - -if (intel_connector->panel.fitting_mode == value) { -/* the LVDS scaling property is not changed */ -return 0 ; - } - intel_connector->panel.fitting_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 = {
@@ -988,6 +959,8 @@ void intel_lvds_init(struct drm_i915_private *dev_priv)u32 lvds;int pipe;u8 pin; +unsigned allowed_fittings; +struct intel_digital_connector_state *conn_state;if (!intel_lvds_supported (dev_priv))return ;
@@ -1087,7 +1060,8 @@ 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 ; + conn_state =to_intel_digital_connector_state (connector->state); + conn_state->panel.fitting_mode =DRM_MODE_SCALE_ASPECT ;intel_lvds_pps_get_hw_state (dev_priv, &lvds_encoder->init_pps); lvds_encoder->init_lvds_val = lvds;
@@ -1181,7 +1155,11 @@ void intel_lvds_init(struct drm_i915_private *dev_priv) out:mutex_unlock (&dev->mode_config.mutex); -intel_panel_init (&intel_connector->panel, fixed_mode, downclock_mode,0 ); + allowed_fittings =BIT (DRM_MODE_SCALE_CENTER ); + allowed_fittings |=BIT (DRM_MODE_SCALE_ASPECT ); + allowed_fittings |=BIT (DRM_MODE_SCALE_FULLSCREEN ); + +intel_panel_init (&intel_connector->panel, fixed_mode, downclock_mode, allowed_fittings);intel_panel_setup_backlight (connector,INVALID_PIPE ); lvds_encoder->is_dual_link =compute_is_dual_link_lvds (lvds_encoder);
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 9/13 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
@@ -1665,7 +1665,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,
@@ -4587,10 +4592,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
@@ -4787,19 +4789,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,
@@ -4817,22 +4806,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.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 10/13 drm/i915: Convert intel_dp properties to atomic.
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.
--- drivers/gpu/drm/i915/intel_dp.c | 138 ++++++++------------------------------- drivers/gpu/drm/i915/intel_drv.h | 3 - 2 files changed, 26 insertions(+), 115 deletions(-)
drivers/gpu/drm/i915/intel_dp.c +26 -112
@@ -1641,6 +1641,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);
@@ -1667,10 +1669,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,
@@ -1685,10 +1687,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); + intel_conn_state->panel.fitting_mode);else intel_pch_panel_fitting (intel_crtc, pipe_config, - intel_connector->panel.fitting_mode); + intel_conn_state->panel.fitting_mode); }if (adjusted_mode->flags &DRM_MODE_FLAG_DBLCLK )
@@ -1755,7 +1757,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
@@ -1767,7 +1769,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;
@@ -4790,104 +4792,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_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; - - 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 (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 (intel_connector->panel.fitting_mode == val) { -/* the eDP scaling property is not changed */ -return 0 ; - } - intel_connector->panel.fitting_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);
@@ -5045,19 +4949,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 = {
@@ -5151,19 +5057,19 @@ bool intel_dp_is_edp(struct drm_i915_private *dev_priv, enum port port)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;if (is_edp (intel_dp)) { +struct intel_digital_connector_state *conn_state = +to_intel_digital_connector_state (connector->state); +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 ); - intel_connector->panel.fitting_mode =DRM_MODE_SCALE_ASPECT ; + conn_state->panel.fitting_mode =DRM_MODE_SCALE_ASPECT ; } }
@@ -5806,6 +5712,7 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp,struct drm_display_mode *scan;struct edid *edid;enum pipe pipe =INVALID_PIPE ; +unsigned allowed_fittings;if (!is_edp (intel_dp))return true;
@@ -5899,7 +5806,14 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp, pipe_name(pipe)); } -intel_panel_init (&intel_connector->panel, fixed_mode, downclock_mode,0 ); + allowed_fittings =0 ; +if (!HAS_GMCH_DISPLAY (dev_priv)) + allowed_fittings |=BIT (DRM_MODE_SCALE_CENTER ); + allowed_fittings |=BIT (DRM_MODE_SCALE_ASPECT ); + allowed_fittings |=BIT (DRM_MODE_SCALE_FULLSCREEN ); + +intel_panel_init (&intel_connector->panel, fixed_mode, downclock_mode, + allowed_fittings); intel_connector->panel.backlight.power = intel_edp_backlight_power;intel_panel_setup_backlight (connector, pipe);
drivers/gpu/drm/i915/intel_drv.h +0 -3
@@ -261,7 +261,6 @@ struct intel_encoder {struct intel_panel {struct drm_display_mode *fixed_mode;struct drm_display_mode *downclock_mode; -int fitting_mode;unsigned allowed_fitting_mode_mask;/* backlight */
@@ -957,9 +956,7 @@ 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.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 11/13 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 | 4 - drivers/gpu/drm/i915/intel_hdmi.c | 164 ++++++++------------------------------ 2 files changed, 34 insertions(+), 134 deletions(-)
drivers/gpu/drm/i915/intel_drv.h +0 -4
@@ -877,13 +877,9 @@ 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; -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 +34 -130
278 lines not on this page · raw message
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 12/13 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
@@ -1127,6 +1127,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;
@@ -1165,7 +1167,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 */
@@ -1290,7 +1297,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 ) {
@@ -1699,12 +1706,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; }
@@ -1983,23 +1984,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,
@@ -2018,22 +2002,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.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 13/13 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 | 538 ++++++++++++++++++----------------- 4 files changed, 281 insertions(+), 340 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
@@ -13075,43 +13075,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
@@ -1320,7 +1320,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);
@@ -1881,11 +1880,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 +281 -257
797 lines not on this page · raw message
Signature · 6 lines
2.7.4 _______________________________________________ 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. (rev2)
In reply to Maarten Lankhorst== Series Details ==
== Series Details ==
Series: drm/i915: Convert connector properties to atomic. (rev2)
URL : https://patchwork.freedesktop.org/series/22634/
State : success
== Summary ==
Series 22634v2 drm/i915: Convert connector properties to atomic.
https://patchwork.freedesktop.org/api/1.0/series/22634/revisions/2/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#100125fdo#100007 https://bugs.freedesktop.org/show_bug.cgi?id=100007
fdo#100125 https://bugs.freedesktop.org/show_bug.cgi?id=100125
fi-bdw-5557u total:278 pass:267 dwarn:0 dfail:0 fail:0 skip:11 time:430s fi-bdw-gvtdvm total:278 pass:256 dwarn:8 dfail:0 fail:0 skip:14 time:423s 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:510s fi-bxt-t5700 total:278 pass:258 dwarn:0 dfail:0 fail:0 skip:20 time:543s fi-byt-j1900 total:278 pass:254 dwarn:0 dfail:0 fail:0 skip:24 time:484s fi-byt-n2820 total:278 pass:250 dwarn:0 dfail:0 fail:0 skip:28 time:477s fi-hsw-4770 total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 time:411s 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:420s fi-ivb-3520m total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time:479s 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:465s fi-kbl-7560u total:278 pass:267 dwarn:1 dfail:0 fail:0 skip:10 time:568s fi-skl-6260u total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time:452s fi-skl-6700hq total:278 pass:261 dwarn:0 dfail:0 fail:0 skip:17 time:569s fi-skl-6700k total:278 pass:256 dwarn:4 dfail:0 fail:0 skip:18 time:463s fi-skl-6770hq total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time:488s 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
d86f5fa557fdf089bdb5b51f625a7f5967f11015 drm-tip: 2017y-04m-10d-06h-38m-49s UTC integration manifest 21ca0a9 drm/i915: Convert intel_sdvo connector properties to atomic.
d0e2017 drm/i915: Handle force_audio correctly in intel_sdvo
1075b60 drm/i915: Convert intel_hdmi connector properties to atomic
aef458e drm/i915: Convert intel_dp properties to atomic.
5f05523 drm/i915: Make intel_dp->has_audio reflect hw state only
6fd8b7a drm/i915: Convert LVDS connector properties to atomic.
bd25e9e drm/i915: Convert DSI connector properties to atomic.
6118531 drm/i915: Add plumbing for digital connector state.
ff6cdcf drm/i915: Convert intel DVO connector to atomic
339b1de drm/i915: Convert intel_crt connector properties to atomic.
16bc770 drm/i915: Convert intel_dp_mst connector properties to atomic.
da10d10 drm/i915: Convert intel_tv connector properties to atomic, v5.
d5fb4ab drm/i915: Remove unused members from intel_tv.c
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_4455/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx