diff mbox

[2/3] drm/i915: Make the report about a bogus stolen reserved area an error

Message ID 20171102151737.23336-2-ville.syrjala@linux.intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Ville Syrjälä Nov. 2, 2017, 3:17 p.m. UTC
From: Ville Syrjälä <ville.syrjala@linux.intel.com>

Now that we should be properly filtering out the cases when the stolen
reserved area is disabled, let's convert the debug message about a
misplaced reserved area into an error.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 drivers/gpu/drm/i915/i915_gem_stolen.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Zanoni, Paulo R Nov. 14, 2017, 8:33 p.m. UTC | #1
Em Qui, 2017-11-02 às 17:17 +0200, Ville Syrjala escreveu:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> 
> Now that we should be properly filtering out the cases when the
> stolen
> reserved area is disabled, let's convert the debug message about a
> misplaced reserved area into an error.

Worst that could happen is that some unhappy user will notify us that
we may still be missing something.

Speaking of that, is CI already able to call our attention to boot
error messages like this one?

Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>

> 
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
>  drivers/gpu/drm/i915/i915_gem_stolen.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_gem_stolen.c
> b/drivers/gpu/drm/i915/i915_gem_stolen.c
> index 44a5dbc8c23b..4f9377b5f4ae 100644
> --- a/drivers/gpu/drm/i915/i915_gem_stolen.c
> +++ b/drivers/gpu/drm/i915/i915_gem_stolen.c
> @@ -503,9 +503,9 @@ int i915_gem_init_stolen(struct drm_i915_private
> *dev_priv)
>  	if (reserved_base < dev_priv->mm.stolen_base ||
>  	    reserved_base + reserved_size > stolen_top) {
>  		dma_addr_t reserved_top = reserved_base +
> reserved_size;
> -		DRM_DEBUG_KMS("Stolen reserved area [%pad - %pad]
> outside stolen memory [%pad - %pad]\n",
> -			      &reserved_base, &reserved_top,
> -			      &dev_priv->mm.stolen_base,
> &stolen_top);
> +		DRM_ERROR("Stolen reserved area [%pad - %pad]
> outside stolen memory [%pad - %pad]\n",
> +			  &reserved_base, &reserved_top,
> +			  &dev_priv->mm.stolen_base, &stolen_top);
>  		return 0;
>  	}
>
Ville Syrjälä Nov. 14, 2017, 8:41 p.m. UTC | #2
On Tue, Nov 14, 2017 at 06:33:41PM -0200, Paulo Zanoni wrote:
> Em Qui, 2017-11-02 às 17:17 +0200, Ville Syrjala escreveu:
> > From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> > 
> > Now that we should be properly filtering out the cases when the
> > stolen
> > reserved area is disabled, let's convert the debug message about a
> > misplaced reserved area into an error.
> 
> Worst that could happen is that some unhappy user will notify us that
> we may still be missing something.
> 
> Speaking of that, is CI already able to call our attention to boot
> error messages like this one?

I guess module reload should hit it. Would be nice to have checks for
initial boot errors/warnings too though since there's no guarantee
everything is 100% virgin on module reload.

> 
> Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
> 
> > 
> > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> > ---
> >  drivers/gpu/drm/i915/i915_gem_stolen.c | 6 +++---
> >  1 file changed, 3 insertions(+), 3 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/i915/i915_gem_stolen.c
> > b/drivers/gpu/drm/i915/i915_gem_stolen.c
> > index 44a5dbc8c23b..4f9377b5f4ae 100644
> > --- a/drivers/gpu/drm/i915/i915_gem_stolen.c
> > +++ b/drivers/gpu/drm/i915/i915_gem_stolen.c
> > @@ -503,9 +503,9 @@ int i915_gem_init_stolen(struct drm_i915_private
> > *dev_priv)
> >  	if (reserved_base < dev_priv->mm.stolen_base ||
> >  	    reserved_base + reserved_size > stolen_top) {
> >  		dma_addr_t reserved_top = reserved_base +
> > reserved_size;
> > -		DRM_DEBUG_KMS("Stolen reserved area [%pad - %pad]
> > outside stolen memory [%pad - %pad]\n",
> > -			      &reserved_base, &reserved_top,
> > -			      &dev_priv->mm.stolen_base,
> > &stolen_top);
> > +		DRM_ERROR("Stolen reserved area [%pad - %pad]
> > outside stolen memory [%pad - %pad]\n",
> > +			  &reserved_base, &reserved_top,
> > +			  &dev_priv->mm.stolen_base, &stolen_top);
> >  		return 0;
> >  	}
> >
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/i915_gem_stolen.c b/drivers/gpu/drm/i915/i915_gem_stolen.c
index 44a5dbc8c23b..4f9377b5f4ae 100644
--- a/drivers/gpu/drm/i915/i915_gem_stolen.c
+++ b/drivers/gpu/drm/i915/i915_gem_stolen.c
@@ -503,9 +503,9 @@  int i915_gem_init_stolen(struct drm_i915_private *dev_priv)
 	if (reserved_base < dev_priv->mm.stolen_base ||
 	    reserved_base + reserved_size > stolen_top) {
 		dma_addr_t reserved_top = reserved_base + reserved_size;
-		DRM_DEBUG_KMS("Stolen reserved area [%pad - %pad] outside stolen memory [%pad - %pad]\n",
-			      &reserved_base, &reserved_top,
-			      &dev_priv->mm.stolen_base, &stolen_top);
+		DRM_ERROR("Stolen reserved area [%pad - %pad] outside stolen memory [%pad - %pad]\n",
+			  &reserved_base, &reserved_top,
+			  &dev_priv->mm.stolen_base, &stolen_top);
 		return 0;
 	}