diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-11-18 03:35:56 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-11-18 03:35:56 -0500 |
| commit | 0421860a5a75b59a76b7a864a172eb090e3d0785 (patch) | |
| tree | df22f28abfa4c8bb77d650b674a44e0aedc586be /drivers/gpu/drm/i915/intel_overlay.c | |
| parent | cf655c36fad7b6488a56f18ab56f7d608ca6552b (diff) | |
| parent | 89ba4d12fca24d373e1b10fce498d68157bafaf0 (diff) | |
Merge branch 'rmobile/ag5' into rmobile-latest
Diffstat (limited to 'drivers/gpu/drm/i915/intel_overlay.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_overlay.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_overlay.c b/drivers/gpu/drm/i915/intel_overlay.c index afb96d25219a..02ff0a481f47 100644 --- a/drivers/gpu/drm/i915/intel_overlay.c +++ b/drivers/gpu/drm/i915/intel_overlay.c | |||
| @@ -946,7 +946,9 @@ static int check_overlay_src(struct drm_device *dev, | |||
| 946 | { | 946 | { |
| 947 | int uv_hscale = uv_hsubsampling(rec->flags); | 947 | int uv_hscale = uv_hsubsampling(rec->flags); |
| 948 | int uv_vscale = uv_vsubsampling(rec->flags); | 948 | int uv_vscale = uv_vsubsampling(rec->flags); |
| 949 | u32 stride_mask, depth, tmp; | 949 | u32 stride_mask; |
| 950 | int depth; | ||
| 951 | u32 tmp; | ||
| 950 | 952 | ||
| 951 | /* check src dimensions */ | 953 | /* check src dimensions */ |
| 952 | if (IS_845G(dev) || IS_I830(dev)) { | 954 | if (IS_845G(dev) || IS_I830(dev)) { |