linux-stable.git/drivers/gpu/drm/pl111, branch linux-5.10.y

drm/pl111: Fix error handling in pl111_amba_probe

2026-01-19T12:12:08+00:00

commit 0ddd3bb4b14c9102c0267b3fd916c81fe5ab89c1 upstream.

Jump to the existing dev_put label when devm_request_irq() fails
so drm_dev_put() and of_reserved_mem_device_release() run
instead of returning early and leaking resources.

Found via static analysis and code review.

Fixes: bed41005e617 ("drm/pl111: Initial drm/kms driver for pl111")
Cc: stable@vger.kernel.org
Signed-off-by: Miaoqian Lin 
Reviewed-by: Javier Martinez Canillas 
Signed-off-by: Linus Walleij 
Link: https://patch.msgid.link/20251211123345.2392065-1-linmq006@gmail.com
Signed-off-by: Greg Kroah-Hartman

drm:pl111: Add of_node_put() when breaking out of for_each_available_child_of_node()

2022-10-26T11:25:24+00:00

[ Upstream commit e0686dc6f2252e009c455fe99e2ce9d62a60eb47 ]

The reference 'child' in the iteration of for_each_available_child_of_node()
is only escaped out into a local variable which is only used to check
its value. So we still need to the of_node_put() when breaking of the
for_each_available_child_of_node() which will automatically increase
and decrease the refcount.

Fixes: ca454bd42dc2 ("drm/pl111: Support the Versatile Express")
Signed-off-by: Liang He 
Reviewed-by: Rob Herring 
Signed-off-by: Daniel Vetter 
Link: https://patchwork.freedesktop.org/patch/msgid/20220711131550.361350-1-windhl@126.com
Signed-off-by: Sasha Levin

amba: Make the remove callback return void

2022-04-08T12:40:02+00:00

[ Upstream commit 3fd269e74f2feec973f45ee11d822faeda4fe284 ]

All amba drivers return 0 in their remove callback. Together with the
driver core ignoring the return value anyhow, it doesn't make sense to
return a value here.

Change the remove prototype to return void, which makes it explicit that
returning an error value doesn't work as expected. This simplifies changing
the core remove callback to return void, too.

Reviewed-by: Ulf Hansson 
Reviewed-by: Arnd Bergmann 
Acked-by: Alexandre Belloni 
Acked-by: Dmitry Torokhov 
Acked-by: Krzysztof Kozlowski  # for drivers/memory
Acked-by: Mark Brown 
Acked-by: Linus Walleij 
Acked-by: Suzuki K Poulose  # for hwtracing/coresight
Acked-By: Vinod Koul  # for dmaengine
Acked-by: Guenter Roeck  # for watchdog
Acked-by: Wolfram Sang  # for I2C
Acked-by: Takashi Iwai  # for sound
Acked-by: Vladimir Zapolskiy  # for memory/pl172
Acked-by: Greg Kroah-Hartman 
Link: https://lore.kernel.org/r/20210126165835.687514-5-u.kleine-koenig@pengutronix.de
Signed-off-by: Uwe Kleine-König 
Signed-off-by: Sasha Levin

drm/pl111: Actually fix CONFIG_VEXPRESS_CONFIG depends

2021-07-14T14:56:19+00:00

[ Upstream commit 4e566003571244f508408f59ce78f6ac2ccdba8e ]

VEXPRESS_CONFIG needs to either be missing, built-in, or modular when
pl111 is modular. Update the Kconfig to reflect the need.

Fixes: 4dc7c97d04dc ("drm/pl111: depend on CONFIG_VEXPRESS_CONFIG")
Signed-off-by: Kees Cook 
Reviewed-by: Linus Walleij 
Acked-by: Rob Herring 
Signed-off-by: Linus Walleij 
Link: https://patchwork.freedesktop.org/patch/msgid/20210604014055.4060521-1-keescook@chromium.org
Signed-off-by: Sasha Levin

drm/pl111: depend on CONFIG_VEXPRESS_CONFIG

2021-07-14T14:56:19+00:00

[ Upstream commit 4dc7c97d04dcaa9f19482f70dcfdbeb52cc7193f ]

Avoid randconfig build failures by requiring VEXPRESS_CONFIG:

aarch64-linux-gnu-ld: drivers/gpu/drm/pl111/pl111_versatile.o: in function `pl111_vexpress_clcd_init':
pl111_versatile.c:(.text+0x220): undefined reference to `devm_regmap_init_vexpress_config'

Fixes: 826fc86b5903 ("drm: pl111: Move VExpress setup into versatile init")
Signed-off-by: Kees Cook 
Signed-off-by: Daniel Vetter 
Link: https://patchwork.freedesktop.org/patch/msgid/20210602215252.695994-4-keescook@chromium.org
Signed-off-by: Sasha Levin

drm: pl111: Update documentation

2020-07-23T08:06:22+00:00

Remove notes about migrating from the old driver which is
retired as all users are now migrated.

Update the text to reflect that we support PL110 and PL111
alike.

Drop the bullet on memory bandwidth scaling: this has been
implemented.

Signed-off-by: Linus Walleij 
Acked-by: Daniel Vetter 
Cc: Russell King 
Link: https://patchwork.freedesktop.org/patch/msgid/20200720130327.92364-1-linus.walleij@linaro.org

drm: pl111: Absorb the external register header

2020-06-29T22:32:59+00:00

The PL111 DRM driver is now the sole user of the external
CLCD registers header file, so let's absorb that into the
pl111_drm.h file and save the external include.

Reviewed-by: Eric Anholt 
Signed-off-by: Linus Walleij 
Cc: Russell King 
Link: https://patchwork.freedesktop.org/patch/msgid/20200609200446.153209-3-linus.walleij@linaro.org

drm: pl111: Credit where credit is due

2020-06-29T22:20:58+00:00

This moves over some of the credit for the development of this
driver from the old fbdev driver that I used as reference when
getting this in place.

Reviewed-by: Eric Anholt 
Signed-off-by: Linus Walleij 
Cc: Russell King 
Link: https://patchwork.freedesktop.org/patch/msgid/20200609200446.153209-1-linus.walleij@linaro.org

drm: pl111: Move VExpress setup into versatile init

2020-04-28T19:06:20+00:00

Since the VExpress setup in pl111_vexpress.c is now just a single
function call, let's move it into pl111_versatile.c and we can further
simplify pl111_versatile_init() by moving the other pieces for VExpress
into pl111_vexpress_clcd_init().

Cc: Eric Anholt 
Cc: dri-devel@lists.freedesktop.org
Acked-by: Sam Ravnborg 
Reviewed-by: Linus Walleij 
Signed-off-by: Rob Herring 
Link: https://patchwork.freedesktop.org/patch/msgid/20200409013947.12667-4-robh@kernel.org

drm: pl111: Simplify vexpress init

2020-04-28T19:06:20+00:00

The init VExpress variants currently instantiates a 'muxfpga' driver for
the sole purpose of getting a regmap for it. There's no reason to
instantiate a driver and doing so just complicates things. The muxfpga
driver also isn't unregistered properly on module unload. Let's
just simplify all this this by just calling
devm_regmap_init_vexpress_config() directly.

Cc: Eric Anholt 
Cc: dri-devel@lists.freedesktop.org
Acked-by: Sam Ravnborg 
Reviewed-by: Linus Walleij 
Signed-off-by: Rob Herring 
Link: https://patchwork.freedesktop.org/patch/msgid/20200409013947.12667-3-robh@kernel.org