diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-01 09:42:29 -0400 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-01 09:44:41 -0400 |
| commit | f2a630bfeccc87c3f89aaf8b4a8902f1e4e9f7ca (patch) | |
| tree | 5c9f6950c1e8dc9190ab923c3c374db132fa1631 /drivers/gpu/drm/i915/intel_overlay.c | |
| parent | 0f8c6d7ca9257d6a01671ab69b897860d3ae9bc0 (diff) | |
| parent | c6afd658073f9fdb4cc80664dac71fa9db6fdf35 (diff) | |
Merge branch 'drm-intel-fixes' into drm-intel-next
Conflicts:
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/i915_gem_evict.c
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 e62e1b3d243f..659f8349a15c 100644 --- a/drivers/gpu/drm/i915/intel_overlay.c +++ b/drivers/gpu/drm/i915/intel_overlay.c | |||
| @@ -974,7 +974,9 @@ static int check_overlay_src(struct drm_device *dev, | |||
| 974 | { | 974 | { |
| 975 | int uv_hscale = uv_hsubsampling(rec->flags); | 975 | int uv_hscale = uv_hsubsampling(rec->flags); |
| 976 | int uv_vscale = uv_vsubsampling(rec->flags); | 976 | int uv_vscale = uv_vsubsampling(rec->flags); |
| 977 | u32 stride_mask, depth, tmp; | 977 | u32 stride_mask; |
| 978 | int depth; | ||
| 979 | u32 tmp; | ||
| 978 | 980 | ||
| 979 | /* check src dimensions */ | 981 | /* check src dimensions */ |
| 980 | if (IS_845G(dev) || IS_I830(dev)) { | 982 | if (IS_845G(dev) || IS_I830(dev)) { |