diff options
| author | Maxime Ripard <mripard@kernel.org> | 2026-02-23 12:09:45 +0300 |
|---|---|---|
| committer | Maxime Ripard <mripard@kernel.org> | 2026-02-23 12:09:45 +0300 |
| commit | c17ee635fd3a482b2ad2bf5e269755c2eae5f25e (patch) | |
| tree | e3f147462d8a9fd0cf2312c8cd3c5a94da15c3e4 /drivers/gpu/drm/tiny | |
| parent | 803ec1faf7c1823e6e3b1f2aaa81be18528c9436 (diff) | |
| parent | 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f (diff) | |
| download | linux-c17ee635fd3a482b2ad2bf5e269755c2eae5f25e.tar.xz | |
Merge drm/drm-fixes into drm-misc-fixes
7.0-rc1 was just released, let's merge it to kick the new release cycle.
Signed-off-by: Maxime Ripard <mripard@kernel.org>
Diffstat (limited to 'drivers/gpu/drm/tiny')
| -rw-r--r-- | drivers/gpu/drm/tiny/appletbdrm.c | 10 | ||||
| -rw-r--r-- | drivers/gpu/drm/tiny/arcpgu.c | 5 |
2 files changed, 7 insertions, 8 deletions
diff --git a/drivers/gpu/drm/tiny/appletbdrm.c b/drivers/gpu/drm/tiny/appletbdrm.c index 751b05753c94..3bae91d7eefe 100644 --- a/drivers/gpu/drm/tiny/appletbdrm.c +++ b/drivers/gpu/drm/tiny/appletbdrm.c @@ -225,7 +225,7 @@ static int appletbdrm_send_msg(struct appletbdrm_device *adev, __le32 msg) struct appletbdrm_msg_simple_request *request; int ret; - request = kzalloc(sizeof(*request), GFP_KERNEL); + request = kzalloc_obj(*request); if (!request) return -ENOMEM; @@ -260,7 +260,7 @@ static int appletbdrm_get_information(struct appletbdrm_device *adev) __le32 pixel_format; int ret; - info = kzalloc(sizeof(*info), GFP_KERNEL); + info = kzalloc_obj(*info); if (!info) return -ENOMEM; @@ -358,7 +358,7 @@ static int appletbdrm_primary_plane_helper_atomic_check(struct drm_plane *plane, if (!appletbdrm_state->request) return -ENOMEM; - appletbdrm_state->response = kzalloc(sizeof(*appletbdrm_state->response), GFP_KERNEL); + appletbdrm_state->response = kzalloc_obj(*appletbdrm_state->response); if (!appletbdrm_state->response) return -ENOMEM; @@ -505,7 +505,7 @@ static void appletbdrm_primary_plane_reset(struct drm_plane *plane) WARN_ON(plane->state); - appletbdrm_state = kzalloc(sizeof(*appletbdrm_state), GFP_KERNEL); + appletbdrm_state = kzalloc_obj(*appletbdrm_state); if (!appletbdrm_state) return; @@ -520,7 +520,7 @@ static struct drm_plane_state *appletbdrm_primary_plane_duplicate_state(struct d if (WARN_ON(!plane->state)) return NULL; - appletbdrm_state = kzalloc(sizeof(*appletbdrm_state), GFP_KERNEL); + appletbdrm_state = kzalloc_obj(*appletbdrm_state); if (!appletbdrm_state) return NULL; diff --git a/drivers/gpu/drm/tiny/arcpgu.c b/drivers/gpu/drm/tiny/arcpgu.c index 7cf0f0ea1bfe..505888497482 100644 --- a/drivers/gpu/drm/tiny/arcpgu.c +++ b/drivers/gpu/drm/tiny/arcpgu.c @@ -308,10 +308,9 @@ static int arcpgu_load(struct arcpgu_drm_private *arcpgu) return ret; if (encoder_node) { - struct drm_bridge *bridge; - /* Locate drm bridge from the hdmi encoder DT node */ - bridge = of_drm_find_bridge(encoder_node); + struct drm_bridge *bridge __free(drm_bridge_put) = + of_drm_find_and_get_bridge(encoder_node); if (!bridge) return -EPROBE_DEFER; |