From: Gurchetan Singh gurchetansingh@chromium.org
If vfpriv is null, we shouldn't check vfpriv->ring_idx_mask.
Signed-off-by: Gurchetan Singh gurchetansingh@chromium.org --- drivers/gpu/drm/virtio/virtgpu_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.c b/drivers/gpu/drm/virtio/virtgpu_drv.c index 749db18dcfa2..7975ea06b316 100644 --- a/drivers/gpu/drm/virtio/virtgpu_drv.c +++ b/drivers/gpu/drm/virtio/virtgpu_drv.c @@ -166,7 +166,7 @@ static __poll_t virtio_gpu_poll(struct file *filp, struct drm_pending_event *e = NULL; __poll_t mask = 0;
- if (!vfpriv->ring_idx_mask) + if (!vfpriv || !vfpriv->ring_idx_mask) return drm_poll(filp, wait);
poll_wait(filp, &drm_file->event_wait, wait);
On Mon, Nov 15, 2021 at 9:58 AM Gurchetan Singh gurchetansingh@chromium.org wrote:
From: Gurchetan Singh gurchetansingh@chromium.org
If vfpriv is null, we shouldn't check vfpriv->ring_idx_mask.
Signed-off-by: Gurchetan Singh gurchetansingh@chromium.org
drivers/gpu/drm/virtio/virtgpu_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.c b/drivers/gpu/drm/virtio/virtgpu_drv.c index 749db18dcfa2..7975ea06b316 100644 --- a/drivers/gpu/drm/virtio/virtgpu_drv.c +++ b/drivers/gpu/drm/virtio/virtgpu_drv.c @@ -166,7 +166,7 @@ static __poll_t virtio_gpu_poll(struct file *filp, struct drm_pending_event *e = NULL; __poll_t mask = 0;
if (!vfpriv->ring_idx_mask)
if (!vfpriv || !vfpriv->ring_idx_mask) return drm_poll(filp, wait); poll_wait(filp, &drm_file->event_wait, wait);
Nevermind, looks like fix was merged in the main tree and will make it back to to drm-misc-next:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?i...
dri-devel@lists.freedesktop.org