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

drm/i915: Fix not checking cursor and object sizes 

Even if the fb is the same we should still check if the sizes are
valid to be set.

Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Gustavo Padovan 2014-09-24 14:20:25 -03:00 committed by Daniel Vetter
parent 757f9a3e5b
commit e391ea882b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/gpu/drm/i915/intel_display.c
View File

@ -11923,9 +11923,6 @@ intel_check_cursor_plane(struct drm_plane *plane,
if (!obj) if (!obj)
return 0; return 0;
if (fb == crtc->cursor->fb)
return 0;
/* Check for which cursor types we support */ /* Check for which cursor types we support */
crtc_w = drm_rect_width(&state->orig_dst); crtc_w = drm_rect_width(&state->orig_dst);
crtc_h = drm_rect_height(&state->orig_dst); crtc_h = drm_rect_height(&state->orig_dst);
@ -11940,6 +11937,9 @@ intel_check_cursor_plane(struct drm_plane *plane,
return -ENOMEM; return -ENOMEM;
} }
if (fb == crtc->cursor->fb)
return 0;
/* we only need to pin inside GTT if cursor is non-phy */ /* we only need to pin inside GTT if cursor is non-phy */
mutex_lock(&dev->struct_mutex); mutex_lock(&dev->struct_mutex);
if (!INTEL_INFO(dev)->cursor_needs_physical && obj->tiling_mode) { if (!INTEL_INFO(dev)->cursor_needs_physical && obj->tiling_mode) {