Re: [Intel-gfx] [PATCH v2 7/7] drm/i915: Fix broken num_entries in skl_ddb_allocation_overlaps

[Ville Syrjälä]

On Tue, Feb 11, 2020 at 10:55:32PM +0530, Anshuman Gupta wrote:
> skl_ddb_allocation_overlaps() num_entries hass been passed as
> INTEL_NUM_PIPES, it should be I915_MAX_PIPES.
> 
> Cc: Ville Syrjälä 
> Signed-off-by: Anshuman Gupta 

Reviewed-by: Ville Syrjälä 

> ---
>  drivers/gpu/drm/i915/display/intel_display.c | 7 +++
>  1 file changed, 3 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c 
> b/drivers/gpu/drm/i915/display/intel_display.c
> index 6fdaeb019fef..dd77324206bc 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -15475,7 +15475,6 @@ static void skl_commit_modeset_enables(struct 
> intel_atomic_state *state)
>   struct intel_crtc *crtc;
>   struct intel_crtc_state *old_crtc_state, *new_crtc_state;
>   struct skl_ddb_entry entries[I915_MAX_PIPES] = {};
> - const u8 num_pipes = INTEL_NUM_PIPES(dev_priv);
>   u8 update_pipes = 0, modeset_pipes = 0;
>   int i;
>  
> @@ -15512,7 +15511,7 @@ static void skl_commit_modeset_enables(struct 
> intel_atomic_state *state)
>   continue;
>  
>   if 
> (skl_ddb_allocation_overlaps(_crtc_state->wm.skl.ddb,
> - entries, num_pipes, 
> pipe))
> + entries, 
> I915_MAX_PIPES, pipe))
>   continue;
>  
>   entries[pipe] = new_crtc_state->wm.skl.ddb;
> @@ -15550,7 +15549,7 @@ static void skl_commit_modeset_enables(struct 
> intel_atomic_state *state)
>   continue;
>  
>   WARN_ON(skl_ddb_allocation_overlaps(_crtc_state->wm.skl.ddb,
> - entries, num_pipes, pipe));
> + entries, I915_MAX_PIPES, 
> pipe));
>  
>   entries[pipe] = new_crtc_state->wm.skl.ddb;
>   modeset_pipes &= ~BIT(pipe);
> @@ -15585,7 +15584,7 @@ static void skl_commit_modeset_enables(struct 
> intel_atomic_state *state)
>   continue;
>  
>   WARN_ON(skl_ddb_allocation_overlaps(_crtc_state->wm.skl.ddb,
> - entries, num_pipes, pipe));
> + entries, I915_MAX_PIPES, 
> pipe));
>  
>   entries[pipe] = new_crtc_state->wm.skl.ddb;
>   modeset_pipes &= ~BIT(pipe);
> -- 
> 2.24.0

-- 
Ville Syrjälä
Intel
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] [PATCH v2 7/7] drm/i915: Fix broken num_entries in skl_ddb_allocation_overlaps

[Anshuman Gupta]

skl_ddb_allocation_overlaps() num_entries hass been passed as
INTEL_NUM_PIPES, it should be I915_MAX_PIPES.

Cc: Ville Syrjälä 
Signed-off-by: Anshuman Gupta 
---
 drivers/gpu/drm/i915/display/intel_display.c | 7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_display.c 
b/drivers/gpu/drm/i915/display/intel_display.c
index 6fdaeb019fef..dd77324206bc 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -15475,7 +15475,6 @@ static void skl_commit_modeset_enables(struct 
intel_atomic_state *state)
struct intel_crtc *crtc;
struct intel_crtc_state *old_crtc_state, *new_crtc_state;
struct skl_ddb_entry entries[I915_MAX_PIPES] = {};
-   const u8 num_pipes = INTEL_NUM_PIPES(dev_priv);
u8 update_pipes = 0, modeset_pipes = 0;
int i;
 
@@ -15512,7 +15511,7 @@ static void skl_commit_modeset_enables(struct 
intel_atomic_state *state)
continue;
 
if 
(skl_ddb_allocation_overlaps(_crtc_state->wm.skl.ddb,
-   entries, num_pipes, 
pipe))
+   entries, 
I915_MAX_PIPES, pipe))
continue;
 
entries[pipe] = new_crtc_state->wm.skl.ddb;
@@ -15550,7 +15549,7 @@ static void skl_commit_modeset_enables(struct 
intel_atomic_state *state)
continue;
 
WARN_ON(skl_ddb_allocation_overlaps(_crtc_state->wm.skl.ddb,
-   entries, num_pipes, pipe));
+   entries, I915_MAX_PIPES, 
pipe));
 
entries[pipe] = new_crtc_state->wm.skl.ddb;
modeset_pipes &= ~BIT(pipe);
@@ -15585,7 +15584,7 @@ static void skl_commit_modeset_enables(struct 
intel_atomic_state *state)
continue;
 
WARN_ON(skl_ddb_allocation_overlaps(_crtc_state->wm.skl.ddb,
-   entries, num_pipes, pipe));
+   entries, I915_MAX_PIPES, 
pipe));
 
entries[pipe] = new_crtc_state->wm.skl.ddb;
modeset_pipes &= ~BIT(pipe);
-- 
2.24.0

___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx