openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/i915/overlay: Tidy attribute checking. 

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Chris Wilson 2010-08-12 10:44:45 +01:00
parent 8d74f656dd
commit 60fc332cb5
1 changed files with 15 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
drivers/gpu/drm/i915/intel_overlay.c
View File

@ -1314,10 +1314,11 @@ int intel_overlay_attrs(struct drm_device *dev, void *data,
mutex_lock(&dev->mode_config.mutex); mutex_lock(&dev->mode_config.mutex);
mutex_lock(&dev->struct_mutex); mutex_lock(&dev->struct_mutex);
ret = -EINVAL;
if (!(attrs->flags & I915_OVERLAY_UPDATE_ATTRS)) { if (!(attrs->flags & I915_OVERLAY_UPDATE_ATTRS)) {
attrs->color_key = overlay->color_key; attrs->color_key = overlay->color_key;
attrs->brightness = overlay->brightness; attrs->brightness = overlay->brightness;
attrs->contrast = overlay->contrast; attrs->contrast = overlay->contrast;
attrs->saturation = overlay->saturation; attrs->saturation = overlay->saturation;
if (IS_I9XX(dev)) { if (IS_I9XX(dev)) {
@ -1328,29 +1329,18 @@ int intel_overlay_attrs(struct drm_device *dev, void *data,
attrs->gamma4 = I915_READ(OGAMC4); attrs->gamma4 = I915_READ(OGAMC4);
attrs->gamma5 = I915_READ(OGAMC5); attrs->gamma5 = I915_READ(OGAMC5);
} }
ret = 0;
} else { } else {
overlay->color_key = attrs->color_key; if (attrs->brightness < -128 || attrs->brightness > 127)
if (attrs->brightness >= -128 && attrs->brightness <= 127) { goto out_unlock;
overlay->brightness = attrs->brightness; if (attrs->contrast > 255)
} else { goto out_unlock;
ret = -EINVAL; if (attrs->saturation > 1023)
goto out_unlock; goto out_unlock;
}
if (attrs->contrast <= 255) { overlay->color_key = attrs->color_key;
overlay->contrast = attrs->contrast; overlay->brightness = attrs->brightness;
} else { overlay->contrast = attrs->contrast;
ret = -EINVAL; overlay->saturation = attrs->saturation;
goto out_unlock;
}
if (attrs->saturation <= 1023) {
overlay->saturation = attrs->saturation;
} else {
ret = -EINVAL;
goto out_unlock;
}
regs = intel_overlay_map_regs(overlay); regs = intel_overlay_map_regs(overlay);
if (!regs) { if (!regs) {
@ -1363,10 +1353,8 @@ int intel_overlay_attrs(struct drm_device *dev, void *data,
intel_overlay_unmap_regs(overlay); intel_overlay_unmap_regs(overlay);
if (attrs->flags & I915_OVERLAY_UPDATE_GAMMA) { if (attrs->flags & I915_OVERLAY_UPDATE_GAMMA) {
if (!IS_I9XX(dev)) { if (!IS_I9XX(dev))
ret = -EINVAL;
goto out_unlock; goto out_unlock;
}
if (overlay->active) { if (overlay->active) {
ret = -EBUSY; ret = -EBUSY;
@ -1374,7 +1362,7 @@ int intel_overlay_attrs(struct drm_device *dev, void *data,
} }
ret = check_gamma(attrs); ret = check_gamma(attrs);
if (ret != 0) if (ret)
goto out_unlock; goto out_unlock;
I915_WRITE(OGAMC0, attrs->gamma0); I915_WRITE(OGAMC0, attrs->gamma0);
@ -1384,9 +1372,9 @@ int intel_overlay_attrs(struct drm_device *dev, void *data,
I915_WRITE(OGAMC4, attrs->gamma4); I915_WRITE(OGAMC4, attrs->gamma4);
I915_WRITE(OGAMC5, attrs->gamma5); I915_WRITE(OGAMC5, attrs->gamma5);
} }
ret = 0;
} }
ret = 0;
out_unlock: out_unlock:
mutex_unlock(&dev->struct_mutex); mutex_unlock(&dev->struct_mutex);
mutex_unlock(&dev->mode_config.mutex); mutex_unlock(&dev->mode_config.mutex);