summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm
diff options
context:
space:
mode:
authorAndy Hu <andy.hu@starfivetech.com>2022-12-19 10:12:22 +0300
committerAndy Hu <andy.hu@starfivetech.com>2022-12-19 10:12:22 +0300
commitf0fce0037f9cc3fa6013d14d2f11fff7cf1a19da (patch)
treeb1c279c003c2ce2bd80212637ed76ca49b614070 /drivers/gpu/drm
parent40befeb85a659c53cc08fcfc7458a47dbc01597a (diff)
parentb85f8dd876e2e579b169c397a03ff41b6dff9489 (diff)
downloadlinux-VF2_v2.5.0.tar.xz
Merge tag 'JH7110_515_SDK_v3.5.1' from sdk into vf2-515-develVF2_v2.5.0
version JH7110_515_SDK_v3.5.1 for JH7110 EVB board
Diffstat (limited to 'drivers/gpu/drm')
-rw-r--r--drivers/gpu/drm/verisilicon/vs_dc.c1
-rwxr-xr-xdrivers/gpu/drm/verisilicon/vs_plane.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/verisilicon/vs_dc.c b/drivers/gpu/drm/verisilicon/vs_dc.c
index 0ffbe4901ddd..26e8b63bdd07 100644
--- a/drivers/gpu/drm/verisilicon/vs_dc.c
+++ b/drivers/gpu/drm/verisilicon/vs_dc.c
@@ -706,7 +706,6 @@ static int dc_init(struct device *dev)
dc->init_finished = false;
- ret = clk_set_parent(dc->vout_top_lcd, dc->dc8200_clk_pix1_out);
/*
ret = clk_prepare_enable(dc->vout_top_lcd);
if (ret) {
diff --git a/drivers/gpu/drm/verisilicon/vs_plane.c b/drivers/gpu/drm/verisilicon/vs_plane.c
index 8cf5f3b9d965..48cdf29fc296 100755
--- a/drivers/gpu/drm/verisilicon/vs_plane.c
+++ b/drivers/gpu/drm/verisilicon/vs_plane.c
@@ -9,6 +9,7 @@
#include <drm/drm_fb_cma_helper.h>
#include <drm/drm_gem_cma_helper.h>
#include <drm/vs_drm.h>
+#include <soc/starfive/vic7100.h>
#include "vs_type.h"
#include "vs_crtc.h"
@@ -289,6 +290,7 @@ static void vs_plane_atomic_update(struct drm_plane *plane,
vs_obj = vs_fb_get_gem_obj(fb, i);
vs_plane->dma_addr[i] = vs_obj->iova + fb->offsets[i];
+ starfive_flush_dcache(vs_plane->dma_addr[i], vs_obj->size);
}
plane_state->status.src = drm_plane_state_src(new_state);