]> git.baikalelectronics.ru Git - kernel.git/commitdiff
drm/vrr: Set VRR capable prop only if it is attached to connector
authorManasi Navare <manasi.d.navare@intel.com>
Fri, 25 Feb 2022 01:30:54 +0000 (17:30 -0800)
committerManasi Navare <manasi.d.navare@intel.com>
Tue, 1 Mar 2022 19:37:21 +0000 (11:37 -0800)
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
drivers/gpu/drm/drm_connector.c

index a50c82bc2b2fecd3182529d5e1f640e25b8f8674..76a8c707c34b948168b5a8b7827c53a7006f2984 100644 (file)
@@ -2330,6 +2330,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);