diff --git a/compositor/main.c b/compositor/main.c
index 36f70e2b2..c6144660c 100644
--- a/compositor/main.c
+++ b/compositor/main.c
@@ -1401,6 +1401,10 @@ wet_output_set_eotf_mode(struct weston_output *output,
 	if ((weston_output_get_supported_eotf_modes(output) & eotf_mode) == 0) {
 		weston_log("Error: output '%s' does not support EOTF mode %s.\n",
 			   output->name, str);
+#if !HAVE_LIBDISPLAY_INFO
+		weston_log_continue(STAMP_SPACE "Weston was built without libdisplay-info, "
+				    "so HDR capabilities cannot be detected.\n");
+#endif
 		free(str);
 		return -1;
 	}
diff --git a/libweston/backend-drm/modes.c b/libweston/backend-drm/modes.c
index 668165725..901372bb1 100644
--- a/libweston/backend-drm/modes.c
+++ b/libweston/backend-drm/modes.c
@@ -378,8 +378,8 @@ drm_head_info_from_edid(struct drm_head_info *dhi,
 			dhi->serial_number = xstrdup(edid.serial_number);
 	}
 
-	/* TODO: parse this from EDID */
-	dhi->eotf_mask = WESTON_EOTF_MODE_ALL_MASK;
+	/* This ad hoc code will never parse HDR data. */
+	dhi->eotf_mask = WESTON_EOTF_MODE_SDR;
 }
 
 #endif /* HAVE_LIBDISPLAY_INFO else */