drm/i915/edp: Allow alternate fixed mode for eDP if available.
Subsystems (2)
PATCH v6 1/1 drm/i915/edp: Allow alternate fixed mode for eDP if available.
Some fixed resolution panels actually support more than one mode, with the only thing different being the refresh rate. Having this alternate mode available to us is desirable, because it allows us to test PSR on panels whose setup time at the preferred mode is too long. With this patch we allow the use of the alternate mode if it's available and it was specifically requested.
v2 and v3: Rebase
v4: * Fix up some leaky mode stuff (Chris)
* Rebase
v5: * Fix a NULL pointer derefrence (David Weinehall)
v6: * Whitespace / spelling / checkpatch clean-up; no functional
change. (David)
* Rebase
--- drivers/gpu/drm/i915/intel_dp.c | 38 +++++++++++++++++++++++++++++++++----- drivers/gpu/drm/i915/intel_drv.h | 2 ++ drivers/gpu/drm/i915/intel_dsi.c | 2 +- drivers/gpu/drm/i915/intel_dvo.c | 2 +- drivers/gpu/drm/i915/intel_lvds.c | 3 ++- drivers/gpu/drm/i915/intel_panel.c | 6 ++++++ 6 files changed, 45 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/intel_dp.c +33 -5
@@ -1606,6 +1606,23 @@ static int intel_dp_compute_bpp(struct intel_dp *intel_dp,return bpp; } +static bool intel_edp_compare_alt_mode (struct drm_display_mode *m1, +struct drm_display_mode *m2) +{ +bool bres = false; + +if (m1 && m2) + bres = (m1->hdisplay == m2->hdisplay && + m1->hsync_start == m2->hsync_start && + m1->hsync_end == m2->hsync_end && + m1->htotal == m2->htotal && + m1->vdisplay == m2->vdisplay && + m1->vsync_start == m2->vsync_start && + m1->vsync_end == m2->vsync_end && + m1->vtotal == m2->vtotal); +return bres; +} + bool intel_dp_compute_config(struct intel_encoder *encoder, struct intel_crtc_state *pipe_config,
@@ -1652,8 +1669,16 @@ intel_dp_compute_config(struct intel_encoder *encoder, 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, - adjusted_mode); +struct drm_display_mode *panel_mode = + intel_connector->panel.alt_fixed_mode; +struct drm_display_mode *req_mode = &pipe_config->base.mode; + +if (!intel_edp_compare_alt_mode (req_mode, panel_mode)) + panel_mode = intel_connector->panel.fixed_mode; + +drm_mode_debug_printmodeline (panel_mode); + +intel_fixed_panel_mode (panel_mode, adjusted_mode);if (INTEL_GEN (dev_priv) >=9 ) {int ret;
@@ -5780,6 +5805,7 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp,struct drm_device *dev = intel_encoder->base.dev;struct drm_i915_private *dev_priv =to_i915 (dev);struct drm_display_mode *fixed_mode =NULL ; +struct drm_display_mode *alt_fixed_mode =NULL ;struct drm_display_mode *downclock_mode =NULL ;bool has_dpcd;struct drm_display_mode *scan;
@@ -5835,13 +5861,14 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp, } intel_connector->edid = edid; -/* prefer fixed mode from EDID if available */ +/* prefer fixed mode from EDID if available, save an alt mode also */ list_for_each_entry (scan, &connector->probed_modes, head) {if ((scan->type &DRM_MODE_TYPE_PREFERRED )) { fixed_mode =drm_mode_duplicate (dev, scan); downclock_mode =intel_dp_drrs_init ( intel_connector, fixed_mode); -break ; + }else if (!alt_fixed_mode) { + alt_fixed_mode =drm_mode_duplicate (dev, scan); } }
@@ -5878,7 +5905,8 @@ 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, alt_fixed_mode, + downclock_mode); intel_connector->panel.backlight.power = intel_edp_backlight_power;intel_panel_setup_backlight (connector, pipe);
drivers/gpu/drm/i915/intel_drv.h +2 -0
@@ -265,6 +265,7 @@ struct intel_encoder {struct intel_panel {struct drm_display_mode *fixed_mode; +struct drm_display_mode *alt_fixed_mode;struct drm_display_mode *downclock_mode;/* backlight */
@@ -1679,6 +1680,7 @@ 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 *alt_fixed_mode,struct drm_display_mode *downclock_mode);void intel_panel_fini (struct intel_panel *panel); void intel_fixed_panel_mode(const struct drm_display_mode *fixed_mode,
drivers/gpu/drm/i915/intel_dsi.c +1 -1
@@ -1849,7 +1849,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 ,NULL );intel_panel_setup_backlight (connector,INVALID_PIPE );intel_dsi_add_properties (intel_connector);
drivers/gpu/drm/i915/intel_dvo.c +1 -1
@@ -552,7 +552,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 ,NULL ); intel_dvo->panel_wants_dither = true; }
drivers/gpu/drm/i915/intel_lvds.c +2 -1
@@ -1138,7 +1138,8 @@ 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,NULL , + downclock_mode);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 +6 -0
@@ -1920,11 +1920,13 @@ 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 *alt_fixed_mode,struct drm_display_mode *downclock_mode) {intel_panel_init_backlight_funcs (panel); panel->fixed_mode = fixed_mode; + panel->alt_fixed_mode = alt_fixed_mode; panel->downclock_mode = downclock_mode;return 0 ;
@@ -1938,6 +1940,10 @@ void intel_panel_fini(struct intel_panel *panel)if (panel->fixed_mode)drm_mode_destroy (intel_connector->base.dev, panel->fixed_mode); +if (panel->alt_fixed_mode) +drm_mode_destroy (intel_connector->base.dev, + panel->alt_fixed_mode); +if (panel->downclock_mode)drm_mode_destroy (intel_connector->base.dev, panel->downclock_mode);
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/edp: Allow alternate fixed mode for eDP if available.
== Series Details ==
== Series Details ==
Series: drm/i915/edp: Allow alternate fixed mode for eDP if available.
URL : https://patchwork.freedesktop.org/series/28578/
State : success
== Summary ==
Series 28578v1 drm/i915/edp: Allow alternate fixed mode for eDP if available.
https://patchwork.freedesktop.org/api/1.0/series/28578/revisions/1/mbox/
Test gem_exec_flush:
Subgroup basic-batch-kernel-default-uc:
fail -> PASS (fi-snb-2600) fdo#100007fdo#100007 https://bugs.freedesktop.org/show_bug.cgi?id=100007
fi-bdw-5557u total:279 pass:268 dwarn:0 dfail:0 fail:0 skip:11 time:439s fi-bdw-gvtdvm total:279 pass:265 dwarn:0 dfail:0 fail:0 skip:14 time:424s fi-blb-e6850 total:279 pass:224 dwarn:1 dfail:0 fail:0 skip:54 time:356s fi-bsw-n3050 total:279 pass:243 dwarn:0 dfail:0 fail:0 skip:36 time:489s fi-bxt-j4205 total:279 pass:260 dwarn:0 dfail:0 fail:0 skip:19 time:491s fi-byt-j1900 total:279 pass:254 dwarn:1 dfail:0 fail:0 skip:24 time:522s fi-byt-n2820 total:279 pass:250 dwarn:1 dfail:0 fail:0 skip:28 time:509s fi-glk-2a total:279 pass:260 dwarn:0 dfail:0 fail:0 skip:19 time:588s fi-hsw-4770 total:279 pass:263 dwarn:0 dfail:0 fail:0 skip:16 time:426s fi-hsw-4770r total:279 pass:263 dwarn:0 dfail:0 fail:0 skip:16 time:408s fi-ilk-650 total:279 pass:229 dwarn:0 dfail:0 fail:0 skip:50 time:419s fi-ivb-3520m total:279 pass:261 dwarn:0 dfail:0 fail:0 skip:18 time:496s fi-ivb-3770 total:279 pass:261 dwarn:0 dfail:0 fail:0 skip:18 time:474s fi-kbl-7500u total:279 pass:261 dwarn:0 dfail:0 fail:0 skip:18 time:459s fi-kbl-7560u total:279 pass:269 dwarn:0 dfail:0 fail:0 skip:10 time:579s fi-kbl-r total:279 pass:261 dwarn:0 dfail:0 fail:0 skip:18 time:574s fi-pnv-d510 total:279 pass:223 dwarn:1 dfail:0 fail:0 skip:55 time:528s fi-skl-6260u total:279 pass:269 dwarn:0 dfail:0 fail:0 skip:10 time:449s fi-skl-6700k total:279 pass:261 dwarn:0 dfail:0 fail:0 skip:18 time:639s fi-skl-6770hq total:279 pass:269 dwarn:0 dfail:0 fail:0 skip:10 time:465s fi-skl-gvtdvm total:279 pass:266 dwarn:0 dfail:0 fail:0 skip:13 time:424s fi-skl-x1585l total:279 pass:269 dwarn:0 dfail:0 fail:0 skip:10 time:484s fi-snb-2520m total:279 pass:251 dwarn:0 dfail:0 fail:0 skip:28 time:547s fi-snb-2600 total:279 pass:250 dwarn:0 dfail:0 fail:0 skip:29 time:406s
2d0288b5b28c0d67460f0258a41bb4f78b812f29 drm-tip: 2017y-08m-09d-18h-09m-54s UTC integration manifest 13011d53221c drm/i915/edp: Allow alternate fixed mode for eDP if available.
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_5356/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 36 lines · Jim Bride
Some fixed resolution panels actually support more than one mode, with the only thing different being the refresh rate. Having this alternate mode available to us is desirable, because it allows us to test PSR on panels whose setup time at the preferred mode is too long. With this patch we allow the use of the alternate mode if it's available and it was specifically requested.
v2 and v3: Rebase
v4: * Fix up some leaky mode stuff (Chris)
* Rebase
v5: * Fix a NULL pointer derefrence (David Weinehall)
v6: * Whitespace / spelling / checkpatch clean-up; no functional
change. (David)
* RebaseCc David Weinehall <[email protected]>Cc Rodrigo Vivi <[email protected]>Cc Paulo Zanoni <[email protected]>Cc Jani Nikula <[email protected]>Cc Chris Wilson <[email protected]>Reviewed-by David Weinehall <[email protected]>Signed-off-by Jim Bride <[email protected]>--- drivers/gpu/drm/i915/intel_dp.c | 38 +++++++++++++++++++++++++++++++++----- drivers/gpu/drm/i915/intel_drv.h | 2 ++ drivers/gpu/drm/i915/intel_dsi.c | 2 +- drivers/gpu/drm/i915/intel_dvo.c | 2 +- drivers/gpu/drm/i915/intel_lvds.c | 3 ++- drivers/gpu/drm/i915/intel_panel.c | 6 ++++++ 6 files changed, 45 insertions(+), 8 deletions(-)drivers/gpu/drm/i915/intel_dp.c +0
-0
drivers/gpu/drm/i915/intel_dp.c static int intel_dp_compute_bpp(struct intel_dp *intel_dp, · line 1612
Quoted 7 lines
drivers/gpu/drm/i915/intel_dp.c +4
-0@@ -1606,6 +1606,23 @@ static int intel_dp_compute_bpp(struct intel_dp *intel_dp,return bpp; } +static bool intel_edp_compare_alt_mode (struct drm_display_mode *m1, +struct drm_display_mode *m2) +{ +bool bres = false;
What is bres?
drivers/gpu/drm/i915/intel_dp.c static int intel_dp_compute_bpp(struct intel_dp *intel_dp, · line 1623
Quoted 11 lines
drivers/gpu/drm/i915/intel_dp.c +11
-0+ +if (m1 && m2) + bres = (m1->hdisplay == m2->hdisplay && + m1->hsync_start == m2->hsync_start && + m1->hsync_end == m2->hsync_end && + m1->htotal == m2->htotal && + m1->vdisplay == m2->vdisplay && + m1->vsync_start == m2->vsync_start && + m1->vsync_end == m2->vsync_end && + m1->vtotal == m2->vtotal); +return bres;
You know you could just do
return m1 && m2 && m1->hdisplay == m2->hdisplay && ...
But I'm nitpicking.
BR,
Jani.
Quoted 148 lines
drivers/gpu/drm/i915/intel_dp.c +18
-5+} + bool intel_dp_compute_config(struct intel_encoder *encoder, struct intel_crtc_state *pipe_config,@@ -1652,8 +1669,16 @@ intel_dp_compute_config(struct intel_encoder *encoder, 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, - adjusted_mode); +struct drm_display_mode *panel_mode = + intel_connector->panel.alt_fixed_mode; +struct drm_display_mode *req_mode = &pipe_config->base.mode; + +if (!intel_edp_compare_alt_mode (req_mode, panel_mode)) + panel_mode = intel_connector->panel.fixed_mode; + +drm_mode_debug_printmodeline (panel_mode); + +intel_fixed_panel_mode (panel_mode, adjusted_mode);if (INTEL_GEN (dev_priv) >=9 ) {int ret;@@ -5780,6 +5805,7 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp,struct drm_device *dev = intel_encoder->base.dev;struct drm_i915_private *dev_priv =to_i915 (dev);struct drm_display_mode *fixed_mode =NULL ; +struct drm_display_mode *alt_fixed_mode =NULL ;struct drm_display_mode *downclock_mode =NULL ;bool has_dpcd;struct drm_display_mode *scan;@@ -5835,13 +5861,14 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp, } intel_connector->edid = edid; -/* prefer fixed mode from EDID if available */ +/* prefer fixed mode from EDID if available, save an alt mode also */ list_for_each_entry (scan, &connector->probed_modes, head) {if ((scan->type &DRM_MODE_TYPE_PREFERRED )) { fixed_mode =drm_mode_duplicate (dev, scan); downclock_mode =intel_dp_drrs_init ( intel_connector, fixed_mode); -break ; + }else if (!alt_fixed_mode) { + alt_fixed_mode =drm_mode_duplicate (dev, scan); } }@@ -5878,7 +5905,8 @@ 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, alt_fixed_mode, + downclock_mode); intel_connector->panel.backlight.power = intel_edp_backlight_power;intel_panel_setup_backlight (connector, pipe);drivers/gpu/drm/i915/intel_drv.h +2
-0@@ -265,6 +265,7 @@ struct intel_encoder {struct intel_panel {struct drm_display_mode *fixed_mode; +struct drm_display_mode *alt_fixed_mode;struct drm_display_mode *downclock_mode;/* backlight */ @@ -1679,6 +1680,7 @@ 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 *alt_fixed_mode,struct drm_display_mode *downclock_mode);void intel_panel_fini (struct intel_panel *panel); void intel_fixed_panel_mode(const struct drm_display_mode *fixed_mode,drivers/gpu/drm/i915/intel_dsi.c +1
-1@@ -1849,7 +1849,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 ,NULL );intel_panel_setup_backlight (connector,INVALID_PIPE );intel_dsi_add_properties (intel_connector);drivers/gpu/drm/i915/intel_dvo.c +1
-1@@ -552,7 +552,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 ,NULL ); intel_dvo->panel_wants_dither = true; }drivers/gpu/drm/i915/intel_lvds.c +2
-1@@ -1138,7 +1138,8 @@ 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,NULL , + downclock_mode);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 +6
-0@@ -1920,11 +1920,13 @@ 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 *alt_fixed_mode,struct drm_display_mode *downclock_mode) {intel_panel_init_backlight_funcs (panel); panel->fixed_mode = fixed_mode; + panel->alt_fixed_mode = alt_fixed_mode; panel->downclock_mode = downclock_mode;return 0 ;@@ -1938,6 +1940,10 @@ void intel_panel_fini(struct intel_panel *panel)if (panel->fixed_mode)drm_mode_destroy (intel_connector->base.dev, panel->fixed_mode); +if (panel->alt_fixed_mode) +drm_mode_destroy (intel_connector->base.dev, + panel->alt_fixed_mode); +if (panel->downclock_mode)drm_mode_destroy (intel_connector->base.dev, panel->downclock_mode);
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 40 lines · Jani Nikula
Quoted 39 lines · Jim Bride
Some fixed resolution panels actually support more than one mode, with the only thing different being the refresh rate. Having this alternate mode available to us is desirable, because it allows us to test PSR on panels whose setup time at the preferred mode is too long. With this patch we allow the use of the alternate mode if it's available and it was specifically requested.
v2 and v3: Rebase
v4: * Fix up some leaky mode stuff (Chris)
* Rebase
v5: * Fix a NULL pointer derefrence (David Weinehall)
v6: * Whitespace / spelling / checkpatch clean-up; no functional
change. (David)
* RebaseCc David Weinehall <[email protected]>Cc Rodrigo Vivi <[email protected]>Cc Paulo Zanoni <[email protected]>Cc Jani Nikula <[email protected]>Cc Chris Wilson <[email protected]>Reviewed-by David Weinehall <[email protected]>Signed-off-by Jim Bride <[email protected]>--- drivers/gpu/drm/i915/intel_dp.c | 38 +++++++++++++++++++++++++++++++++----- drivers/gpu/drm/i915/intel_drv.h | 2 ++ drivers/gpu/drm/i915/intel_dsi.c | 2 +- drivers/gpu/drm/i915/intel_dvo.c | 2 +- drivers/gpu/drm/i915/intel_lvds.c | 3 ++- drivers/gpu/drm/i915/intel_panel.c | 6 ++++++ 6 files changed, 45 insertions(+), 8 deletions(-)drivers/gpu/drm/i915/intel_dp.c +0
-0@@ -1606,6 +1606,23 @@ static int intel_dp_compute_bpp(struct intel_dp *intel_dp,return bpp; }
Quoted 6 lines
drivers/gpu/drm/i915/intel_dp.c static int intel_dp_compute_bpp(struct intel_dp *intel_dp, · line 1612
Quoted 4 lines
drivers/gpu/drm/i915/intel_dp.c +4
-0+static bool intel_edp_compare_alt_mode (struct drm_display_mode *m1, +struct drm_display_mode *m2) +{ +bool bres = false;What is bres?
boolean result :)
Quoted 14 lines
drivers/gpu/drm/i915/intel_dp.c static int intel_dp_compute_bpp(struct intel_dp *intel_dp, · line 1623
Quoted 11 lines
drivers/gpu/drm/i915/intel_dp.c +11
-0+ +if (m1 && m2) + bres = (m1->hdisplay == m2->hdisplay && + m1->hsync_start == m2->hsync_start && + m1->hsync_end == m2->hsync_end && + m1->htotal == m2->htotal && + m1->vdisplay == m2->vdisplay && + m1->vsync_start == m2->vsync_start && + m1->vsync_end == m2->vsync_end && + m1->vtotal == m2->vtotal); +return bres;You know you could just do
Quoted 1 line
return m1 && m2 && m1->hdisplay == m2->hdisplay && ...
Yeah, but I think the above is a bit more readable, and also makes it easier to add debug instrumentation at some point if needed.
Jim
Quoted 147 lines
But I'm nitpicking.
BR,
Jani.Quoted 141 lines
drivers/gpu/drm/i915/intel_dp.c +18
-5+} + bool intel_dp_compute_config(struct intel_encoder *encoder, struct intel_crtc_state *pipe_config,@@ -1652,8 +1669,16 @@ intel_dp_compute_config(struct intel_encoder *encoder, 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, - adjusted_mode); +struct drm_display_mode *panel_mode = + intel_connector->panel.alt_fixed_mode; +struct drm_display_mode *req_mode = &pipe_config->base.mode; + +if (!intel_edp_compare_alt_mode (req_mode, panel_mode)) + panel_mode = intel_connector->panel.fixed_mode; + +drm_mode_debug_printmodeline (panel_mode); + +intel_fixed_panel_mode (panel_mode, adjusted_mode);if (INTEL_GEN (dev_priv) >=9 ) {int ret;@@ -5780,6 +5805,7 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp,struct drm_device *dev = intel_encoder->base.dev;struct drm_i915_private *dev_priv =to_i915 (dev);struct drm_display_mode *fixed_mode =NULL ; +struct drm_display_mode *alt_fixed_mode =NULL ;struct drm_display_mode *downclock_mode =NULL ;bool has_dpcd;struct drm_display_mode *scan;@@ -5835,13 +5861,14 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp, } intel_connector->edid = edid; -/* prefer fixed mode from EDID if available */ +/* prefer fixed mode from EDID if available, save an alt mode also */ list_for_each_entry (scan, &connector->probed_modes, head) {if ((scan->type &DRM_MODE_TYPE_PREFERRED )) { fixed_mode =drm_mode_duplicate (dev, scan); downclock_mode =intel_dp_drrs_init ( intel_connector, fixed_mode); -break ; + }else if (!alt_fixed_mode) { + alt_fixed_mode =drm_mode_duplicate (dev, scan); } }@@ -5878,7 +5905,8 @@ 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, alt_fixed_mode, + downclock_mode); intel_connector->panel.backlight.power = intel_edp_backlight_power;intel_panel_setup_backlight (connector, pipe);drivers/gpu/drm/i915/intel_drv.h +2
-0@@ -265,6 +265,7 @@ struct intel_encoder {struct intel_panel {struct drm_display_mode *fixed_mode; +struct drm_display_mode *alt_fixed_mode;struct drm_display_mode *downclock_mode;/* backlight */ @@ -1679,6 +1680,7 @@ 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 *alt_fixed_mode,struct drm_display_mode *downclock_mode);void intel_panel_fini (struct intel_panel *panel); void intel_fixed_panel_mode(const struct drm_display_mode *fixed_mode,drivers/gpu/drm/i915/intel_dsi.c +1
-1@@ -1849,7 +1849,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 ,NULL );intel_panel_setup_backlight (connector,INVALID_PIPE );intel_dsi_add_properties (intel_connector);drivers/gpu/drm/i915/intel_dvo.c +1
-1@@ -552,7 +552,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 ,NULL ); intel_dvo->panel_wants_dither = true; }drivers/gpu/drm/i915/intel_lvds.c +2
-1@@ -1138,7 +1138,8 @@ 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,NULL , + downclock_mode);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 +2
-0@@ -1920,11 +1920,13 @@ 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 *alt_fixed_mode,struct drm_display_mode *downclock_mode) {intel_panel_init_backlight_funcs (panel); panel->fixed_mode = fixed_mode; + panel->alt_fixed_mode = alt_fixed_mode; panel->downclock_mode = downclock_mode;return 0 ;@@ -1938,6 +1940,10 @@ void intel_panel_fini(struct intel_panel *panel)if (panel->fixed_mode)drm_mode_destroy (intel_connector->base.dev, panel->fixed_mode);
Quoted 10 lines
Quoted 7 lines
drivers/gpu/drm/i915/intel_panel.c +4
-0+if (panel->alt_fixed_mode) +drm_mode_destroy (intel_connector->base.dev, + panel->alt_fixed_mode); +if (panel->downclock_mode)drm_mode_destroy (intel_connector->base.dev, panel->downclock_mode);Signature · 1 line
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Vivi, Rodrigo
maintainerQuoted 41 lines · Jim Bride
Quoted 40 lines · Jani Nikula
Quoted 39 lines · Jim Bride
Some fixed resolution panels actually support more than one mode, with the only thing different being the refresh rate. Having this alternate mode available to us is desirable, because it allows us to test PSR on panels whose setup time at the preferred mode is too long. With this patch we allow the use of the alternate mode if it's available and it was specifically requested.
v2 and v3: Rebase
v4: * Fix up some leaky mode stuff (Chris)
* Rebase
v5: * Fix a NULL pointer derefrence (David Weinehall)
v6: * Whitespace / spelling / checkpatch clean-up; no functional
change. (David)
* RebaseCc David Weinehall <[email protected]>Cc Rodrigo Vivi <[email protected]>Cc Paulo Zanoni <[email protected]>Cc Jani Nikula <[email protected]>Cc Chris Wilson <[email protected]>Reviewed-by David Weinehall <[email protected]>Signed-off-by Jim Bride <[email protected]>--- drivers/gpu/drm/i915/intel_dp.c | 38 +++++++++++++++++++++++++++++++++----- drivers/gpu/drm/i915/intel_drv.h | 2 ++ drivers/gpu/drm/i915/intel_dsi.c | 2 +- drivers/gpu/drm/i915/intel_dvo.c | 2 +- drivers/gpu/drm/i915/intel_lvds.c | 3 ++- drivers/gpu/drm/i915/intel_panel.c | 6 ++++++ 6 files changed, 45 insertions(+), 8 deletions(-)drivers/gpu/drm/i915/intel_dp.c +0
-0@@ -1606,6 +1606,23 @@ static int intel_dp_compute_bpp(struct intel_dp *intel_dp,return bpp; }
Quoted 8 lines
Quoted 6 lines
drivers/gpu/drm/i915/intel_dp.c static int intel_dp_compute_bpp(struct intel_dp *intel_dp, · line 1612
Quoted 4 lines
drivers/gpu/drm/i915/intel_dp.c +4
-0+static bool intel_edp_compare_alt_mode (struct drm_display_mode *m1, +struct drm_display_mode *m2) +{ +bool bres = false;What is bres?
boolean result :)
maybe something less mysterious and more meaningful would be better like bool mode_match;
Quoted 15 lines
Quoted 15 lines
drivers/gpu/drm/i915/intel_dp.c static int intel_dp_compute_bpp(struct intel_dp *intel_dp, · line 1623
Quoted 12 lines
drivers/gpu/drm/i915/intel_dp.c +11
-0+ +if (m1 && m2) + bres = (m1->hdisplay == m2->hdisplay && + m1->hsync_start == m2->hsync_start && + m1->hsync_end == m2->hsync_end && + m1->htotal == m2->htotal && + m1->vdisplay == m2->vdisplay && + m1->vsync_start == m2->vsync_start && + m1->vsync_end == m2->vsync_end && + m1->vtotal == m2->vtotal); +return bres;You know you could just do
Quoted 4 lines
Quoted 1 line
return m1 && m2 && m1->hdisplay == m2->hdisplay && ...Yeah, but I think the above is a bit more readable, and also makes it easier to add debug instrumentation at some point if needed.
... anyways I believe the direct return is easier to read than "bres" and also if some debug instrumentation is needed later it can be modified later.
Quoted 4 lines
Jim
Quoted 1 line
But I'm nitpicking.
me too...
so if this is the final version and nobody complains deeply and it is already reviewed I intend to merge soon... please advise otherwise...
Quoted 146 lines
Quoted 146 lines
BR,
Jani.Quoted 141 lines
drivers/gpu/drm/i915/intel_dp.c +18
-5+} + bool intel_dp_compute_config(struct intel_encoder *encoder, struct intel_crtc_state *pipe_config,@@ -1652,8 +1669,16 @@ intel_dp_compute_config(struct intel_encoder *encoder, 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, - adjusted_mode); +struct drm_display_mode *panel_mode = + intel_connector->panel.alt_fixed_mode; +struct drm_display_mode *req_mode = &pipe_config->base.mode; + +if (!intel_edp_compare_alt_mode (req_mode, panel_mode)) + panel_mode = intel_connector->panel.fixed_mode; + +drm_mode_debug_printmodeline (panel_mode); + +intel_fixed_panel_mode (panel_mode, adjusted_mode);if (INTEL_GEN (dev_priv) >=9 ) {int ret;@@ -5780,6 +5805,7 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp,struct drm_device *dev = intel_encoder->base.dev;struct drm_i915_private *dev_priv =to_i915 (dev);struct drm_display_mode *fixed_mode =NULL ; +struct drm_display_mode *alt_fixed_mode =NULL ;struct drm_display_mode *downclock_mode =NULL ;bool has_dpcd;struct drm_display_mode *scan;@@ -5835,13 +5861,14 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp, } intel_connector->edid = edid; -/* prefer fixed mode from EDID if available */ +/* prefer fixed mode from EDID if available, save an alt mode also */ list_for_each_entry (scan, &connector->probed_modes, head) {if ((scan->type &DRM_MODE_TYPE_PREFERRED )) { fixed_mode =drm_mode_duplicate (dev, scan); downclock_mode =intel_dp_drrs_init ( intel_connector, fixed_mode); -break ; + }else if (!alt_fixed_mode) { + alt_fixed_mode =drm_mode_duplicate (dev, scan); } }@@ -5878,7 +5905,8 @@ 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, alt_fixed_mode, + downclock_mode); intel_connector->panel.backlight.power = intel_edp_backlight_power;intel_panel_setup_backlight (connector, pipe);drivers/gpu/drm/i915/intel_drv.h +2
-0@@ -265,6 +265,7 @@ struct intel_encoder {struct intel_panel {struct drm_display_mode *fixed_mode; +struct drm_display_mode *alt_fixed_mode;struct drm_display_mode *downclock_mode;/* backlight */ @@ -1679,6 +1680,7 @@ 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 *alt_fixed_mode,struct drm_display_mode *downclock_mode);void intel_panel_fini (struct intel_panel *panel); void intel_fixed_panel_mode(const struct drm_display_mode *fixed_mode,drivers/gpu/drm/i915/intel_dsi.c +1
-1@@ -1849,7 +1849,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 ,NULL );intel_panel_setup_backlight (connector,INVALID_PIPE );intel_dsi_add_properties (intel_connector);drivers/gpu/drm/i915/intel_dvo.c +1
-1@@ -552,7 +552,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 ,NULL ); intel_dvo->panel_wants_dither = true; }drivers/gpu/drm/i915/intel_lvds.c +2
-1@@ -1138,7 +1138,8 @@ 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,NULL , + downclock_mode);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 +2
-0@@ -1920,11 +1920,13 @@ 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 *alt_fixed_mode,struct drm_display_mode *downclock_mode) {intel_panel_init_backlight_funcs (panel); panel->fixed_mode = fixed_mode; + panel->alt_fixed_mode = alt_fixed_mode; panel->downclock_mode = downclock_mode;return 0 ;@@ -1938,6 +1940,10 @@ void intel_panel_fini(struct intel_panel *panel)if (panel->fixed_mode)drm_mode_destroy (intel_connector->base.dev, panel->fixed_mode);
Quoted 10 lines
Quoted 10 lines
Quoted 7 lines
drivers/gpu/drm/i915/intel_panel.c +4
-0+if (panel->alt_fixed_mode) +drm_mode_destroy (intel_connector->base.dev, + panel->alt_fixed_mode); +if (panel->downclock_mode)drm_mode_destroy (intel_connector->base.dev, panel->downclock_mode);Signature · 1 line
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 79 lines · Rodrigo
Quoted 41 lines · Jim Bride
Quoted 40 lines · Jani Nikula
Quoted 39 lines · Jim Bride
Some fixed resolution panels actually support more than one mode, with the only thing different being the refresh rate. Having this alternate mode available to us is desirable, because it allows us to test PSR on panels whose setup time at the preferred mode is too long. With this patch we allow the use of the alternate mode if it's available and it was specifically requested.
v2 and v3: Rebase
v4: * Fix up some leaky mode stuff (Chris)
* Rebase
v5: * Fix a NULL pointer derefrence (David Weinehall)
v6: * Whitespace / spelling / checkpatch clean-up; no functional
change. (David)
* RebaseCc David Weinehall <[email protected]>Cc Rodrigo Vivi <[email protected]>Cc Paulo Zanoni <[email protected]>Cc Jani Nikula <[email protected]>Cc Chris Wilson <[email protected]>Reviewed-by David Weinehall <[email protected]>Signed-off-by Jim Bride <[email protected]>--- drivers/gpu/drm/i915/intel_dp.c | 38 +++++++++++++++++++++++++++++++++----- drivers/gpu/drm/i915/intel_drv.h | 2 ++ drivers/gpu/drm/i915/intel_dsi.c | 2 +- drivers/gpu/drm/i915/intel_dvo.c | 2 +- drivers/gpu/drm/i915/intel_lvds.c | 3 ++- drivers/gpu/drm/i915/intel_panel.c | 6 ++++++ 6 files changed, 45 insertions(+), 8 deletions(-)drivers/gpu/drm/i915/intel_dp.c +0
-0@@ -1606,6 +1606,23 @@ static int intel_dp_compute_bpp(struct intel_dp *intel_dp,return bpp; }Quoted 8 lines
Quoted 6 lines
drivers/gpu/drm/i915/intel_dp.c static int intel_dp_compute_bpp(struct intel_dp *intel_dp, · line 1612
Quoted 4 lines
drivers/gpu/drm/i915/intel_dp.c +4
-0+static bool intel_edp_compare_alt_mode (struct drm_display_mode *m1, +struct drm_display_mode *m2) +{ +bool bres = false;What is bres?
boolean result :)
maybe something less mysterious and more meaningful would be better like bool
mode_match;Quoted 13 lines
Quoted 13 lines
Quoted 12 lines
drivers/gpu/drm/i915/intel_dp.c +11
-0+ +if (m1 && m2) + bres = (m1->hdisplay == m2->hdisplay && + m1->hsync_start == m2->hsync_start && + m1->hsync_end == m2->hsync_end && + m1->htotal == m2->htotal && + m1->vdisplay == m2->vdisplay && + m1->vsync_start == m2->vsync_start && + m1->vsync_end == m2->vsync_end && + m1->vtotal == m2->vtotal); +return bres;Quoted 6 lines
Quoted 3 lines
You know you could just do
return m1 && m2 && m1->hdisplay == m2->hdisplay && ...Yeah, but I think the above is a bit more readable, and also makes it easier to add debug instrumentation at some point if needed.
... anyways I believe the direct return is easier to read than "bres" and also if some debug instrumentation is needed later it can be modified later.
Quoted 1 line
Quoted 8 lines
Quoted 3 lines
Jim
Quoted 1 line
But I'm nitpicking.
me too...
so if this is the final version and nobody complains deeply and it is already reviewed I intend to merge soon... please advise otherwise...
patch merged to dinq. thanks for patches, reviews and tests.
Quoted 162 lines
Quoted 147 lines
Quoted 147 lines
BR,
Jani.Quoted 141 lines
drivers/gpu/drm/i915/intel_dp.c +18
-5+} + bool intel_dp_compute_config(struct intel_encoder *encoder, struct intel_crtc_state *pipe_config,@@ -1652,8 +1669,16 @@ intel_dp_compute_config(struct intel_encoder *encoder, 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, - adjusted_mode); +struct drm_display_mode *panel_mode = + intel_connector->panel.alt_fixed_mode; +struct drm_display_mode *req_mode = &pipe_config->base.mode; + +if (!intel_edp_compare_alt_mode (req_mode, panel_mode)) + panel_mode = intel_connector->panel.fixed_mode; + +drm_mode_debug_printmodeline (panel_mode); + +intel_fixed_panel_mode (panel_mode, adjusted_mode);if (INTEL_GEN (dev_priv) >=9 ) {int ret;@@ -5780,6 +5805,7 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp,struct drm_device *dev = intel_encoder->base.dev;struct drm_i915_private *dev_priv =to_i915 (dev);struct drm_display_mode *fixed_mode =NULL ; +struct drm_display_mode *alt_fixed_mode =NULL ;struct drm_display_mode *downclock_mode =NULL ;bool has_dpcd;struct drm_display_mode *scan;@@ -5835,13 +5861,14 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp, } intel_connector->edid = edid; -/* prefer fixed mode from EDID if available */ +/* prefer fixed mode from EDID if available, save an alt mode also */ list_for_each_entry (scan, &connector->probed_modes, head) {if ((scan->type &DRM_MODE_TYPE_PREFERRED )) { fixed_mode =drm_mode_duplicate (dev, scan); downclock_mode =intel_dp_drrs_init ( intel_connector, fixed_mode); -break ; + }else if (!alt_fixed_mode) { + alt_fixed_mode =drm_mode_duplicate (dev, scan); } }@@ -5878,7 +5905,8 @@ 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, alt_fixed_mode, + downclock_mode); intel_connector->panel.backlight.power = intel_edp_backlight_power;intel_panel_setup_backlight (connector, pipe);drivers/gpu/drm/i915/intel_drv.h +2
-0@@ -265,6 +265,7 @@ struct intel_encoder {struct intel_panel {struct drm_display_mode *fixed_mode; +struct drm_display_mode *alt_fixed_mode;struct drm_display_mode *downclock_mode;/* backlight */ @@ -1679,6 +1680,7 @@ 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 *alt_fixed_mode,struct drm_display_mode *downclock_mode);void intel_panel_fini (struct intel_panel *panel); void intel_fixed_panel_mode(const struct drm_display_mode *fixed_mode,drivers/gpu/drm/i915/intel_dsi.c +1
-1@@ -1849,7 +1849,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 ,NULL );intel_panel_setup_backlight (connector,INVALID_PIPE );intel_dsi_add_properties (intel_connector);drivers/gpu/drm/i915/intel_dvo.c +1
-1@@ -552,7 +552,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 ,NULL ); intel_dvo->panel_wants_dither = true; }drivers/gpu/drm/i915/intel_lvds.c +2
-1@@ -1138,7 +1138,8 @@ 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,NULL , + downclock_mode);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 +2
-0@@ -1920,11 +1920,13 @@ 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 *alt_fixed_mode,struct drm_display_mode *downclock_mode) {intel_panel_init_backlight_funcs (panel); panel->fixed_mode = fixed_mode; + panel->alt_fixed_mode = alt_fixed_mode; panel->downclock_mode = downclock_mode;return 0 ;@@ -1938,6 +1940,10 @@ void intel_panel_fini(struct intel_panel *panel)if (panel->fixed_mode)drm_mode_destroy (intel_connector->base.dev, panel->fixed_mode);Quoted 10 lines
Quoted 10 lines
drivers/gpu/drm/i915/intel_panel.c void intel_panel_fini(struct intel_panel *panel) · line 1949
Quoted 7 lines
drivers/gpu/drm/i915/intel_panel.c +4
-0+if (panel->alt_fixed_mode) +drm_mode_destroy (intel_connector->base.dev, + panel->alt_fixed_mode); +if (panel->downclock_mode)drm_mode_destroy (intel_connector->base.dev, panel->downclock_mode);--
Jani Nikula, Intel Open Source Technology Center_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Rodrigo Vivi Blog: http://blog.vivi.eng.br _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx