summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorManasi Navare <manasi.d.navare@intel.com>2022-02-24 17:30:54 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-03-19 13:48:45 +0100
commit85271e92ae4f13aa679acaa6cf76b3c36bcb7bab (patch)
tree1be12f522939204dd54d1e050a79a318f740b0e7
parentf1cb634f2d9b47a350359035e11ba095394f1d95 (diff)
downloadlinux-stable-85271e92ae4f13aa679acaa6cf76b3c36bcb7bab.tar.gz
linux-stable-85271e92ae4f13aa679acaa6cf76b3c36bcb7bab.tar.bz2
linux-stable-85271e92ae4f13aa679acaa6cf76b3c36bcb7bab.zip
drm/vrr: Set VRR capable prop only if it is attached to connector
[ 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 <jani.nikula@intel.com> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> Cc: dri-devel@lists.freedesktop.org Signed-off-by: Manasi Navare <manasi.d.navare@intel.com> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20220225013055.9282-1-manasi.d.navare@intel.com Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--drivers/gpu/drm/drm_connector.c3
1 files changed, 3 insertions, 0 deletions
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);