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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D776FC433EF for ; Wed, 9 Mar 2022 16:19:17 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0A41410E27D; Wed, 9 Mar 2022 16:19:17 +0000 (UTC) Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by gabe.freedesktop.org (Postfix) with ESMTPS id 13F9A10E27D for ; Wed, 9 Mar 2022 16:19:16 +0000 (UTC) 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 dfw.source.kernel.org (Postfix) with ESMTPS id 6FDD9615F1; Wed, 9 Mar 2022 16:19:15 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5497BC340E8; Wed, 9 Mar 2022 16:19:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1646842754; bh=pnnLmjgrFj3YqWEw384JKVp/R+b1txHwuHbbSAYmroM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=APM273FAipZByIfB5bJbcjcT0NvoLD6RX5kQqs/WYIthnCj7QRL+3LYpLOUvK9XAe BDUA6fma/BjYm1+1KAVJYyup8aQ2lVhsKo5MnLE2iB8M3jHCfvwQ/7t+cVlLaoHN9G txbxdiFDQ22qKZRncfQM1O7WRDDbcMBJCm/eYzCkoq4rd3DvMItBwwvQprEzT2zuF3 MT77ZMLNhdUQ7ILUE0C+Zb3kp8YvdQMvmhJdmwtbiacx4v6HsTMc7ooiJWmmrXF8Xc V4xyUTK0Qoj/z8PdNd15XZUES3Fq2Z6602S1y+ZJ5uOCt4Wt3QpXtejEs7mNAXSYr2 lOOQJ9NZ/DUKw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH AUTOSEL 5.16 22/27] drm/vrr: Set VRR capable prop only if it is attached to connector Date: Wed, 9 Mar 2022 11:16:59 -0500 Message-Id: <20220309161711.135679-22-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220309161711.135679-1-sashal@kernel.org> References: <20220309161711.135679-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 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sasha Levin , Jani Nikula , dri-devel@lists.freedesktop.org, Manasi Navare , airlied@linux.ie, tzimmermann@suse.de Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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 52e20c68813b..6ae26e7d3dec 100644 --- a/drivers/gpu/drm/drm_connector.c +++ b/drivers/gpu/drm/drm_connector.c @@ -2275,6 +2275,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