summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm
diff options
context:
space:
mode:
authorRob Herring <robh@kernel.org>2016-01-13 15:52:07 -0600
committerAlistair Strachan <astrachan@google.com>2018-03-29 10:39:03 -0700
commitd9e0aa6379fbea7736f135fc2ca34e9e40e27fdf (patch)
treeab6c20cbdb5a6058dbc82e0050b48874b11bec6f /drivers/gpu/drm
parent38f41ec1cb31ccf5d2a39dfc255cc522de3b320e (diff)
UPSTREAM: drm: virtio-gpu: get the fb from the plane state for atomic updates
When using the atomic API, plane->fb is not set when calling virtio_gpu_plane_atomic_update. Use plane->state->fb instead. Signed-off-by: Rob Herring <robh@kernel.org> Signed-off-by: Dave Airlie <airlied@redhat.com> (cherry picked from commit 11c94ace5e25a1b6d12184b1a6f54ef4dc75aa62) Change-Id: Ic5f4e3852fcd44af965d6a1cf784c38a34aee19e Signed-off-by: Alistair Strachan <astrachan@google.com>
Diffstat (limited to 'drivers/gpu/drm')
-rw-r--r--drivers/gpu/drm/virtio/virtgpu_plane.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/virtio/virtgpu_plane.c b/drivers/gpu/drm/virtio/virtgpu_plane.c
index 4a74129c5708..6b9ad59c643f 100644
--- a/drivers/gpu/drm/virtio/virtgpu_plane.c
+++ b/drivers/gpu/drm/virtio/virtgpu_plane.c
@@ -68,8 +68,8 @@ static void virtio_gpu_plane_atomic_update(struct drm_plane *plane,
struct virtio_gpu_object *bo;
uint32_t handle;
- if (plane->fb) {
- vgfb = to_virtio_gpu_framebuffer(plane->fb);
+ if (plane->state->fb) {
+ vgfb = to_virtio_gpu_framebuffer(plane->state->fb);
bo = gem_to_virtio_gpu_obj(vgfb->obj);
handle = bo->hw_res_handle;
} else {