Re: [Intel-gfx] [PATCH 3/3] drm/i915: warn about invalid pfit modes

[Daniel Vetter]

On Thu, Apr 25, 2013 at 12:55:03PM -0700, Jesse Barnes wrote:
> We prevent invalid ones from getting here in the first place, but it
> doesn't hurt to have an extra sanity check.
> 
> Signed-off-by: Jesse Barnes 

Merged all three, with the first one a bit bikeshedded (as discussed on
irc).

Thanks, Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] [PATCH 3/3] drm/i915: warn about invalid pfit modes

[Jesse Barnes]

We prevent invalid ones from getting here in the first place, but it
doesn't hurt to have an extra sanity check.

Signed-off-by: Jesse Barnes 
---
 drivers/gpu/drm/i915/intel_panel.c |   10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_panel.c 
b/drivers/gpu/drm/i915/intel_panel.c
index 016e676..48e7207 100644
--- a/drivers/gpu/drm/i915/intel_panel.c
+++ b/drivers/gpu/drm/i915/intel_panel.c
@@ -58,7 +58,6 @@ intel_pch_panel_fitting(struct intel_crtc *intel_crtc,
struct intel_crtc_config *pipe_config,
int fitting_mode)
 {
-   struct drm_i915_private *dev_priv = intel_crtc->base.dev->dev_private;
struct drm_display_mode *mode, *adjusted_mode;
int x, y, width, height;
 
@@ -107,12 +106,15 @@ intel_pch_panel_fitting(struct intel_crtc *intel_crtc,
}
break;
 
-   default:
case DRM_MODE_SCALE_FULLSCREEN:
x = y = 0;
width = adjusted_mode->hdisplay;
height = adjusted_mode->vdisplay;
break;
+
+   default:
+   WARN(1, "bad panel fit mode: %d\n", fitting_mode);
+   return;
}
 
 done:
@@ -266,7 +268,6 @@ void intel_gmch_panel_fitting(struct intel_crtc *intel_crtc,
}
}
break;
-   default:
case DRM_MODE_SCALE_FULLSCREEN:
/*
 * Full scaling, even if it changes the aspect ratio.
@@ -284,6 +285,9 @@ void intel_gmch_panel_fitting(struct intel_crtc *intel_crtc,
 HORIZ_INTERP_BILINEAR);
}
break;
+   default:
+   WARN(1, "bad panel fit mode: %d\n", fitting_mode);
+   return;
}
 
/* 965+ wants fuzzy fitting */
-- 
1.7.10.4

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