diff --git a/library/axi_hdmi_tx/axi_hdmi_tx_constr.xdc b/library/axi_hdmi_tx/axi_hdmi_tx_constr.xdc
index 1a29dd5b4..710a803f5 100644
--- a/library/axi_hdmi_tx/axi_hdmi_tx_constr.xdc
+++ b/library/axi_hdmi_tx/axi_hdmi_tx_constr.xdc
@@ -1,3 +1,76 @@
-set_clock_groups -asynchronous \
-	-group [get_clocks -of_objects [get_ports hdmi_clk]] \
-	-group [get_clocks -of_objects [get_ports s_axi_aclk]]
+set up_clk [get_clocks -of_objects [get_ports s_axi_aclk]]
+set vdma_clk [get_clocks -of_objects [get_ports m_axis_mm2s_clk]]
+set hdmi_clk [get_clocks -of_objects [get_ports hdmi_clk]]
+
+set_property ASYNC_REG TRUE \
+  [get_cells -hier *toggle_m1_reg*] \
+  [get_cells -hier *toggle_m2_reg*] \
+  [get_cells -hier *state_m1_reg*] \
+  [get_cells -hier *state_m2_reg*]
+
+set_false_path \
+  -from [get_cells -hier up_xfer_toggle_reg* -filter {primitive_subgroup == flop}] \
+  -to [get_cells -hier d_xfer_toggle_m1_reg* -filter {primitive_subgroup == flop}]
+set_false_path \
+  -from [get_cells -hier d_xfer_toggle_reg* -filter {primitive_subgroup == flop}] \
+  -to [get_cells -hier up_xfer_state_m1_reg* -filter {primitive_subgroup == flop}]
+set_max_delay  -datapath_only \
+  -from [get_cells -hier up_xfer_data_reg* -filter {primitive_subgroup == flop}] \
+  -to [get_cells -hier d_data_cntrl_reg* -filter {primitive_subgroup == flop}] \
+  [get_property PERIOD $hdmi_clk]
+
+set_false_path \
+  -from [get_cells -hier d_xfer_toggle_reg* -filter {primitive_subgroup == flop}] \
+  -to [get_cells -hier up_xfer_toggle_m1_reg* -filter {primitive_subgroup == flop}]
+set_false_path \
+  -from [get_cells -hier up_xfer_toggle_reg* -filter {primitive_subgroup == flop}] \
+  -to [get_cells -hier d_xfer_state_m1_reg* -filter {primitive_subgroup == flop}]
+set_max_delay -datapath_only \
+  -from [get_cells -hier d_xfer_data_reg* -filter {primitive_subgroup == flop}] \
+  -to [get_cells -hier up_data_status_reg* -filter {primitive_subgroup == flop}] \
+  [get_property PERIOD $up_clk]
+
+set_false_path \
+  -from [get_cells -hier hdmi_fs_toggle_reg* -filter {primitive_subgroup == flop}] \
+  -to [get_cells -hier vdma_fs_toggle_m1_reg* -filter {primitive_subgroup == flop}]
+set_false_path \
+  -from [get_cells -hier vdma_fs_ret_toggle_reg* -filter {primitive_subgroup == flop}] \
+  -to [get_cells -hier hdmi_fs_ret_toggle_m1_reg* -filter {primitive_subgroup == flop}]
+set_max_delay -datapath_only \
+  -from [get_cells -hier vdma_fs_waddr* -filter {primitive_subgroup == flop}] \
+  -to [get_cells -hier hdmi_fs_waddr* -filter {primitive_subgroup == flop}] \
+  [get_property PERIOD $hdmi_clk]
+
+set_false_path \
+  -from [get_cells -hier up_count_toggle_reg* -filter {primitive_subgroup == flop}] \
+  -to [get_cells -hier d_count_toggle_m1_reg* -filter {primitive_subgroup == flop}]
+set_false_path \
+  -from [get_cells -hier d_count_toggle_reg* -filter {primitive_subgroup == flop}] \
+  -to [get_cells -hier up_count_toggle_m1_reg* -filter {primitive_subgroup == flop}]
+set_max_delay  -datapath_only \
+  -from [get_cells -hier d_count_hold_reg* -filter {primitive_subgroup == flop}] \
+  -to [get_cells -hier up_d_count_reg* -filter {primitive_subgroup == flop}] \
+  [get_property PERIOD $up_clk]
+
+set_max_delay -datapath_only \
+  -from [get_cells -hier hdmi_raddr_g* -filter {primitive_subgroup == flop}] \
+  -to [get_cells -hier vdma_raddr_g_m1* -filter {primitive_subgroup == flop}] \
+ [get_property PERIOD $vdma_clk]
+
+set_max_delay -datapath_only \
+  -from [get_cells -hier vdma_tpm_oos_reg* -filter {primitive_subgroup == flop}] \
+  -to [get_cells -hier d_acc_data_reg* -filter {primitive_subgroup == flop}] \
+  [get_property PERIOD $up_clk]
+
+set_max_delay -datapath_only \
+  -from [get_cells -hier vdma_ovf_reg* -filter {primitive_subgroup == flop}] \
+  -to [get_cells -hier d_acc_data_reg* -filter {primitive_subgroup == flop}] \
+  [get_property PERIOD $up_clk]
+
+set_max_delay -datapath_only \
+  -from [get_cells -hier vdma_unf_reg* -filter {primitive_subgroup == flop}] \
+  -to [get_cells -hier d_acc_data_reg* -filter {primitive_subgroup == flop}] \
+  [get_property PERIOD $up_clk]
+
+set_false_path \
+  -to [get_pins -hier */PRE -filter {NAME =~ *i_*rst_reg*}]
diff --git a/library/axi_hdmi_tx/axi_hdmi_tx_ip.tcl b/library/axi_hdmi_tx/axi_hdmi_tx_ip.tcl
index c5d66d28f..9302f512d 100644
--- a/library/axi_hdmi_tx/axi_hdmi_tx_ip.tcl
+++ b/library/axi_hdmi_tx/axi_hdmi_tx_ip.tcl
@@ -24,6 +24,7 @@ adi_ip_files axi_hdmi_tx [list \
   "axi_hdmi_tx_constr.xdc" ]
 
 adi_ip_properties axi_hdmi_tx
+
 adi_ip_constraints axi_hdmi_tx [list \
   "axi_hdmi_tx_constr.xdc" ]