]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
media: ti-vpe: vpdma: Use fixed type for address in descriptor
authorBenoit Parrot <bparrot@ti.com>
Mon, 7 Oct 2019 15:10:02 +0000 (12:10 -0300)
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Thu, 10 Oct 2019 16:50:36 +0000 (13:50 -0300)
Using dma_addr_t as the type to hold address inside of a fix sized
descriptor used by the vpdma firmware is prone to fail when the expected
width is 32 bits and suddenly when CONFIG_LPAE is enabled the data size
is now 64 bits shifted the remaining members of the descriptor in memory
which confuses the firmware.

Signed-off-by: Benoit Parrot <bparrot@ti.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
drivers/media/platform/ti-vpe/vpdma_priv.h

index d8ae3e1cd54d46395fd9d4f356652fd7def7ecfb..0bbee45338bdc4cfdc0df9cdbf247a567121b28d 100644 (file)
@@ -166,11 +166,11 @@ struct vpdma_dtd {
                u32             xfer_length_height;
                u32             w1;
        };
-       dma_addr_t              start_addr;
+       u32                     start_addr;
        u32                     pkt_ctl;
        union {
                u32             frame_width_height;     /* inbound */
-               dma_addr_t      desc_write_addr;        /* outbound */
+               u32             desc_write_addr;        /* outbound */
        };
        union {
                u32             start_h_v;              /* inbound */