drm/format-helper: Pass format-conversion state to helpers

[linux-2.6-microblaze.git] / drivers / gpu / drm / tiny / cirrus.c

diff --git a/drivers/gpu/drm/tiny/cirrus.c b/drivers/gpu/drm/tiny/cirrus.c
index 594bc47..4e3a152 100644 (file)
--- a/drivers/gpu/drm/tiny/cirrus.c
+++ b/drivers/gpu/drm/tiny/cirrus.c
@@ -411,7 +411,8 @@ static void cirrus_primary_plane_helper_atomic_update(struct drm_plane *plane,
                unsigned int offset = drm_fb_clip_offset(pitch, format, &damage);
                struct iosys_map dst = IOSYS_MAP_INIT_OFFSET(&vaddr, offset);
 
-               drm_fb_blit(&dst, &pitch, format->format, shadow_plane_state->data, fb, &damage);
+               drm_fb_blit(&dst, &pitch, format->format, shadow_plane_state->data, fb,
+                           &damage, &shadow_plane_state->fmtcnv_state);
        }
 
        drm_dev_exit(idx);
@@ -727,6 +728,11 @@ static void cirrus_pci_remove(struct pci_dev *pdev)
        drm_atomic_helper_shutdown(dev);
 }
 
+static void cirrus_pci_shutdown(struct pci_dev *pdev)
+{
+       drm_atomic_helper_shutdown(pci_get_drvdata(pdev));
+}
+
 static const struct pci_device_id pciidlist[] = {
        {
                .vendor    = PCI_VENDOR_ID_CIRRUS,
@@ -748,6 +754,7 @@ static struct pci_driver cirrus_pci_driver = {
        .id_table = pciidlist,
        .probe = cirrus_pci_probe,
        .remove = cirrus_pci_remove,
+       .shutdown = cirrus_pci_shutdown,
 };
 
 drm_module_pci_driver(cirrus_pci_driver)