summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandy.hu <andy.hu@starfivetech.com>2023-11-09 13:44:19 +0300
committerandy.hu <andy.hu@starfivetech.com>2023-11-09 13:44:19 +0300
commitfcd4b4a9444b968f09a17eb9f14311eafb89bd9f (patch)
tree05822c5659ec495dd53417f32b9358c7910f9c9d
parentc9c14b3525453328d1574da00c9c4ab5fb7df2a9 (diff)
parent9f3b95819823891603010a64f793ba0b2d75a816 (diff)
downloadlinux-fcd4b4a9444b968f09a17eb9f14311eafb89bd9f.tar.xz
Merge branch 'CR_4961_evb_5.15_fix_gst_problem_shengyang.chen' into 'jh7110-5.15.y-devel'
CR_4961_evb_5.15: riscv: drm: dc: change pitch alignment for gst problem See merge request sdk/linux!979
-rw-r--r--drivers/gpu/drm/verisilicon/vs_dc_hw.c6
-rw-r--r--drivers/gpu/drm/verisilicon/vs_drv.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/verisilicon/vs_dc_hw.c b/drivers/gpu/drm/verisilicon/vs_dc_hw.c
index ae451edd5c65..22ab16cd01e1 100644
--- a/drivers/gpu/drm/verisilicon/vs_dc_hw.c
+++ b/drivers/gpu/drm/verisilicon/vs_dc_hw.c
@@ -1098,7 +1098,7 @@ static const struct vs_dc_info dc_info[] = {
DRM_COLOR_FORMAT_YCRCB420,
.gamma_size = GAMMA_EX_SIZE,
.gamma_bits = 12,
- .pitch_alignment = 128,
+ .pitch_alignment = 32,
.pipe_sync = false,
.mmu_prefetch = false,
.background = true,
@@ -1119,7 +1119,7 @@ static const struct vs_dc_info dc_info[] = {
DRM_COLOR_FORMAT_YCRCB420,
.gamma_size = GAMMA_EX_SIZE,
.gamma_bits = 12,
- .pitch_alignment = 128,
+ .pitch_alignment = 32,
.pipe_sync = false,
.mmu_prefetch = false,
.background = true,
@@ -1140,7 +1140,7 @@ static const struct vs_dc_info dc_info[] = {
DRM_COLOR_FORMAT_YCRCB420,
.gamma_size = GAMMA_EX_SIZE,
.gamma_bits = 12,
- .pitch_alignment = 128,
+ .pitch_alignment = 32,
.pipe_sync = false,
.mmu_prefetch = false,
.background = true,
diff --git a/drivers/gpu/drm/verisilicon/vs_drv.c b/drivers/gpu/drm/verisilicon/vs_drv.c
index 4a9a5f8fb781..87a85435043b 100644
--- a/drivers/gpu/drm/verisilicon/vs_drv.c
+++ b/drivers/gpu/drm/verisilicon/vs_drv.c
@@ -223,7 +223,7 @@ static int vs_drm_bind(struct device *dev)
goto err_put_dev;
}
- priv->pitch_alignment = 64;
+ priv->pitch_alignment = 32;
priv->dma_dev = drm_dev->dev;
priv->dma_dev->coherent_dma_mask = dma_mask;
drm_dev->dev_private = priv;