github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-28 09:04:39 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

drm/colorop: Fix blob property reference tracking in state lifecycle

Browse Source 
The colorop state blob property handling had memory leaks during state
duplication, destruction, and reset operations. The implementation
failed to follow the established pattern from drm_crtc's handling of
DEGAMMA/GAMMA blob properties.

Issues fixed:
- drm_colorop_atomic_destroy_state() was freeing state memory without
  releasing the blob reference, causing a leak
- drm_colorop_reset() was directly freeing old state with kfree()
  instead of properly destroying it, leaking blob references
- drm_colorop_cleanup() had duplicate blob cleanup code

Changes:
- Add __drm_atomic_helper_colorop_destroy_state() helper to properly
  release blob references before freeing state memory
- Update drm_colorop_atomic_destroy_state() to call the helper
- Fix drm_colorop_reset() to use drm_colorop_atomic_destroy_state()
  for proper cleanup of old state
- Simplify drm_colorop_cleanup() to use the common destruction path

This matches the well-tested pattern used by drm_crtc since 2016 and
ensures proper reference counting throughout the state lifecycle.

Co-developed by Claude Sonnet 4.5.

Fixes: cfc27680ee ("drm/colorop: Introduce new drm_colorop mode object")
Cc: Simon Ser <contact@emersion.fr>
Cc: Alex Hung <alex.hung@amd.com>
Cc: Harry Wentland <harry.wentland@amd.com>
Cc: Daniel Stone <daniels@collabora.com>
Cc: Melissa Wen <mwen@igalia.com>
Cc: Sebastian Wick <sebastian.wick@redhat.com>
Cc: Uma Shankar <uma.shankar@intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Jani Nikula <jani.nikula@intel.com>
Cc: Louis Chauvet <louis.chauvet@bootlin.com>
Cc: Chaitanya Kumar Borah <chaitanya.kumar.borah@intel.com>
Cc: <stable@vger.kernel.org> #v6.19+
Signed-off-by: Harry Wentland <harry.wentland@amd.com>
Reviewed-by: Alex Hung <alex.hung@amd.com>
Link: https://patch.msgid.link/20260312204145.829714-1-harry.wentland@amd.com
This commit is contained in:
Harry Wentland 2026-03-12 16:41:45 -04:00
parent bc4cb68a02
commit 235b333e28
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/gpu/drm/drm_colorop.c
View File

@ -171,12 +171,8 @@ void drm_colorop_cleanup(struct drm_colorop *colorop)
list_del(&colorop->head);
config->num_colorop--;
if (colorop->state && colorop->state->data) {
drm_property_blob_put(colorop->state->data);
colorop->state->data = NULL;
}
kfree(colorop->state);
if (colorop->state)
drm_colorop_atomic_destroy_state(colorop, colorop->state);
}
EXPORT_SYMBOL(drm_colorop_cleanup);
@ -485,9 +481,23 @@ drm_atomic_helper_colorop_duplicate_state(struct drm_colorop *colorop)
return state;
}
/**
* __drm_atomic_helper_colorop_destroy_state - release colorop state
* @state: colorop state object to release
*
* Releases all resources stored in the colorop state without actually freeing
* the memory of the colorop state. This is useful for drivers that subclass the
* colorop state.
*/
static void __drm_atomic_helper_colorop_destroy_state(struct drm_colorop_state *state)
{
drm_property_blob_put(state->data);
}
void drm_colorop_atomic_destroy_state(struct drm_colorop *colorop,
struct drm_colorop_state *state)
{
__drm_atomic_helper_colorop_destroy_state(state);
kfree(state);
}
@ -538,7 +548,9 @@ static void __drm_colorop_reset(struct drm_colorop *colorop,
void drm_colorop_reset(struct drm_colorop *colorop)
{
kfree(colorop->state);
if (colorop->state)
drm_colorop_atomic_destroy_state(colorop, colorop->state);
colorop->state = kzalloc_obj(*colorop->state);
if (colorop->state)