diff for duplicates of <20200203232014.906651-13-gwan-gyeong.mun@intel.com>
diff --git a/a/1.txt b/N1/1.txt
index 3932dca..691f2c9 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -13,7 +13,8 @@ index 374ab6a3757c..a9eaf7a6bc15 100644
pipe_config->fec_enable);
}
-+ pipe_config->infoframes.enable |+ intel_hdmi_infoframes_enabled(encoder, pipe_config);
++ pipe_config->infoframes.enable |=
++ intel_hdmi_infoframes_enabled(encoder, pipe_config);
+
break;
case TRANS_DDI_MODE_SELECT_DP_MST:
@@ -23,7 +24,8 @@ index 374ab6a3757c..a9eaf7a6bc15 100644
intel_dp_get_m_n(intel_crtc, pipe_config);
+
-+ pipe_config->infoframes.enable |+ intel_hdmi_infoframes_enabled(encoder, pipe_config);
++ pipe_config->infoframes.enable |=
++ intel_hdmi_infoframes_enabled(encoder, pipe_config);
break;
default:
break;
@@ -37,4 +39,9 @@ index 374ab6a3757c..a9eaf7a6bc15 100644
static enum intel_output_type
--
-2.24.1
\ No newline at end of file
+2.24.1
+
+_______________________________________________
+dri-devel mailing list
+dri-devel@lists.freedesktop.org
+https://lists.freedesktop.org/mailman/listinfo/dri-devel
\ No newline at end of file
diff --git a/a/content_digest b/N1/content_digest
index d3d293a..d79dfac 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -8,7 +8,7 @@
"Subject\0[PATCH v3 12/17] drm/i915: Add state readout for DP HDR Metadata Infoframe SDP\0"
]
[
- "Date\0Mon, 03 Feb 2020 23:20:09 +0000\0"
+ "Date\0Tue, 4 Feb 2020 01:20:09 +0200\0"
]
[
"To\0intel-gfx\@lists.freedesktop.org\0"
@@ -39,7 +39,8 @@
" \t\t\t\t pipe_config->fec_enable);\n",
" \t\t}\n",
" \n",
- "+\t\tpipe_config->infoframes.enable |+\t\t\tintel_hdmi_infoframes_enabled(encoder, pipe_config);\n",
+ "+\t\tpipe_config->infoframes.enable |=\n",
+ "+\t\t\tintel_hdmi_infoframes_enabled(encoder, pipe_config);\n",
"+\n",
" \t\tbreak;\n",
" \tcase TRANS_DDI_MODE_SELECT_DP_MST:\n",
@@ -49,7 +50,8 @@
" \n",
" \t\tintel_dp_get_m_n(intel_crtc, pipe_config);\n",
"+\n",
- "+\t\tpipe_config->infoframes.enable |+\t\t\tintel_hdmi_infoframes_enabled(encoder, pipe_config);\n",
+ "+\t\tpipe_config->infoframes.enable |=\n",
+ "+\t\t\tintel_hdmi_infoframes_enabled(encoder, pipe_config);\n",
" \t\tbreak;\n",
" \tdefault:\n",
" \t\tbreak;\n",
@@ -63,7 +65,12 @@
" \n",
" static enum intel_output_type\n",
"-- \n",
- "2.24.1"
+ "2.24.1\n",
+ "\n",
+ "_______________________________________________\n",
+ "dri-devel mailing list\n",
+ "dri-devel\@lists.freedesktop.org\n",
+ "https://lists.freedesktop.org/mailman/listinfo/dri-devel"
]
-3a044aa4ae357663beb804863fd46f27f7a9514c87fdba4ba062102ebe4793d3
+46829944d103369d8b2a43ab639d08162826dbc704f4e410c5c5e1b8d14ece91
diff --git a/a/1.txt b/N2/1.txt
index 3932dca..cdeb84c 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -13,7 +13,8 @@ index 374ab6a3757c..a9eaf7a6bc15 100644
pipe_config->fec_enable);
}
-+ pipe_config->infoframes.enable |+ intel_hdmi_infoframes_enabled(encoder, pipe_config);
++ pipe_config->infoframes.enable |=
++ intel_hdmi_infoframes_enabled(encoder, pipe_config);
+
break;
case TRANS_DDI_MODE_SELECT_DP_MST:
@@ -23,7 +24,8 @@ index 374ab6a3757c..a9eaf7a6bc15 100644
intel_dp_get_m_n(intel_crtc, pipe_config);
+
-+ pipe_config->infoframes.enable |+ intel_hdmi_infoframes_enabled(encoder, pipe_config);
++ pipe_config->infoframes.enable |=
++ intel_hdmi_infoframes_enabled(encoder, pipe_config);
break;
default:
break;
@@ -37,4 +39,9 @@ index 374ab6a3757c..a9eaf7a6bc15 100644
static enum intel_output_type
--
-2.24.1
\ No newline at end of file
+2.24.1
+
+_______________________________________________
+Intel-gfx mailing list
+Intel-gfx@lists.freedesktop.org
+https://lists.freedesktop.org/mailman/listinfo/intel-gfx
\ No newline at end of file
diff --git a/a/content_digest b/N2/content_digest
index d3d293a..9fb3d56 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -5,10 +5,10 @@
"From\0Gwan-gyeong Mun <gwan-gyeong.mun\@intel.com>\0"
]
[
- "Subject\0[PATCH v3 12/17] drm/i915: Add state readout for DP HDR Metadata Infoframe SDP\0"
+ "Subject\0[Intel-gfx] [PATCH v3 12/17] drm/i915: Add state readout for DP HDR Metadata Infoframe SDP\0"
]
[
- "Date\0Mon, 03 Feb 2020 23:20:09 +0000\0"
+ "Date\0Tue, 4 Feb 2020 01:20:09 +0200\0"
]
[
"To\0intel-gfx\@lists.freedesktop.org\0"
@@ -39,7 +39,8 @@
" \t\t\t\t pipe_config->fec_enable);\n",
" \t\t}\n",
" \n",
- "+\t\tpipe_config->infoframes.enable |+\t\t\tintel_hdmi_infoframes_enabled(encoder, pipe_config);\n",
+ "+\t\tpipe_config->infoframes.enable |=\n",
+ "+\t\t\tintel_hdmi_infoframes_enabled(encoder, pipe_config);\n",
"+\n",
" \t\tbreak;\n",
" \tcase TRANS_DDI_MODE_SELECT_DP_MST:\n",
@@ -49,7 +50,8 @@
" \n",
" \t\tintel_dp_get_m_n(intel_crtc, pipe_config);\n",
"+\n",
- "+\t\tpipe_config->infoframes.enable |+\t\t\tintel_hdmi_infoframes_enabled(encoder, pipe_config);\n",
+ "+\t\tpipe_config->infoframes.enable |=\n",
+ "+\t\t\tintel_hdmi_infoframes_enabled(encoder, pipe_config);\n",
" \t\tbreak;\n",
" \tdefault:\n",
" \t\tbreak;\n",
@@ -63,7 +65,12 @@
" \n",
" static enum intel_output_type\n",
"-- \n",
- "2.24.1"
+ "2.24.1\n",
+ "\n",
+ "_______________________________________________\n",
+ "Intel-gfx mailing list\n",
+ "Intel-gfx\@lists.freedesktop.org\n",
+ "https://lists.freedesktop.org/mailman/listinfo/intel-gfx"
]
-3a044aa4ae357663beb804863fd46f27f7a9514c87fdba4ba062102ebe4793d3
+deb236e715df2e8830977005c7b15bdc8f2e65b2a755564b7008227a9e0763d1
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.