diff options
| author | yt.shen@mediatek.com <yt.shen@mediatek.com> | 2017-06-16 22:02:16 +0800 |
|---|---|---|
| committer | CK Hu <ck.hu@mediatek.com> | 2017-06-27 17:34:53 +0800 |
| commit | 5ac5895a84d92bd2b3db490f8ee242ccb4d77e96 (patch) | |
| tree | 2331ee44a20c02678a3eb2f3ec88a98d67edccd8 /drivers/gpu/drm/mediatek/mtk_drm_drv.c | |
| parent | 4a3bfb5c24306aa129c0de32e5d1ffb553a60a7c (diff) | |
| download | kernel_replicant_linux-5ac5895a84d92bd2b3db490f8ee242ccb4d77e96.tar.gz kernel_replicant_linux-5ac5895a84d92bd2b3db490f8ee242ccb4d77e96.tar.bz2 kernel_replicant_linux-5ac5895a84d92bd2b3db490f8ee242ccb4d77e96.zip | |
drm/mediatek: separate color module to fixup error memory reallocation
Previous patch (c5f228ef6c drm/mediatek: add *driver_data for different
hardware settings) calls devm_kfree() and then devm_kzalloc() to
reallocate color module data structure. But this reallocation cannnot
guarantee the new address is unchanged, but the caller will use the
old address, which is wrong.
Fix it by separate color module from general components, this patch
separate color module to independent files, like mtk_disp_ovl.c and
mtk_disp_rdma.c do
Fixes: c5f228ef6ccd ("drm/mediatek: add *driver_data for different hardware settings")
Signed-off-by: YT Shen <yt.shen@mediatek.com>
Tested-by: Bibby Hsieh <bibby.hsieh@mediatek.com>
Signed-off-by: CK Hu <ck.hu@mediatek>
Diffstat (limited to 'drivers/gpu/drm/mediatek/mtk_drm_drv.c')
| -rw-r--r-- | drivers/gpu/drm/mediatek/mtk_drm_drv.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c index 3754c3ffdcf2..41d2cffe953e 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c @@ -439,11 +439,12 @@ static int mtk_drm_probe(struct platform_device *pdev) private->comp_node[comp_id] = of_node_get(node); /* - * Currently only the OVL, RDMA, DSI, and DPI blocks have + * Currently only the COLOR, OVL, RDMA, DSI, and DPI blocks have * separate component platform drivers and initialize their own * DDP component structure. The others are initialized here. */ - if (comp_type == MTK_DISP_OVL || + if (comp_type == MTK_DISP_COLOR || + comp_type == MTK_DISP_OVL || comp_type == MTK_DISP_RDMA || comp_type == MTK_DSI || comp_type == MTK_DPI) { @@ -566,6 +567,7 @@ static struct platform_driver mtk_drm_platform_driver = { static struct platform_driver * const mtk_drm_drivers[] = { &mtk_ddp_driver, + &mtk_disp_color_driver, &mtk_disp_ovl_driver, &mtk_disp_rdma_driver, &mtk_dpi_driver, |