drm/i915: Fix some minor issues with atomic cdclk.
Subsystems (2)
PATCH 1/1 drm/i915: Fix some minor issues with atomic cdclk.
The check for active_crtcs == 0 was performed by the callers, when changing the patches I forgot to remove those hunks.
This resulted in skylake scalers still not having the correct cdclk to calculate scaling when all crtc's were dpms off.
--- drivers/gpu/drm/i915/intel_display.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/intel_display.c +4 -8
@@ -6039,8 +6039,7 @@ static int broxton_calc_cdclk(struct drm_i915_private *dev_priv,return 144000 ; } -/* Compute the max pixel clock for new configuration. Uses atomic state if -* that's non-NULL, look at current state otherwise. */ +/* Compute the max pixel clock for new configuration. */ static int intel_mode_max_pixclk (struct drm_device *dev,struct drm_atomic_state *state) {
@@ -6063,9 +6062,6 @@ static int intel_mode_max_pixclk(struct drm_device *dev, intel_state->min_pixclk[i] = pixclk; } -if (!intel_state->active_crtcs) -return 0 ; -for_each_pipe (dev_priv, pipe) max_pixclk =max (intel_state->min_pixclk[pipe], max_pixclk);
@@ -9677,9 +9673,6 @@ static int ilk_max_pixel_rate(struct drm_atomic_state *state) intel_state->min_pixclk[i] = pixel_rate; } -if (!intel_state->active_crtcs) -return 0 ; -for_each_pipe (dev_priv, pipe) max_pixel_rate =max (intel_state->min_pixclk[pipe], max_pixel_rate);
@@ -13191,6 +13184,9 @@ static int intel_modeset_checks(struct drm_atomic_state *state)if (ret <0 )return ret; + +DRM_DEBUG_KMS ("New cdclk calculated to be atomic %u, actual %u\n" , + intel_state->cdclk, intel_state->dev_cdclk); }else to_intel_atomic_state (state)->cdclk = dev_priv->atomic_cdclk_freq;
Signature · 6 lines
2.1.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 8 lines · Maarten Lankhorst
The check for
active_crtcs== 0 was performed by the callers, when changing the patches I forgot to remove those hunks.This resulted in skylake scalers still not having the correct cdclk to calculate scaling when all crtc's were dpms off.
Fixes 1a617b77658e ("drm/i915: Keep track of the cdclk as if all crtc's were active.")Signed-off-by Maarten Lankhorst <[email protected]>
Quoted 54 lines
--- drivers/gpu/drm/i915/intel_display.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)drivers/gpu/drm/i915/intel_display.c +4
-8@@ -6039,8 +6039,7 @@ static int broxton_calc_cdclk(struct drm_i915_private *dev_priv,return 144000 ; } -/* Compute the max pixel clock for new configuration. Uses atomic state if -* that's non-NULL, look at current state otherwise. */ +/* Compute the max pixel clock for new configuration. */ static int intel_mode_max_pixclk (struct drm_device *dev,struct drm_atomic_state *state) {@@ -6063,9 +6062,6 @@ static int intel_mode_max_pixclk(struct drm_device *dev, intel_state->min_pixclk[i] = pixclk; } -if (!intel_state->active_crtcs) -return 0 ; -for_each_pipe (dev_priv, pipe) max_pixclk =max (intel_state->min_pixclk[pipe], max_pixclk);@@ -9677,9 +9673,6 @@ static int ilk_max_pixel_rate(struct drm_atomic_state *state) intel_state->min_pixclk[i] = pixel_rate; } -if (!intel_state->active_crtcs) -return 0 ; -for_each_pipe (dev_priv, pipe) max_pixel_rate =max (intel_state->min_pixclk[pipe], max_pixel_rate);@@ -13191,6 +13184,9 @@ static int intel_modeset_checks(struct drm_atomic_state *state)if (ret <0 )return ret; + +DRM_DEBUG_KMS ("New cdclk calculated to be atomic %u, actual %u\n" , + intel_state->cdclk, intel_state->dev_cdclk); }else to_intel_atomic_state (state)->cdclk = dev_priv->atomic_cdclk_freq;Signature · 6 lines
2.1.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for drm/i915: Fix some minor issues with atomic cdclk.
In reply to Maarten Lankhorst== Summary ==
== Summary ==
Series 3473v1 drm/i915: Fix some minor issues with atomic cdclk.
http://patchwork.freedesktop.org/api/1.0/series/3473/revisions/1/mbox/
Test gem_ringfill:
Subgroup basic-default-hang:
incomplete -> PASS (snb-dellxps)
Test pm_rpm:
Subgroup basic-pci-d3-state:
pass -> DMESG-WARN (bsw-nuc-2)
pass -> FAIL (hsw-gt2)
Subgroup basic-rte:
dmesg-warn -> PASS (bsw-nuc-2)bdw-nuci7 total:162 pass:152 dwarn:0 dfail:0 fail:0 skip:10 bdw-ultra total:165 pass:152 dwarn:0 dfail:0 fail:0 skip:13 bsw-nuc-2 total:165 pass:135 dwarn:1 dfail:0 fail:0 skip:29 byt-nuc total:165 pass:140 dwarn:1 dfail:0 fail:0 skip:24 hsw-brixbox total:165 pass:151 dwarn:0 dfail:0 fail:0 skip:14 hsw-gt2 total:165 pass:153 dwarn:0 dfail:0 fail:2 skip:10 ivb-t430s total:165 pass:150 dwarn:0 dfail:0 fail:1 skip:14 skl-i5k-2 total:165 pass:150 dwarn:0 dfail:0 fail:0 skip:15 snb-dellxps total:165 pass:142 dwarn:0 dfail:0 fail:1 skip:22 snb-x220t total:165 pass:142 dwarn:0 dfail:0 fail:2 skip:21
Results at /archive/results/CI_IGT_test/Patchwork_1411/
63cbdd1816fd78d404ed004b0f931c497625e0df drm-intel-nightly: 2016y-02m-16d-09h-41m-02s UTC integration manifest fc4b333f718316d8983fa3d01a89b8466a25a7ab drm/i915: Fix some minor issues with atomic cdclk.
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx