summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Hu <andy.hu@starfivetech.com>2023-11-09 18:30:07 +0300
committerAndy Hu <andy.hu@starfivetech.com>2023-11-09 18:30:07 +0300
commitbd3bbf384e103d40ae3b4221333d6188c9818954 (patch)
treee75ce7308f70b2b1b180c1b20a5fcd842469b858
parent7e61f06219e05739852bc9d60c37d4fea1ed401e (diff)
parentfcd4b4a9444b968f09a17eb9f14311eafb89bd9f (diff)
downloadlinux-bd3bbf384e103d40ae3b4221333d6188c9818954.tar.xz
Merge tag 'JH7110_515_SDK_v5.9.1' into vf2-515-devel
-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;