drm/i915: Fix i915_ggtt_view_equal to handle rotation correctly
The rotated view depends upon the rotation paramters, but thus far we
didn't bother checking for those. This seems to have been an issue
ever since this was introduce in
commit fe14d5f4e5
Author: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Date: Wed Dec 10 17:27:58 2014 +0000
drm/i915: Infrastructure for supporting different GGTT views per object
But userspace is allowed to reuse framebuffer backing storage with
different framebuffers with different pixel formats/stride/whatever.
And e.g. SNA indeed does this. Hence we must check for all the
paramters to match, not just that it's rotated.
v2: intel_plane_obj_offset also needs to construct the full view, to
avoid fallout since they don't fully match.
Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1444834266-12689-3-git-send-email-daniel.vetter@ffwll.ch
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
parent
a6d09186fa
commit
ce7f172856
|
@ -553,7 +553,7 @@ i915_ggtt_view_equal(const struct i915_ggtt_view *a,
|
|||
|
||||
if (a->type != b->type)
|
||||
return false;
|
||||
if (a->type == I915_GGTT_VIEW_PARTIAL)
|
||||
if (a->type != I915_GGTT_VIEW_NORMAL)
|
||||
return !memcmp(&a->params, &b->params, sizeof(a->params));
|
||||
return true;
|
||||
}
|
||||
|
|
|
@ -2914,16 +2914,16 @@ u32 intel_plane_obj_offset(struct intel_plane *intel_plane,
|
|||
struct drm_i915_gem_object *obj,
|
||||
unsigned int plane)
|
||||
{
|
||||
const struct i915_ggtt_view *view = &i915_ggtt_view_normal;
|
||||
struct i915_ggtt_view view;
|
||||
struct i915_vma *vma;
|
||||
u64 offset;
|
||||
|
||||
if (intel_rotation_90_or_270(intel_plane->base.state->rotation))
|
||||
view = &i915_ggtt_view_rotated;
|
||||
intel_fill_fb_ggtt_view(&view, intel_plane->base.fb,
|
||||
intel_plane->base.state);
|
||||
|
||||
vma = i915_gem_obj_to_ggtt_view(obj, view);
|
||||
vma = i915_gem_obj_to_ggtt_view(obj, &view);
|
||||
if (WARN(!vma, "ggtt vma for display object not found! (view=%u)\n",
|
||||
view->type))
|
||||
view.type))
|
||||
return -1;
|
||||
|
||||
offset = vma->node.start;
|
||||
|
|
Loading…
Reference in a new issue