Port TopazSC firmware version 385.

BZ: 33634

The data relocation address shouldn't be aligned with
MTX_DMA_BURSTSIZE_BYTES. Just write data section to base of data section.
Signed-off-by: Elaine Wang <elaine.wang@intel.com>
Change-Id: I5cf2aafe89a073b2f09f66f35695326a30ae2ad6
Reviewed-on: http://android.intel.com:8080/46207
Reviewed-by: Wang, Elaine <elaine.wang@intel.com>
Reviewed-by: Yuan, Shengquan <shengquan.yuan@intel.com>
Reviewed-by: Ding, Haitao <haitao.ding@intel.com>
Tested-by: Ding, Haitao <haitao.ding@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

diff --git a/drivers/staging/mrst/imgv/pnw_topazinit.c b/drivers/staging/mrst/imgv/pnw_topazinit.c
index 780df34..12ee92b 100644 (file)
--- a/drivers/staging/mrst/imgv/pnw_topazinit.c
+++ b/drivers/staging/mrst/imgv/pnw_topazinit.c
@@ -1002,8 +1002,6 @@ int topaz_upload_fw(struct drm_device *dev, enum drm_pnw_topaz_codec codec, uint
                     & ~(MTX_DMA_BURSTSIZE_BYTES - 1)) / 4;
 
        data_location = cur_codec_fw->data_location;
-       data_location = data_location & (~(MTX_DMA_BURSTSIZE_BYTES - 1));
-
        PSB_DEBUG_GENERAL("TOPAZ: data_size round up to %d\n"
                          "data_location round up to 0x%08x\n",
                          data_size, data_location);