module_param(disable_vdoa, int, 0644);
 MODULE_PARM_DESC(disable_vdoa, "Disable Video Data Order Adapter tiled to raster-scan conversion");
 
+static int enable_bwb = 0;
+module_param(enable_bwb, int, 0644);
+MODULE_PARM_DESC(enable_bwb, "Enable BWB unit, may crash on certain streams");
+
 void coda_write(struct coda_dev *dev, u32 data, u32 reg)
 {
        v4l2_dbg(2, coda_debug, &dev->v4l2_dev,
        ctx->idx = idx;
        switch (dev->devtype->product) {
        case CODA_960:
-               ctx->frame_mem_ctrl = 1 << 12;
+               if (enable_bwb)
+                       ctx->frame_mem_ctrl = CODA9_FRAME_ENABLE_BWB;
                /* fallthrough */
        case CODA_7541:
                ctx->reg_idx = 0;
 
 #define                CODA7_STREAM_SEL_64BITS_ENDIAN  (1 << 1)
 #define                CODA_STREAM_ENDIAN_SELECT       (1 << 0)
 #define CODA_REG_BIT_FRAME_MEM_CTRL            0x110
+#define                CODA9_FRAME_ENABLE_BWB          (1 << 12)
 #define                CODA9_FRAME_TILED2LINEAR        (1 << 11)
 #define                CODA_FRAME_CHROMA_INTERLEAVE    (1 << 2)
 #define                CODA_IMAGE_ENDIAN_SELECT        (1 << 0)