From nobody Tue Dec 2 01:51:37 2025 Received: from esa.microchip.iphmx.com (esa.microchip.iphmx.com [68.232.154.123]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 535882D8DD4 for ; Fri, 21 Nov 2025 15:07:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=68.232.154.123 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763737636; cv=none; b=tH0YWNdqBgeeJ7I6gfr28udXcHFUwgF5O1YA34lJ+ivhB17Qb3yowH1FgTR6fVYFhQTTq9OTgfy2vdRtzK+j7KxasSo5ifPhlIMawpqDZ8pGtRe0sN1i6eeddemvSV5thggxbWVucCPMnUnYjDAgXuNn4HS4pZWianzQDxkRz/I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763737636; c=relaxed/simple; bh=Ha1BPyyylS6A6UQC8yFXbfo2wrOczjUDbfibr5RJHhA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-ID:References: In-Reply-To:To:CC; b=lJRlUDWauBg51CZVHUgZAQqX/q8P+WUxEtAqpvSsSHLxugkhWcGXykNUOIJPb8CaiXkFNLVR/DXdb2tm6IYCbmo8L2GPxlM35LtH4tCzu03AbRhp2Nzf3bmV9qf71jl3jbzX61v1sSQ06ANHmVY9yKiOJDZ89b8vBTg2yE74jbc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=microchip.com; spf=pass smtp.mailfrom=microchip.com; dkim=pass (2048-bit key) header.d=microchip.com header.i=@microchip.com header.b=Pw+DYomm; arc=none smtp.client-ip=68.232.154.123 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=microchip.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=microchip.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=microchip.com header.i=@microchip.com header.b="Pw+DYomm" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1763737634; x=1795273634; h=from:date:subject:mime-version:content-transfer-encoding: message-id:references:in-reply-to:to:cc; bh=Ha1BPyyylS6A6UQC8yFXbfo2wrOczjUDbfibr5RJHhA=; b=Pw+DYommwHjQbU/KW3rgZFztXh0vYaQ6pH8f09zP4Ocg+0EA8DMqP3PE R4y/vi+wvkuEQPg8cibjolsZduAvkN4tLmMFHrfuQqnXS4KUs1dgrdbmy +b+d6COAYnJau0GkMxQWxMEIJQ8tz/xm6SzKuU2KHixf7p5IxPVHFW7sn hv7RoZp2ysZqBNApOIYPiza6ZhpKJGhUPkvLg9FogIO1UGL2pjb8Dx9EZ HdHgnRXWd8spZoRFPk2Rnu9NzCIk0BtisJ/cs8zBucpt+7J+b2zSymViI cbhkYxJ6PmAL7AK6ZdnL7aPfZ2zj0ek6swLoCcaLA807r5MiTce4NGDBj Q==; X-CSE-ConnectionGUID: f+FH760WRD6H6erujY1rjg== X-CSE-MsgGUID: Q/Y3RxxUQlaQBonNfiT6Ww== X-IronPort-AV: E=Sophos;i="6.20,216,1758610800"; d="scan'208";a="216838770" X-Amp-Result: SKIPPED(no attachment in message) Received: from unknown (HELO email.microchip.com) ([170.129.1.10]) by esa6.microchip.iphmx.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Nov 2025 08:07:11 -0700 Received: from chn-vm-ex04.mchp-main.com (10.10.87.151) by chn-vm-ex3.mchp-main.com (10.10.87.32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.2.2562.29; Fri, 21 Nov 2025 08:06:51 -0700 Received: from [127.0.0.1] (10.10.85.11) by chn-vm-ex04.mchp-main.com (10.10.85.152) with Microsoft SMTP Server id 15.1.2507.58 via Frontend Transport; Fri, 21 Nov 2025 08:06:45 -0700 From: Ludovic Desroches Date: Fri, 21 Nov 2025 16:04:40 +0100 Subject: [PATCH 8/8] drm/atmel-hlcdc: destroy properly the plane state in the reset callback Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-ID: <20251121-lcd_cleanup_mainline-v1-8-2587e6fe4d67@microchip.com> References: <20251121-lcd_cleanup_mainline-v1-0-2587e6fe4d67@microchip.com> In-Reply-To: <20251121-lcd_cleanup_mainline-v1-0-2587e6fe4d67@microchip.com> To: Manikandan Muralidharan , "Dharma Balasubiramani" , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Nicolas Ferre , Alexandre Belloni , Claudiu Beznea CC: , , , Ludovic Desroches X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2586; i=ludovic.desroches@microchip.com; h=from:subject:message-id; bh=Ha1BPyyylS6A6UQC8yFXbfo2wrOczjUDbfibr5RJHhA=; b=owEBbQKS/ZANAwAKAT455hP3e2QtAcsmYgBpIH/WmebVV8yaA2DizdfbhYZClJXfHhgrXaRyl g4+2xwTdgGJAjMEAAEKAB0WIQQAMEvJiWmsW41tNU0+OeYT93tkLQUCaSB/1gAKCRA+OeYT93tk LdAMEACO166ARuG1OSAHJGOwYA6Ry41lcW+UR3weaiNx75oFreM6rbYIJjrNl/uvrXvDDtScVsG GC/vi7LBNC3EAilUM/mWp4thXccPIhVk/vBedBFNKoMUs7dlO1GtvYQYx7kX5dIxzDb/WVC73Kc NNwRoy/YDEt+2iL4z8pcfNYSjpkmsnNMeUC39KW6Ndd+uHp/XLsUNUdRUvgDeAXelUrkb+Ps6LE 184Xqmmb5urU7wFSaPyqBkI26LcvvIIiGuFr6JrAzxYftG4blfZViLz/f7bE8G/BQ04MllUrQtC VFMm0WRzObp1D2K1Fkvurz+Zb9l016j8+ll9Bvdw4MOO5nUZ7UWMcXXgJOKSGqSPhywjVJrWGXb X0V/sUWiGn6gm5Dz2EBf3yDm4+YpfV03XPVgpZTpGFyOWTowiwljljQBB1GCmcw9OGdOZwVPMiI VSdatPjwA+ZV0/OHOg41o6RBpoTmzWDpvGEUEZqystixCqo0sRdIS1Xpnc/ggzfEXLl/BlvlNPl cnLiab4+UFcS4XmqoEdBjrf2ijm9lYBfInGEnqgAN+t7LpDGML7QVVPSBQWE5vKb8BjQdTR3omz koi2981qbPYxcRGxCJa9ghUlQkY/RbHKAnk6L7+xkOV+1/DEf4cOkGdY5N+CKvcaJDqST8sxrqr 8LjDyPbLd9KzeRg== X-Developer-Key: i=ludovic.desroches@microchip.com; a=openpgp; fpr=665BAA7297BE089A28B77696E332995F09DCC11A If there is a plane state to destroy when doing a plane reset, destroy it using the atmel_hlcdc_plane_destroy_state() function. So we call __drm_atomic_helper_plane_destroy_state() and avoid code duplication. Signed-off-by: Ludovic Desroches --- drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 52 ++++++++++++---------= ---- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c b/drivers/gpu/= drm/atmel-hlcdc/atmel_hlcdc_plane.c index c1f3aaae29fb9f6b947f81e2fb4e7a61e10ac5d9..81dc730362322a4bae9b48dca97= b06baa1e331e7 100644 --- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c +++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c @@ -1155,32 +1155,6 @@ static int atmel_hlcdc_plane_alloc_dscrs(struct drm_= plane *p, return -ENOMEM; } =20 -static void atmel_hlcdc_plane_reset(struct drm_plane *p) -{ - struct atmel_hlcdc_plane_state *state; - - if (p->state) { - state =3D drm_plane_state_to_atmel_hlcdc_plane_state(p->state); - - if (state->base.fb) - drm_framebuffer_put(state->base.fb); - - kfree(state); - p->state =3D NULL; - } - - state =3D kzalloc(sizeof(*state), GFP_KERNEL); - if (state) { - if (atmel_hlcdc_plane_alloc_dscrs(p, state)) { - kfree(state); - drm_err(p->dev, - "Failed to allocate initial plane state\n"); - return; - } - __drm_atomic_helper_plane_reset(p, &state->base); - } -} - static struct drm_plane_state * atmel_hlcdc_plane_atomic_duplicate_state(struct drm_plane *p) { @@ -1222,6 +1196,32 @@ static void atmel_hlcdc_plane_atomic_destroy_state(s= truct drm_plane *p, kfree(state); } =20 +static void atmel_hlcdc_plane_reset(struct drm_plane *p) +{ + struct atmel_hlcdc_plane_state *state; + struct atmel_hlcdc_dc *dc =3D p->dev->dev_private; + struct atmel_hlcdc_plane *plane =3D drm_plane_to_atmel_hlcdc_plane(p); + + if (p->state) { + atmel_hlcdc_plane_atomic_destroy_state(p, p->state); + p->state =3D NULL; + } + + state =3D kzalloc(sizeof(*state), GFP_KERNEL); + if (state) { + if (atmel_hlcdc_plane_alloc_dscrs(p, state)) { + kfree(state); + drm_err(p->dev, + "Failed to allocate initial plane state\n"); + return; + } + __drm_atomic_helper_plane_reset(p, &state->base); + } + + if (plane->layer.desc->layout.csc) + dc->desc->ops->lcdc_csc_init(plane, plane->layer.desc); +} + static const struct drm_plane_funcs layer_plane_funcs =3D { .update_plane =3D drm_atomic_helper_update_plane, .disable_plane =3D drm_atomic_helper_disable_plane, --=20 2.51.0