@@ -1327,20 +1327,27 @@ bool intel_hdmi_compute_config(struct in
* outputs. We also need to check that the higher clock still fits
* within limits.
*/
- if (pipe_config->pipe_bpp > 8*3 && pipe_config->has_hdmi_sink &&
- hdmi_port_clock_valid(intel_hdmi, clock_12bpc, true) == MODE_OK &&
- hdmi_12bpc_possible(pipe_config)) {
- DRM_DEBUG_KMS("picking bpc to 12 for HDMI output\n");
- desired_bpp = 12*3;
+/* erikj forcing 8 */
+// if (pipe_config->pipe_bpp > 8*3 && pipe_config->has_hdmi_sink &&
+// hdmi_port_clock_valid(intel_hdmi, clock_12bpc, true) == MODE_OK &&
+// hdmi_12bpc_possible(pipe_config)) {
+// DRM_DEBUG_KMS("picking bpc to 12 for HDMI output\n");
+// desired_bpp = 12*3;
+//
+// /* Need to adjust the port link by 1.5x for 12bpc. */
+// pipe_config->port_clock = clock_12bpc;
+// } else {
+// DRM_DEBUG_KMS("picking bpc to 8 for HDMI output\n");
+// desired_bpp = 8*3;
+//
+// pipe_config->port_clock = clock_8bpc;
+// }
+/* erikj here is the force */
+ DRM_DEBUG_KMS("erikj force-picking bpc to 8 for HDMI output\n");
+ desired_bpp = 8*3;
- /* Need to adjust the port link by 1.5x for 12bpc. */
- pipe_config->port_clock = clock_12bpc;
- } else {
- DRM_DEBUG_KMS("picking bpc to 8 for HDMI output\n");
- desired_bpp = 8*3;
-
- pipe_config->port_clock = clock_8bpc;
- }
+ pipe_config->port_clock = clock_8bpc;
+/* end erikj */
if (!pipe_config->bw_constrained) {
DRM_DEBUG_KMS("forcing pipe bpc to %i for HDMI\n", desired_bpp);