diff --git a/ucm2/Qualcomm/x1e80100/HiFi.conf b/ucm2/Qualcomm/x1e80100/HiFi.conf
index 9dee654d..0f8e7787 100644
--- a/ucm2/Qualcomm/x1e80100/HiFi.conf
+++ b/ucm2/Qualcomm/x1e80100/HiFi.conf
@@ -3,7 +3,9 @@
 
 SectionVerb {
 	EnableSequence [
-		cset "name='RX_CODEC_DMA_RX_0 Audio Mixer MultiMedia1' 1"
+		cset "name='DISPLAY_PORT_RX_0 Audio Mixer MultiMedia1' 0"
+		cset "name='DISPLAY_PORT_RX_1 Audio Mixer MultiMedia1' 0"
+		cset "name='RX_CODEC_DMA_RX_0 Audio Mixer MultiMedia1' 0"
 		cset "name='WSA_CODEC_DMA_RX_0 Audio Mixer MultiMedia2' 1"
 		cset "name='MultiMedia3 Mixer TX_CODEC_DMA_TX_3' 1"
 		cset "name='MultiMedia4 Mixer VA_CODEC_DMA_TX_0' 1"
@@ -38,12 +40,24 @@ SectionDevice."Speaker" {
 
 SectionDevice."Headphones" {
 	Comment "Headphones playback"
+	ConflictingDevice [
+		"USB0"
+		"USB1"
+	]
 
 	Include.wcdhpe.File "/codecs/wcd938x/HeadphoneEnableSeq.conf"
 	Include.wcdhpd.File "/codecs/wcd938x/HeadphoneDisableSeq.conf"
 	Include.rxmhpe.File "/codecs/qcom-lpass/rx-macro/HeadphoneEnableSeq.conf"
 	Include.rxmhpd.File "/codecs/qcom-lpass/rx-macro/HeadphoneDisableSeq.conf"
 
+	EnableSequence [
+		cset "name='RX_CODEC_DMA_RX_0 Audio Mixer MultiMedia1' 1"
+	]
+
+	DisableSequence [
+		cset "name='RX_CODEC_DMA_RX_0 Audio Mixer MultiMedia1' 0"
+	]
+
 	Value {
 		PlaybackPriority 200
 		PlaybackPCM "hw:${CardId},0"
@@ -67,3 +81,48 @@ SectionDevice."Mic" {
 		CapturePCM "hw:${CardId},3"
 	}
 }
+
+SectionDevice."USB0" {
+	Comment "USB/DP 0 playback"
+	ConflictingDevice [
+		"Headphones"
+		"USB1"
+	]
+
+	EnableSequence [
+		cset "name='DISPLAY_PORT_RX_0 Audio Mixer MultiMedia1' 1"
+	]
+
+	DisableSequence [
+		cset "name='DISPLAY_PORT_RX_0 Audio Mixer MultiMedia1' 0"
+	]
+
+	Value {
+		PlaybackPriority 200
+		PlaybackPCM "hw:${CardId},0"
+		JackControl "HDMI/DP0 Jack"
+	}
+}
+
+SectionDevice."USB1" {
+	Comment "USB/DP 1 playback"
+
+	ConflictingDevice [
+		"Headphones"
+		"USB0"
+	]
+
+	EnableSequence [
+		cset "name='DISPLAY_PORT_RX_1 Audio Mixer MultiMedia1' 1"
+	]
+
+	DisableSequence [
+		cset "name='DISPLAY_PORT_RX_1 Audio Mixer MultiMedia1' 0"
+	]
+
+	Value {
+		PlaybackPriority 100
+		PlaybackPCM "hw:${CardId},0"
+		JackControl "HDMI/DP1 Jack"
+	}
+}