mirror of
https://github.com/torvalds/linux.git
synced 2026-07-27 17:47:41 +02:00
drm/i915: Fix color blob reference handling in intel_plane_state
Take proper references for hw color blobs (degamma_lut, gamma_lut, ctm, lut_3d) in intel_plane_duplicate_state() and drop them in intel_plane_destroy_state(). v2: - handle blobs in hw state clear Cc: <stable@vger.kernel.org> #v6.19+ Fixes:3b7476e786("drm/i915/color: Add framework to program PRE/POST CSC LUT") Fixes:a78f1b6baf("drm/i915/color: Add framework to program CSC") Fixes:65db7a1f9c("drm/i915/color: Add 3D LUT to color pipeline") Reviewed-by: Pranay Samala <pranay.samala@intel.com> #v1 Reviewed-by: Uma Shankar <uma.shankar@intel.com> Signed-off-by: Chaitanya Kumar Borah <chaitanya.kumar.borah@intel.com> Signed-off-by: Uma Shankar <uma.shankar@intel.com> Link: https://patch.msgid.link/20260601082953.128539-4-chaitanya.kumar.borah@intel.com (cherry picked from commit c6eea1925154b6697fe22b217faab9bb30635e6b) Signed-off-by: Tvrtko Ursulin <tursulin@ursulin.net>
This commit is contained in:
parent
e43ffb69e0
commit
26eb7c0a7a
|
|
@ -144,6 +144,15 @@ intel_plane_duplicate_state(struct drm_plane *plane)
|
|||
if (intel_state->hw.fb)
|
||||
drm_framebuffer_get(intel_state->hw.fb);
|
||||
|
||||
if (intel_state->hw.degamma_lut)
|
||||
drm_property_blob_get(intel_state->hw.degamma_lut);
|
||||
if (intel_state->hw.gamma_lut)
|
||||
drm_property_blob_get(intel_state->hw.gamma_lut);
|
||||
if (intel_state->hw.ctm)
|
||||
drm_property_blob_get(intel_state->hw.ctm);
|
||||
if (intel_state->hw.lut_3d)
|
||||
drm_property_blob_get(intel_state->hw.lut_3d);
|
||||
|
||||
return &intel_state->uapi;
|
||||
}
|
||||
|
||||
|
|
@ -167,6 +176,16 @@ intel_plane_destroy_state(struct drm_plane *plane,
|
|||
__drm_atomic_helper_plane_destroy_state(&plane_state->uapi);
|
||||
if (plane_state->hw.fb)
|
||||
drm_framebuffer_put(plane_state->hw.fb);
|
||||
|
||||
if (plane_state->hw.degamma_lut)
|
||||
drm_property_blob_put(plane_state->hw.degamma_lut);
|
||||
if (plane_state->hw.gamma_lut)
|
||||
drm_property_blob_put(plane_state->hw.gamma_lut);
|
||||
if (plane_state->hw.ctm)
|
||||
drm_property_blob_put(plane_state->hw.ctm);
|
||||
if (plane_state->hw.lut_3d)
|
||||
drm_property_blob_put(plane_state->hw.lut_3d);
|
||||
|
||||
kfree(plane_state);
|
||||
}
|
||||
|
||||
|
|
@ -317,6 +336,14 @@ static void intel_plane_clear_hw_state(struct intel_plane_state *plane_state)
|
|||
{
|
||||
if (plane_state->hw.fb)
|
||||
drm_framebuffer_put(plane_state->hw.fb);
|
||||
if (plane_state->hw.degamma_lut)
|
||||
drm_property_blob_put(plane_state->hw.degamma_lut);
|
||||
if (plane_state->hw.gamma_lut)
|
||||
drm_property_blob_put(plane_state->hw.gamma_lut);
|
||||
if (plane_state->hw.ctm)
|
||||
drm_property_blob_put(plane_state->hw.ctm);
|
||||
if (plane_state->hw.lut_3d)
|
||||
drm_property_blob_put(plane_state->hw.lut_3d);
|
||||
|
||||
memset(&plane_state->hw, 0, sizeof(plane_state->hw));
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user