diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h index 59ff4197173aedb24f0883571c62cdbf4cd54de4..bc6ee5a847a76c23ab984f30ed8ebdb479838a68 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h @@ -153,7 +153,6 @@ enum vmw_cmdbuf_res_type { struct vmw_cmdbuf_res_manager; struct vmw_cursor_snooper { - struct drm_crtc *crtc; size_t age; uint32_t *image; }; diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c index d492d57d53094a061ef0e2b735e3bca87efb5636..6bcba56ef158b5cb4890d6ce5efcedd2a20d873c 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c @@ -188,7 +188,6 @@ int vmw_du_crtc_cursor_set2(struct drm_crtc *crtc, struct drm_file *file_priv, /* takedown old cursor */ if (du->cursor_surface) { - du->cursor_surface->snooper.crtc = NULL; vmw_surface_unreference(&du->cursor_surface); } if (du->cursor_dmabuf) @@ -200,7 +199,6 @@ int vmw_du_crtc_cursor_set2(struct drm_crtc *crtc, struct drm_file *file_priv, /* vmw_user_surface_lookup takes one reference */ du->cursor_surface = surface; - du->cursor_surface->snooper.crtc = crtc; du->cursor_age = du->cursor_surface->snooper.age; ret = vmw_cursor_update_image(dev_priv, surface->snooper.image, 64, 64, hotspot_x, hotspot_y); diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c b/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c index b445ce9b9757861ecc1ece1071f1c8c3a02a166f..6abcf82d8a39a4a1e7fede499b7aa37162a428b1 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c @@ -814,7 +814,6 @@ int vmw_surface_define_ioctl(struct drm_device *dev, void *data, } else { srf->snooper.image = NULL; } - srf->snooper.crtc = NULL; user_srf->prime.base.shareable = false; user_srf->prime.base.tfile = NULL;