drm/arm/malidp: use drm managed resources
Subsystems (3)
cover drm/arm/malidp: use drm managed resources
Hi,
This patch series converts the driver to use drm managed resources to prevent potential use-after-free issues on driver unbind/rebind and to get rid of the usage of deprecated APIs.
Danilo Krummrich (8):
drm/arm/malidp: use drmm_* to allocate driver structures drm/arm/malidp: replace drm->dev_private with drm_to_malidp() drm/arm/malidp: crtc: use drmm_crtc_init_with_planes() drm/arm/malidp: plane: use drm managed resources drm/arm/malidp: use drm_dev_unplug() drm/arm/malidp: plane: protect device resources after removal drm/arm/malidp: crtc: protect device resources after removal drm/arm/malidp: drv: protect device resources after removal
drivers/gpu/drm/arm/malidp_crtc.c | 48 +++++++++++++++++++++--- drivers/gpu/drm/arm/malidp_drv.c | 58 ++++++++++++++--------------- drivers/gpu/drm/arm/malidp_drv.h | 2 + drivers/gpu/drm/arm/malidp_hw.c | 10 ++--- drivers/gpu/drm/arm/malidp_mw.c | 6 +-- drivers/gpu/drm/arm/malidp_planes.c | 45 +++++++++++----------- 6 files changed, 100 insertions(+), 69 deletions(-)
base-commit: 8869fa666a9e6782c3c896c1fa57d65adca23249
Signature · 1 line
2.37.2
PATCH 1/8 drm/arm/malidp: use drmm_* to allocate driver structures
Use drm managed resources to allocate driver structures and get rid of the deprecated drm_dev_alloc() call and replace it with devm_drm_dev_alloc().
This also serves as preparation to get rid of drm_device->dev_private and to fix use-after-free issues on driver unload.
--- drivers/gpu/drm/arm/malidp_drv.c | 20 +++++++------------- drivers/gpu/drm/arm/malidp_drv.h | 1 + 2 files changed, 8 insertions(+), 13 deletions(-)
drivers/gpu/drm/arm/malidp_drv.c +7 -13
@@ -23,6 +23,7 @@#include <drm/drm_fourcc.h> #include <drm/drm_gem_dma_helper.h> #include <drm/drm_gem_framebuffer_helper.h> +#include <drm/drm_managed.h> #include <drm/drm_modeset_helper.h> #include <drm/drm_module.h> #include <drm/drm_of.h>
@@ -716,11 +717,13 @@ static int malidp_bind(struct device *dev)int ret =0 , i;u32 version, out_depth =0 ; - malidp =devm_kzalloc (dev,sizeof (*malidp),GFP_KERNEL ); -if (!malidp) -return -ENOMEM ; + malidp =devm_drm_dev_alloc (dev, &malidp_driver,typeof (*malidp), base); +if (IS_ERR (malidp)) +return PTR_ERR (malidp); + + drm = &malidp->base; - hwdev =devm_kzalloc (dev,sizeof (*hwdev),GFP_KERNEL ); + hwdev =drmm_kzalloc (drm,sizeof (*hwdev),GFP_KERNEL );if (!hwdev)return -ENOMEM ;
@@ -753,12 +756,6 @@ static int malidp_bind(struct device *dev)if (ret && ret != -ENODEV )return ret; - drm =drm_dev_alloc (&malidp_driver, dev); -if (IS_ERR (drm)) { - ret =PTR_ERR (drm); - goto alloc_fail; - } - drm->dev_private = malidp;dev_set_drvdata (dev, drm);
@@ -887,8 +884,6 @@ static int malidp_bind(struct device *dev)malidp_runtime_pm_suspend (dev); drm->dev_private =NULL ;dev_set_drvdata (dev,NULL ); -drm_dev_put (drm); -alloc_fail:of_reserved_mem_device_release (dev);return ret;
@@ -917,7 +912,6 @@ static void malidp_unbind(struct device *dev)malidp_runtime_pm_suspend (dev); drm->dev_private =NULL ;dev_set_drvdata (dev,NULL ); -drm_dev_put (drm);of_reserved_mem_device_release (dev); }
drivers/gpu/drm/arm/malidp_drv.h +1 -0
@@ -29,6 +29,7 @@ struct malidp_error_stats { };struct malidp_drm { +struct drm_device base;struct malidp_hw_device *dev;struct drm_crtc crtc;struct drm_writeback_connector mw_connector;
Signature · 1 line
2.37.2
PATCH 2/8 drm/arm/malidp: replace drm->dev_private with drm_to_malidp()
In reply to Danilo KrummrichUsing drm_device->dev_private is deprecated. Since we've switched to devm_drm_dev_alloc(), struct drm_device is now embedded in struct malidp_drm, hence we can use container_of() to get the struct drm_device instance instead.
--- drivers/gpu/drm/arm/malidp_crtc.c | 2 +- drivers/gpu/drm/arm/malidp_drv.c | 29 +++++++++++++---------------- drivers/gpu/drm/arm/malidp_drv.h | 1 + drivers/gpu/drm/arm/malidp_hw.c | 10 +++++----- drivers/gpu/drm/arm/malidp_mw.c | 6 +++--- drivers/gpu/drm/arm/malidp_planes.c | 4 ++-- 6 files changed, 25 insertions(+), 27 deletions(-)
drivers/gpu/drm/arm/malidp_crtc.c +1 -1
@@ -526,7 +526,7 @@ static const struct drm_crtc_funcs malidp_crtc_funcs = {int malidp_crtc_init (struct drm_device *drm) { -struct malidp_drm *malidp = drm->dev_private; +struct malidp_drm *malidp =drm_to_malidp (drm);struct drm_plane *primary =NULL , *plane;int ret;
drivers/gpu/drm/arm/malidp_drv.c +13 -16
@@ -169,7 +169,7 @@ static void malidp_atomic_commit_se_config(struct drm_crtc *crtc,*/ static int malidp_set_and_wait_config_valid (struct drm_device *drm) { -struct malidp_drm *malidp = drm->dev_private; +struct malidp_drm *malidp =drm_to_malidp (drm);struct malidp_hw_device *hwdev = malidp->dev;int ret;
@@ -190,7 +190,7 @@ static int malidp_set_and_wait_config_valid(struct drm_device *drm)static void malidp_atomic_commit_hw_done (struct drm_atomic_state *state) {struct drm_device *drm = state->dev; -struct malidp_drm *malidp = drm->dev_private; +struct malidp_drm *malidp =drm_to_malidp (drm);int loop =5 ; malidp->event = malidp->crtc.state->event;
@@ -231,7 +231,7 @@ static void malidp_atomic_commit_hw_done(struct drm_atomic_state *state)static void malidp_atomic_commit_tail (struct drm_atomic_state *state) {struct drm_device *drm = state->dev; -struct malidp_drm *malidp = drm->dev_private; +struct malidp_drm *malidp =drm_to_malidp (drm);struct drm_crtc *crtc;struct drm_crtc_state *old_crtc_state;int i;
@@ -393,7 +393,7 @@ static const struct drm_mode_config_funcs malidp_mode_config_funcs = {static int malidp_init (struct drm_device *drm) {int ret; -struct malidp_drm *malidp = drm->dev_private; +struct malidp_drm *malidp =drm_to_malidp (drm);struct malidp_hw_device *hwdev = malidp->dev;drm_mode_config_init (drm);
@@ -429,7 +429,7 @@ static int malidp_irq_init(struct platform_device *pdev) {int irq_de, irq_se, ret =0 ;struct drm_device *drm =dev_get_drvdata (&pdev->dev); -struct malidp_drm *malidp = drm->dev_private; +struct malidp_drm *malidp =drm_to_malidp (drm);struct malidp_hw_device *hwdev = malidp->dev;/* fetch the interrupts from DT */
@@ -463,7 +463,7 @@ static int malidp_dumb_create(struct drm_file *file_priv,struct drm_device *drm, struct drm_mode_create_dumb *args) { - struct malidp_drm *malidp = drm->dev_private; + struct malidp_drm *malidp = drm_to_malidp(drm);/* allocate for the worst case scenario, i.e. rotated buffers */ u8 alignment =malidp_hw_get_pitch_align (malidp->dev,1 );
@@ -509,7 +509,7 @@ static void malidp_error_stats_dump(const char *prefix,static int malidp_show_stats (struct seq_file *m,void *arg) {struct drm_device *drm = m->private; -struct malidp_drm *malidp = drm->dev_private; +struct malidp_drm *malidp =drm_to_malidp (drm);unsigned long irqflags;struct malidp_error_stats de_errors, se_errors;
@@ -532,7 +532,7 @@ static ssize_t malidp_debugfs_write(struct file *file, const char __user *ubuf, {struct seq_file *m = file->private_data;struct drm_device *drm = m->private; -struct malidp_drm *malidp = drm->dev_private; +struct malidp_drm *malidp =drm_to_malidp (drm);unsigned long irqflags;spin_lock_irqsave (&malidp->errors_lock, irqflags);
@@ -553,7 +553,7 @@ static const struct file_operations malidp_debugfs_fops = {static void malidp_debugfs_init (struct drm_minor *minor) { -struct malidp_drm *malidp = minor->dev->dev_private; +struct malidp_drm *malidp =drm_to_malidp (minor->dev);malidp_error_stats_init (&malidp->de_errors);malidp_error_stats_init (&malidp->se_errors);
@@ -653,7 +653,7 @@ static ssize_t core_id_show(struct device *dev, struct device_attribute *attr, char *buf) {struct drm_device *drm =dev_get_drvdata (dev); -struct malidp_drm *malidp = drm->dev_private; +struct malidp_drm *malidp =drm_to_malidp (drm);return snprintf (buf,PAGE_SIZE ,"%08x\n" , malidp->core_id); }
@@ -671,7 +671,7 @@ ATTRIBUTE_GROUPS(mali_dp);static int malidp_runtime_pm_suspend (struct device *dev) {struct drm_device *drm =dev_get_drvdata (dev); -struct malidp_drm *malidp = drm->dev_private; +struct malidp_drm *malidp =drm_to_malidp (drm);struct malidp_hw_device *hwdev = malidp->dev;/* we can only suspend if the hardware is in config mode */
@@ -690,7 +690,7 @@ static int malidp_runtime_pm_suspend(struct device *dev)static int malidp_runtime_pm_resume (struct device *dev) {struct drm_device *drm =dev_get_drvdata (dev); -struct malidp_drm *malidp = drm->dev_private; +struct malidp_drm *malidp =drm_to_malidp (drm);struct malidp_hw_device *hwdev = malidp->dev;clk_prepare_enable (hwdev->pclk);
@@ -756,7 +756,6 @@ static int malidp_bind(struct device *dev)if (ret && ret != -ENODEV )return ret; - drm->dev_private = malidp;dev_set_drvdata (dev, drm);/* Enable power management */
@@ -882,7 +881,6 @@ static int malidp_bind(struct device *dev)pm_runtime_disable (dev); elsemalidp_runtime_pm_suspend (dev ); - drm->dev_private =NULL ;dev_set_drvdata (dev,NULL );of_reserved_mem_device_release (dev);
@@ -892,7 +890,7 @@ static int malidp_bind(struct device *dev)static void malidp_unbind (struct device *dev) {struct drm_device *drm =dev_get_drvdata (dev); -struct malidp_drm *malidp = drm->dev_private; +struct malidp_drm *malidp =drm_to_malidp (drm);struct malidp_hw_device *hwdev = malidp->dev;drm_dev_unregister (drm);
@@ -910,7 +908,6 @@ static void malidp_unbind(struct device *dev)pm_runtime_disable (dev); elsemalidp_runtime_pm_suspend (dev ); - drm->dev_private =NULL ;dev_set_drvdata (dev,NULL );of_reserved_mem_device_release (dev); }
drivers/gpu/drm/arm/malidp_drv.h +1 -0
@@ -45,6 +45,7 @@ struct malidp_drm {#endif }; +#define drm_to_malidp (x) container_of(x, struct malidp_drm, base)#define crtc_to_malidp_device (x) container_of(x, struct malidp_drm, crtc)struct malidp_plane {
drivers/gpu/drm/arm/malidp_hw.c +5 -5
@@ -1168,7 +1168,7 @@ static void malidp_hw_clear_irq(struct malidp_hw_device *hwdev, u8 block, u32 irstatic irqreturn_t malidp_de_irq (int irq,void *arg) {struct drm_device *drm = arg; -struct malidp_drm *malidp = drm->dev_private; +struct malidp_drm *malidp =drm_to_malidp (drm);struct malidp_hw_device *hwdev;struct malidp_hw *hw;const struct malidp_irq_map *de;
@@ -1226,7 +1226,7 @@ static irqreturn_t malidp_de_irq(int irq, void *arg)static irqreturn_t malidp_de_irq_thread_handler (int irq,void *arg) {struct drm_device *drm = arg; -struct malidp_drm *malidp = drm->dev_private; +struct malidp_drm *malidp =drm_to_malidp (drm);wake_up (&malidp->wq);
@@ -1252,7 +1252,7 @@ void malidp_de_irq_hw_init(struct malidp_hw_device *hwdev)int malidp_de_irq_init (struct drm_device *drm,int irq) { -struct malidp_drm *malidp = drm->dev_private; +struct malidp_drm *malidp =drm_to_malidp (drm);struct malidp_hw_device *hwdev = malidp->dev;int ret;
@@ -1286,7 +1286,7 @@ void malidp_de_irq_fini(struct malidp_hw_device *hwdev)static irqreturn_t malidp_se_irq (int irq,void *arg) {struct drm_device *drm = arg; -struct malidp_drm *malidp = drm->dev_private; +struct malidp_drm *malidp =drm_to_malidp (drm);struct malidp_hw_device *hwdev = malidp->dev;struct malidp_hw *hw = hwdev->hw;const struct malidp_irq_map *se = &hw->map.se_irq_map;
@@ -1363,7 +1363,7 @@ static irqreturn_t malidp_se_irq_thread_handler(int irq, void *arg)int malidp_se_irq_init (struct drm_device *drm,int irq) { -struct malidp_drm *malidp = drm->dev_private; +struct malidp_drm *malidp =drm_to_malidp (drm);struct malidp_hw_device *hwdev = malidp->dev;int ret;
drivers/gpu/drm/arm/malidp_mw.c +3 -3
@@ -129,7 +129,7 @@ malidp_mw_encoder_atomic_check(struct drm_encoder *encoder, struct drm_connector_state *conn_state) {struct malidp_mw_connector_state *mw_state =to_mw_state (conn_state); -struct malidp_drm *malidp = encoder->dev->dev_private; +struct malidp_drm *malidp =drm_to_malidp (encoder->dev);struct drm_framebuffer *fb;int i, n_planes;
@@ -207,7 +207,7 @@ static u32 *get_writeback_formats(struct malidp_drm *malidp, int *n_formats)int malidp_mw_connector_init (struct drm_device *drm) { -struct malidp_drm *malidp = drm->dev_private; +struct malidp_drm *malidp =drm_to_malidp (drm);u32 *formats;int ret, n_formats;
@@ -236,7 +236,7 @@ int malidp_mw_connector_init(struct drm_device *drm)void malidp_mw_atomic_commit (struct drm_device *drm,struct drm_atomic_state *old_state) { -struct malidp_drm *malidp = drm->dev_private; +struct malidp_drm *malidp =drm_to_malidp (drm);struct drm_writeback_connector *mw_conn = &malidp->mw_connector;struct drm_connector_state *conn_state = mw_conn->base.state;struct malidp_hw_device *hwdev = malidp->dev;
drivers/gpu/drm/arm/malidp_planes.c +2 -2
@@ -151,7 +151,7 @@ bool malidp_format_mod_supported(struct drm_device *drm, {const struct drm_format_info *info;const u64 *modifiers; -struct malidp_drm *malidp = drm->dev_private; +struct malidp_drm *malidp =drm_to_malidp (drm);const struct malidp_hw_regmap *map = &malidp->dev->hw->map;if (WARN_ON (modifier ==DRM_FORMAT_MOD_INVALID ))
@@ -931,7 +931,7 @@ static const uint64_t linear_only_modifiers[] = {int malidp_de_planes_init (struct drm_device *drm) { -struct malidp_drm *malidp = drm->dev_private; +struct malidp_drm *malidp =drm_to_malidp (drm);const struct malidp_hw_regmap *map = &malidp->dev->hw->map;struct malidp_plane *plane =NULL ;enum drm_plane_type plane_type;
Signature · 1 line
2.37.2
PATCH 3/8 drm/arm/malidp: crtc: use drmm_crtc_init_with_planes()
In reply to Danilo KrummrichUse drmm_crtc_init_with_planes() instead of drm_crtc_init_with_planes() to get rid of the explicit destroy hook in struct drm_plane_funcs.
--- drivers/gpu/drm/arm/malidp_crtc.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/gpu/drm/arm/malidp_crtc.c +2 -3
@@ -514,7 +514,6 @@ static void malidp_crtc_disable_vblank(struct drm_crtc *crtc) }static const struct drm_crtc_funcs malidp_crtc_funcs = { - .destroy = drm_crtc_cleanup, .set_config = drm_atomic_helper_set_config, .page_flip = drm_atomic_helper_page_flip, .reset = malidp_crtc_reset,
@@ -548,8 +547,8 @@ int malidp_crtc_init(struct drm_device *drm)return -EINVAL ; } - ret =drm_crtc_init_with_planes (drm, &malidp->crtc, primary,NULL , - &malidp_crtc_funcs,NULL ); + ret =drmm_crtc_init_with_planes (drm, &malidp->crtc, primary,NULL , + &malidp_crtc_funcs,NULL );if (ret)return ret;
Signature · 1 line
2.37.2
PATCH 4/8 drm/arm/malidp: plane: use drm managed resources
In reply to Danilo KrummrichUse drm managed resource allocation (drmm_universal_plane_alloc()) in order to get rid of the explicit destroy hook in struct drm_plane_funcs.
--- drivers/gpu/drm/arm/malidp_planes.c | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-)
drivers/gpu/drm/arm/malidp_planes.c +7 -21
@@ -68,14 +68,6 @@/* readahead for partial-frame prefetch */ #define MALIDP_MMU_PREFETCH_READAHEAD 8 -static void malidp_de_plane_destroy (struct drm_plane *plane) -{ -struct malidp_plane *mp =to_malidp_plane (plane); - -drm_plane_cleanup (plane); -kfree (mp); -} -/* * Replicate what the default ->reset hook does: free the state pointer and * allocate a new empty object. We just need enough space to store
@@ -260,7 +252,6 @@ static bool malidp_format_mod_supported_per_plane(struct drm_plane *plane,static const struct drm_plane_funcs malidp_de_plane_funcs = { .update_plane = drm_atomic_helper_update_plane, .disable_plane = drm_atomic_helper_disable_plane, - .destroy = malidp_de_plane_destroy, .reset = malidp_plane_reset, .atomic_duplicate_state = malidp_duplicate_plane_state, .atomic_destroy_state = malidp_destroy_plane_state,
@@ -972,12 +963,6 @@ int malidp_de_planes_init(struct drm_device *drm)for (i =0 ; i < map->n_layers; i++) {u8 id = map->layers[i].id; - plane =kzalloc (sizeof (*plane),GFP_KERNEL ); -if (!plane) { - ret = -ENOMEM ; - goto cleanup; - } -/* build the list of DRM supported formats based on the map */ for (n =0 , j =0 ; j < map->n_pixel_formats; j++) {if ((map->pixel_formats[j].layer & id) == id)
@@ -990,13 +975,14 @@ int malidp_de_planes_init(struct drm_device *drm)/* * All the layers except smart layer supports AFBC modifiers. */ - ret =drm_universal_plane_init (drm, &plane->base, crtcs, - &malidp_de_plane_funcs, formats, n, - (id ==DE_SMART ) ? linear_only_modifiers : modifiers, - plane_type,NULL ); - -if (ret <0 ) + plane = drmm_universal_plane_alloc(drm, struct malidp_plane, base, + crtcs, &malidp_de_plane_funcs, formats, n, + (id ==DE_SMART ) ? linear_only_modifiers : + modifiers, plane_type,NULL ); +if (IS_ERR (plane)) { + ret =PTR_ERR (plane); goto cleanup; + }drm_plane_helper_add (&plane->base, &malidp_de_plane_helper_funcs);
Signature · 1 line
2.37.2
PATCH 5/8 drm/arm/malidp: use drm_dev_unplug()
In reply to Danilo KrummrichWhen the driver is unbound, there might still be users in userspace having an open fd and are calling into the driver.
While this is fine for drm managed resources, it is not for resources bound to the device/driver lifecycle, e.g. clocks or MMIO mappings.
To prevent use-after-free issues we need to protect those resources with drm_dev_enter() and drm_dev_exit(). This does only work if we indicate that the drm device was unplugged, hence use drm_dev_unplug() instead of drm_dev_unregister().
Protecting the particular resources with drm_dev_enter()/drm_dev_exit() is handled by subsequent patches.
--- drivers/gpu/drm/arm/malidp_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/arm/malidp_drv.c +1 -1
@@ -893,7 +893,7 @@ static void malidp_unbind(struct device *dev)struct malidp_drm *malidp =drm_to_malidp (drm);struct malidp_hw_device *hwdev = malidp->dev; -drm_dev_unregister (drm); +drm_dev_unplug (drm);drm_kms_helper_poll_fini (drm);pm_runtime_get_sync (dev);drm_atomic_helper_shutdown (drm);
Signature · 1 line
2.37.2
PATCH 6/8 drm/arm/malidp: plane: protect device resources after removal
In reply to Danilo Krummrich(Hardware) resources which are bound to the driver and device lifecycle must not be accessed after the device and driver are unbound.
However, the DRM device isn't freed as long as the last user didn't close it, hence userspace can still call into the driver.
Therefore protect the critical sections which are accessing those resources with drm_dev_enter() and drm_dev_exit().
--- drivers/gpu/drm/arm/malidp_planes.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
drivers/gpu/drm/arm/malidp_planes.c +12 -1
@@ -790,9 +790,12 @@ static void malidp_de_plane_update(struct drm_plane *plane,u16 pixel_alpha = new_state->pixel_blend_mode;u8 plane_alpha = new_state->alpha >>8 ;u32 src_w, src_h, dest_w, dest_h, val; -int i; +int i, idx;struct drm_framebuffer *fb = plane->state->fb; +if (!drm_dev_enter (plane->dev, &idx)) +return ; + mp =to_malidp_plane (plane);/*
@@ -897,16 +900,24 @@ static void malidp_de_plane_update(struct drm_plane *plane,malidp_hw_write (mp->hwdev, val, mp->layer->base +MALIDP_LAYER_CONTROL ); + +drm_dev_exit (idx); }static void malidp_de_plane_disable (struct drm_plane *plane,struct drm_atomic_state *state) {struct malidp_plane *mp =to_malidp_plane (plane); +int idx; + +if (!drm_dev_enter (plane->dev, &idx)) +return ;malidp_hw_clearbits (mp->hwdev,LAYER_ENABLE |LAYER_FLOWCFG (LAYER_FLOWCFG_MASK ), mp->layer->base +MALIDP_LAYER_CONTROL ); + +drm_dev_exit (idx); }static const struct drm_plane_helper_funcs malidp_de_plane_helper_funcs = {
Signature · 1 line
2.37.2
PATCH 7/8 drm/arm/malidp: crtc: protect device resources after removal
In reply to Danilo Krummrich(Hardware) resources which are bound to the driver and device lifecycle must not be accessed after the device and driver are unbound.
However, the DRM device isn't freed as long as the last user didn't close it, hence userspace can still call into the driver.
Therefore protect the critical sections which are accessing those resources with drm_dev_enter() and drm_dev_exit().
--- drivers/gpu/drm/arm/malidp_crtc.c | 41 +++++++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-)
drivers/gpu/drm/arm/malidp_crtc.c +39 -2
@@ -14,6 +14,7 @@#include <drm/drm_atomic.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_crtc.h> +#include <drm/drm_drv.h> #include <drm/drm_framebuffer.h> #include <drm/drm_print.h> #include <drm/drm_probe_helper.h>
@@ -27,6 +28,7 @@ static enum drm_mode_status malidp_crtc_mode_valid(struct drm_crtc *crtc, {struct malidp_drm *malidp =crtc_to_malidp_device (crtc);struct malidp_hw_device *hwdev = malidp->dev; +int idx;/* * check that the hardware can drive the required clock rate,
@@ -34,6 +36,9 @@ static enum drm_mode_status malidp_crtc_mode_valid(struct drm_crtc *crtc,*/ long rate, req_rate = mode->crtc_clock *1000 ; +if (!drm_dev_enter (&malidp->base, &idx)) +return MODE_NOCLOCK ; +if (req_rate) { rate =clk_round_rate (hwdev->pxlclk, req_rate);if (rate != req_rate) {
@@ -43,6 +48,8 @@ static enum drm_mode_status malidp_crtc_mode_valid(struct drm_crtc *crtc, } } +drm_dev_exit (idx); +return MODE_OK ; }
@@ -53,6 +60,10 @@ static void malidp_crtc_atomic_enable(struct drm_crtc *crtc,struct malidp_hw_device *hwdev = malidp->dev;struct videomode vm;int err =pm_runtime_get_sync (crtc->dev->dev); +int idx; + +if (!drm_dev_enter (&malidp->base, &idx)) +return ;if (err <0 ) {DRM_DEBUG_DRIVER ("Failed to enable runtime power management: %d\n" , err);
@@ -68,6 +79,8 @@ static void malidp_crtc_atomic_enable(struct drm_crtc *crtc, hwdev->hw->modeset (hwdev, &vm); hwdev->hw->leave_config_mode (hwdev);drm_crtc_vblank_on (crtc); + +drm_dev_exit (idx); } static void malidp_crtc_atomic_disable(struct drm_crtc *crtc,
@@ -77,7 +90,10 @@ static void malidp_crtc_atomic_disable(struct drm_crtc *crtc, crtc);struct malidp_drm *malidp =crtc_to_malidp_device (crtc);struct malidp_hw_device *hwdev = malidp->dev; -int err; +int err, idx; + +if (!drm_dev_enter (&malidp->base, &idx)) +return ;/* always disable planes on the CRTC that is being turned off */ drm_atomic_helper_disable_planes_on_crtc (old_state, false);
@@ -91,6 +107,8 @@ static void malidp_crtc_atomic_disable(struct drm_crtc *crtc,if (err <0 ) {DRM_DEBUG_DRIVER ("Failed to disable runtime power management: %d\n" , err); } + +drm_dev_exit (idx); } static const struct gamma_curve_segment {
@@ -260,7 +278,10 @@ static int malidp_crtc_atomic_check_scaling(struct drm_crtc *crtc,u32 h_upscale_factor =0 ;/* U16.16 */ u32 v_upscale_factor =0 ;/* U16.16 */ u8 scaling = cs->scaled_planes_mask; -int ret; +int idx, ret; + +if (!drm_dev_enter (&malidp->base, &idx)) +return -ENODEV ;if (!scaling) { s->scale_enable = false;
@@ -334,6 +355,9 @@ static int malidp_crtc_atomic_check_scaling(struct drm_crtc *crtc, ret = hwdev->hw->se_calc_mclk (hwdev, s, &vm);if (ret <0 )return -EINVAL ; + +drm_dev_exit (idx); +return 0 ; }
@@ -498,9 +522,16 @@ static int malidp_crtc_enable_vblank(struct drm_crtc *crtc) {struct malidp_drm *malidp =crtc_to_malidp_device (crtc);struct malidp_hw_device *hwdev = malidp->dev; +int idx; + +if (!drm_dev_enter (&malidp->base, &idx)) +return -ENODEV ;malidp_hw_enable_irq (hwdev,MALIDP_DE_BLOCK , hwdev->hw->map.de_irq_map.vsync_irq); + +drm_dev_exit (idx); +return 0 ; }
@@ -508,9 +539,15 @@ static void malidp_crtc_disable_vblank(struct drm_crtc *crtc) {struct malidp_drm *malidp =crtc_to_malidp_device (crtc);struct malidp_hw_device *hwdev = malidp->dev; +int idx; + +if (!drm_dev_enter (&malidp->base, &idx)) +return ;malidp_hw_disable_irq (hwdev,MALIDP_DE_BLOCK , hwdev->hw->map.de_irq_map.vsync_irq); + +drm_dev_exit (idx); }static const struct drm_crtc_funcs malidp_crtc_funcs = {
Signature · 1 line
2.37.2
PATCH 8/8 drm/arm/malidp: drv: protect device resources after removal
In reply to Danilo Krummrich(Hardware) resources which are bound to the driver and device lifecycle must not be accessed after the device and driver are unbound.
However, the DRM device isn't freed as long as the last user didn't close it, hence userspace can still call into the driver.
Therefore protect the critical sections which are accessing those resources with drm_dev_enter() and drm_dev_exit().
--- drivers/gpu/drm/arm/malidp_drv.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/gpu/drm/arm/malidp_drv.c +6 -1
@@ -234,9 +234,12 @@ static void malidp_atomic_commit_tail(struct drm_atomic_state *state)struct malidp_drm *malidp =drm_to_malidp (drm);struct drm_crtc *crtc;struct drm_crtc_state *old_crtc_state; -int i; +int i, idx;bool fence_cookie =dma_fence_begin_signalling (); +if (!drm_dev_enter (drm, &idx)) +return ; +pm_runtime_get_sync (drm->dev);/*
@@ -267,6 +270,8 @@ static void malidp_atomic_commit_tail(struct drm_atomic_state *state)pm_runtime_put (drm->dev);drm_atomic_helper_cleanup_planes (drm, state); + +drm_dev_exit (idx); }static const struct drm_mode_config_helper_funcs malidp_mode_config_helpers = {
Signature · 1 line
2.37.2