Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/edid: clean up connector update error handling and debug logging

Bail out on all errors, debug log all errors, and convert to drm device
based debug logging.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/de4270b3d2e61fe42b9248490376594d472d19aa.1656494768.git.jani.nikula@intel.com

+28 -13
+28 -13
drivers/gpu/drm/drm_edid.c
··· 6231 6231 6232 6232 if (old_edid) { 6233 6233 if (!drm_edid_are_equal(drm_edid ? drm_edid->edid : NULL, old_edid)) { 6234 - DRM_DEBUG_KMS("[CONNECTOR:%d:%s] Edid was changed.\n", 6235 - connector->base.id, connector->name); 6236 - 6237 - connector->epoch_counter += 1; 6238 - DRM_DEBUG_KMS("Updating change counter to %llu\n", 6239 - connector->epoch_counter); 6234 + connector->epoch_counter++; 6235 + drm_dbg_kms(dev, "[CONNECTOR:%d:%s] EDID changed, epoch counter %llu\n", 6236 + connector->base.id, connector->name, 6237 + connector->epoch_counter); 6240 6238 } 6241 6239 } 6242 6240 } 6243 - 6244 - drm_object_property_set_value(&connector->base, 6245 - dev->mode_config.non_desktop_property, 6246 - connector->display_info.non_desktop); 6247 6241 6248 6242 ret = drm_property_replace_global_blob(dev, 6249 6243 &connector->edid_blob_ptr, ··· 6245 6251 drm_edid ? drm_edid->edid : NULL, 6246 6252 &connector->base, 6247 6253 dev->mode_config.edid_property); 6248 - if (ret) 6249 - return ret; 6250 - return drm_connector_set_tile_property(connector); 6254 + if (ret) { 6255 + drm_dbg_kms(dev, "[CONNECTOR:%d:%s] EDID property update failed (%d)\n", 6256 + connector->base.id, connector->name, ret); 6257 + goto out; 6258 + } 6259 + 6260 + ret = drm_object_property_set_value(&connector->base, 6261 + dev->mode_config.non_desktop_property, 6262 + connector->display_info.non_desktop); 6263 + if (ret) { 6264 + drm_dbg_kms(dev, "[CONNECTOR:%d:%s] Non-desktop property update failed (%d)\n", 6265 + connector->base.id, connector->name, ret); 6266 + goto out; 6267 + } 6268 + 6269 + ret = drm_connector_set_tile_property(connector); 6270 + if (ret) { 6271 + drm_dbg_kms(dev, "[CONNECTOR:%d:%s] Tile property update failed (%d)\n", 6272 + connector->base.id, connector->name, ret); 6273 + goto out; 6274 + } 6275 + 6276 + out: 6277 + return ret; 6251 6278 } 6252 6279 6253 6280 /**