Commit 0cf51c7e authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Chris Wilson
Browse files

sna/video/sprite: Remove stale video->plane



video->plane is never populated so nuke it. Its only user can be nuked
as well since all it's trying to do is turn off the plane (which fails
on account plane_id being zero). We don't need to disable the plane
immediately upon the setplane failure as the higher level code will
end up stopping the entire port on error, and thus the plane will get
disabled just fine.
Signed-off-by: Ville Syrjälä's avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson's avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson's avatarChris Wilson <chris@chris-wilson.co.uk>
parent 02dfb919
......@@ -111,7 +111,6 @@ struct sna_video {
int alignment;
bool tiled;
bool textured;
int plane;
struct kgem_bo *bo[4];
RegionRec clip;
......
......@@ -381,9 +381,6 @@ sna_video_sprite_show(struct sna *sna,
if (drmIoctl(sna->kgem.fd, LOCAL_IOCTL_MODE_SETPLANE, &s)) {
DBG(("SET_PLANE failed: ret=%d\n", errno));
memset(&s, 0, sizeof(s));
s.plane_id = video->plane;
(void)drmIoctl(sna->kgem.fd, LOCAL_IOCTL_MODE_SETPLANE, &s);
if (video->bo[pipe]) {
kgem_bo_destroy(&sna->kgem, video->bo[pipe]);
video->bo[pipe] = NULL;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment