public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-11-14 18:36:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

drm/meson: Add missing VPU init

Browse source 
The VPU init misses these configurations values.

Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Tested-by: Jerome Brunet <jbrunet@baylibre.com>
Reviewed-by: Jerome Brunet <jbrunet@baylibre.com>
Link: https://patchwork.freedesktop.org/patch/msgid/1512561268-29806-5-git-send-email-narmstrong@baylibre.com
This commit is contained in:
Neil Armstrong 2017-12-06 12:54:28 +01:00
parent 161a803fe3
commit 09762525d6
2 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/gpu/drm/meson/meson_drv.c
View file

@ -151,6 +151,14 @@ static struct regmap_config meson_regmap_config = {
.max_register = 0x1000, .max_register = 0x1000,
}; };
static void meson_vpu_init(struct meson_drm *priv)
{
writel_relaxed(0x210000, priv->io_base + _REG(VPU_RDARB_MODE_L1C1));
writel_relaxed(0x10000, priv->io_base + _REG(VPU_RDARB_MODE_L1C2));
writel_relaxed(0x900000, priv->io_base + _REG(VPU_RDARB_MODE_L2C1));
writel_relaxed(0x20000, priv->io_base + _REG(VPU_WRARB_MODE_L2C1));
}
static int meson_drv_bind_master(struct device *dev, bool has_components) static int meson_drv_bind_master(struct device *dev, bool has_components)
{ {
struct platform_device *pdev = to_platform_device(dev); struct platform_device *pdev = to_platform_device(dev);
@ -222,6 +230,7 @@ static int meson_drv_bind_master(struct device *dev, bool has_components)
/* Hardware Initialization */ /* Hardware Initialization */
meson_vpu_init(priv);
meson_venc_init(priv); meson_venc_init(priv);
meson_vpp_init(priv); meson_vpp_init(priv);
meson_viu_init(priv); meson_viu_init(priv);

4
drivers/gpu/drm/meson/meson_registers.h
View file

@ -1363,6 +1363,10 @@
#define VPU_PROT3_STAT_1 0x277a #define VPU_PROT3_STAT_1 0x277a
#define VPU_PROT3_STAT_2 0x277b #define VPU_PROT3_STAT_2 0x277b
#define VPU_PROT3_REQ_ONOFF 0x277c #define VPU_PROT3_REQ_ONOFF 0x277c
#define VPU_RDARB_MODE_L1C1 0x2790
#define VPU_RDARB_MODE_L1C2 0x2799
#define VPU_RDARB_MODE_L2C1 0x279d
#define VPU_WRARB_MODE_L2C1 0x27a2
/* osd super scale */ /* osd super scale */
#define OSDSR_HV_SIZEIN 0x3130 #define OSDSR_HV_SIZEIN 0x3130