drm/nouveau/kms: Don't change EDID when it hasn't actually changed

[linux.git] / drivers / gpu / drm / virtio / virtgpu_plane.c

diff --git a/drivers/gpu/drm/virtio/virtgpu_plane.c b/drivers/gpu/drm/virtio/virtgpu_plane.c
index d1c3f5fbfee4a65e6f33aa7f1f8ac8ef5ee0ed59..52d24179bcecc52851c286652f935a620d47b426 100644 (file)
--- a/drivers/gpu/drm/virtio/virtgpu_plane.c
+++ b/drivers/gpu/drm/virtio/virtgpu_plane.c
@@ -148,14 +148,13 @@ static void virtio_gpu_primary_plane_update(struct drm_plane *plane,
                                           plane->state->src_w >> 16,
                                           plane->state->src_h >> 16,
                                           0, 0);
+               virtio_gpu_notify(vgdev);
                return;
        }
 
        if (!drm_atomic_helper_damage_merged(old_state, plane->state, &rect))
                return;
 
-       virtio_gpu_disable_notify(vgdev);
-
        bo = gem_to_virtio_gpu_obj(plane->state->fb->obj[0]);
        if (bo->dumb)
                virtio_gpu_update_dumb_bo(vgdev, plane->state, &rect);
@@ -186,8 +185,7 @@ static void virtio_gpu_primary_plane_update(struct drm_plane *plane,
                                      rect.y1,
                                      rect.x2 - rect.x1,
                                      rect.y2 - rect.y1);
-
-       virtio_gpu_enable_notify(vgdev);
+       virtio_gpu_notify(vgdev);
 }
 
 static int virtio_gpu_cursor_prepare_fb(struct drm_plane *plane,
@@ -266,6 +264,7 @@ static void virtio_gpu_cursor_plane_update(struct drm_plane *plane,
                         plane->state->crtc_w,
                         plane->state->crtc_h,
                         0, 0, objs, vgfb->fence);
+               virtio_gpu_notify(vgdev);
                dma_fence_wait(&vgfb->fence->f, true);
                dma_fence_put(&vgfb->fence->f);
                vgfb->fence = NULL;