Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 09762525 authored by Neil Armstrong's avatar Neil Armstrong
Browse files

drm/meson: Add missing VPU init 



The VPU init misses these configurations values.

Signed-off-by: default avatarNeil Armstrong <narmstrong@baylibre.com>
Acked-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Tested-by: default avatarJerome Brunet <jbrunet@baylibre.com>
Reviewed-by: default avatarJerome Brunet <jbrunet@baylibre.com>
Link: https://patchwork.freedesktop.org/patch/msgid/1512561268-29806-5-git-send-email-narmstrong@baylibre.com
parent 161a803f

drivers/gpu/drm/meson/meson_drv.c

+9 −0
Original line number Diff line number Diff line
@@ -151,6 +151,14 @@ static struct regmap_config meson_regmap_config = { 
	.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)

{

	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 */



	meson_vpu_init(priv);

	meson_venc_init(priv);

	meson_vpp_init(priv);

	meson_viu_init(priv);

drivers/gpu/drm/meson/meson_registers.h

+4 −0
Original line number Diff line number Diff line
@@ -1363,6 +1363,10 @@ 
#define VPU_PROT3_STAT_1 0x277a

#define VPU_PROT3_STAT_2 0x277b

#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 */

#define OSDSR_HV_SIZEIN 0x3130