From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CC693C35274 for ; Wed, 9 Mar 2022 16:32:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236304AbiCIQ3h (ORCPT ); Wed, 9 Mar 2022 11:29:37 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44214 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235234AbiCIQW7 (ORCPT ); Wed, 9 Mar 2022 11:22:59 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 70CEB2B1BE; Wed, 9 Mar 2022 08:21:39 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id A6B0BB82020; Wed, 9 Mar 2022 16:21:37 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8EE78C340E8; Wed, 9 Mar 2022 16:21:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1646842896; bh=uupnt2lHilMC53ou54V1UvD3QXZW+C7+LxzkOSFd6Zo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=c4BtVJkyNWni7tFEx54Wh/ZInPD734LTpTu3ya8kssLhwe/pDIWgDXxWVCQRtgT2v hvxRxm+/WTwgeQuHhxPAnrG0s6vLc66NVopP8WMHrwm7qkn0YR8ONgOFVs0Ct68FdN f042xZ+xZOP0oAT80ab+sY2fj8PbsIJ/5yiinogmVkq2bopo4ZkkLw2j7o8fGmpF0o P/zeMUIjypXt941l1tt/ui7xcuv6YzgyiP80WVCzLI5V/ozEw/bW1NNZlvKJV0aGvg aNZqaeHa97gq4rH6cmwqOyyMaSOEgyKdoYl+z4fJ5EulJIbvWbhZj/TM4PngdS/xJV y+xHOVxUTM2yQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Manasi Navare , Jani Nikula , =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= , dri-devel@lists.freedesktop.org, Sasha Levin , maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, airlied@linux.ie, daniel@ffwll.ch Subject: [PATCH AUTOSEL 5.15 19/24] drm/vrr: Set VRR capable prop only if it is attached to connector Date: Wed, 9 Mar 2022 11:19:38 -0500 Message-Id: <20220309161946.136122-19-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220309161946.136122-1-sashal@kernel.org> References: <20220309161946.136122-1-sashal@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Manasi Navare [ Upstream commit 62929726ef0ec72cbbe9440c5d125d4278b99894 ] VRR capable property is not attached by default to the connector It is attached only if VRR is supported. So if the driver tries to call drm core set prop function without it being attached that causes NULL dereference. Cc: Jani Nikula Cc: Ville Syrjälä Cc: dri-devel@lists.freedesktop.org Signed-off-by: Manasi Navare Reviewed-by: Ville Syrjälä Link: https://patchwork.freedesktop.org/patch/msgid/20220225013055.9282-1-manasi.d.navare@intel.com Signed-off-by: Sasha Levin --- drivers/gpu/drm/drm_connector.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c index 2ba257b1ae20..e9b7926d9b66 100644 --- a/drivers/gpu/drm/drm_connector.c +++ b/drivers/gpu/drm/drm_connector.c @@ -2233,6 +2233,9 @@ EXPORT_SYMBOL(drm_connector_atomic_hdr_metadata_equal); void drm_connector_set_vrr_capable_property( struct drm_connector *connector, bool capable) { + if (!connector->vrr_capable_property) + return; + drm_object_property_set_value(&connector->base, connector->vrr_capable_property, capable); -- 2.34.1