Skip to contentSkip to conversation

drm: Add connector property to limit max bpc

PATCH Superseded Radhakrishna Sripada 3 participants 6 messages Oct 11, 2018

Subsystems (3)

v12 of 14 Superseded Latest is v14 →

lore
Share & tools
lore
#0 lore raw

PATCH v12 1/2 drm: Add connector property to limit max bpc

At times 12bpc HDMI cannot be driven due to faulty cables, dongles level shifters etc. To workaround them we may need to drive the output at a lower bpc. Currently the user space does not have a way to limit the bpc. The default bpc to be programmed is decided by the driver and is run against connector limitations.

Creating a new connector property "max bpc" in order to limit the bpc. xrandr can make use of this connector property to make sure that bpc does not exceed the configured value. This property can be used by userspace to set the bpc.

V2: Initialize max_bpc to satisfy kms_properties
V3: Move the property to drm_connector
V4: Split drm and i915 components(Ville)
V5: Make the property per connector(Ville)
V6: Compare the requested bpc to connector bpc(Daniel)
Move the attach_property function to core(Ville)
V7: Fix checkpatch warnings
V8: Simplify the connector check code(Ville)
V9: Const display_info(Ville)
V10,V11: Fix CI issues.
V12: Add the Kernel documentation(Daniel)

Cc Ville Syrjälä <[email protected]>
Cc Daniel Vetter <[email protected]>
Cc Kishore Kadiyala <[email protected]>
Cc Rodrigo Vivi <[email protected]>
Cc Manasi Navare <[email protected]>
Cc Stanislav Lisovskiy <[email protected]>
Cc Sunpeng Li <[email protected]>
---
 drivers/gpu/drm/drm_atomic.c        |  5 +++++
 drivers/gpu/drm/drm_atomic_helper.c |  4 ++++
 drivers/gpu/drm/drm_atomic_uapi.c   |  4 ++++
 drivers/gpu/drm/drm_connector.c     | 39 +++++++++++++++++++++++++++++++++++++
 include/drm/drm_connector.h         | 20 +++++++++++++++++++
 5 files changed, 72 insertions(+)
drivers/gpu/drm/drm_atomic.c +5 -0
index 2870ae205237..cd8362dc4f74 100644
@@ -390,6 +390,11 @@ static int drm_atomic_connector_check(struct drm_connector *connector,
 {
 	struct drm_crtc_state *crtc_state;
 	struct drm_writeback_job *writeback_job = state->writeback_job;
+	const struct drm_display_info *info = &connector->display_info;
+
+	state->max_bpc = info->bpc ? info->bpc : 8;
+	if (connector->max_bpc_property)
+		state->max_bpc = min(state->max_bpc, state->max_requested_bpc);
 
 	if ((connector->connector_type != DRM_MODE_CONNECTOR_WRITEBACK) || !writeback_job)
 		return 0;
drivers/gpu/drm/drm_atomic_helper.c +4 -0
index e6a2cf72de5e..8bc919e3b271 100644
@@ -669,6 +669,10 @@ drm_atomic_helper_check_modeset(struct drm_device *dev,
 			if (old_connector_state->link_status !=
 			    new_connector_state->link_status)
 				new_crtc_state->connectors_changed = true;
+
+			if (old_connector_state->max_requested_bpc !=
+			    new_connector_state->max_requested_bpc)
+				new_crtc_state->connectors_changed = true;
 		}
 
 		if (funcs->atomic_check)
drivers/gpu/drm/drm_atomic_uapi.c +4 -0
index d5b7f315098c..86ac33922b09 100644
@@ -740,6 +740,8 @@ static int drm_atomic_connector_set_property(struct drm_connector *connector,
 
 		return set_out_fence_for_connector(state->state, connector,
 						   fence_ptr);
+	} else if (property == connector->max_bpc_property) {
+		state->max_requested_bpc = val;
 	} else if (connector->funcs->atomic_set_property) {
 		return connector->funcs->atomic_set_property(connector,
 				state, property, val);
@@ -804,6 +806,8 @@ drm_atomic_connector_get_property(struct drm_connector *connector,
 		*val = 0;
 	} else if (property == config->writeback_out_fence_ptr_property) {
 		*val = 0;
+	} else if (property == connector->max_bpc_property) {
+		*val = state->max_requested_bpc;
 	} else if (connector->funcs->atomic_get_property) {
 		return connector->funcs->atomic_get_property(connector,
 				state, property, val);
drivers/gpu/drm/drm_connector.c +39 -0
index 5d01414ec9f7..a346004a1c4f 100644
@@ -932,6 +932,11 @@ DRM_ENUM_NAME_FN(drm_get_content_protection_name, drm_cp_enum_list)
  *	  is no longer protected and userspace should take appropriate action
  *	  (whatever that might be).
  *
+ * max bpc:
+ *	This range property is used by userspace to limit the bit depth. When
+ *	used the driver would limit the bpc in accordance with the valid range
+ *	supported by the hardware and sink.
+ *
  * Connectors also have one standardized atomic property:
  *
  * CRTC_ID:
@@ -1600,6 +1605,40 @@ void drm_connector_set_link_status_property(struct drm_connector *connector,
 EXPORT_SYMBOL(drm_connector_set_link_status_property);
 
 /**
+ * drm_connector_attach_max_bpc_property - attach "max bpc" property
+ * @connector: connector to attach max bpc property on.
+ * @min: The minimum bit depth supported by the connector.
+ * @max: The maximum bit depth supported by the connector.
+ *
+ * This is used to add support for limiting the bit depth on a connector.
+ *
+ * Returns:
+ * Zero on success, negative errno on failure.
+ */
+int drm_connector_attach_max_bpc_property(struct drm_connector *connector,
+					  int min, int max)
+{
+	struct drm_device *dev = connector->dev;
+	struct drm_property *prop;
+
+	prop = connector->max_bpc_property;
+	if (!prop) {
+		prop = drm_property_create_range(dev, 0, "max bpc", min, max);
+		if (!prop)
+			return -ENOMEM;
+
+		connector->max_bpc_property = prop;
+	}
+
+	drm_object_attach_property(&connector->base, prop, max);
+	connector->state->max_requested_bpc = max;
+	connector->state->max_bpc = max;
+
+	return 0;
+}
+EXPORT_SYMBOL(drm_connector_attach_max_bpc_property);
+
+/**
  * drm_connector_init_panel_orientation_property -
  *	initialize the connecters panel_orientation property
  * @connector: connector for which to init the panel-orientation property.
include/drm/drm_connector.h +20 -0
index 5b3cf909fd5e..a402d16427a1 100644
@@ -461,6 +461,18 @@ struct drm_connector_state {
 	 * drm_writeback_signal_completion()
 	 */
 	struct drm_writeback_job *writeback_job;
+
+	/**
+	 * @max_requested_bpc: Connector property to limit the maximum bit
+	 * depth of the pixels.
+	 */
+	u8 max_requested_bpc;
+
+	/**
+	 * @max_bpc: Connector max_bpc based on the requested max_bpc property
+	 * and the connector bpc limitations obtained from edid.
+	 */
+	u8 max_bpc;
 };
 
 /**
@@ -924,6 +936,12 @@ struct drm_connector {
 	 */
 	struct drm_property_blob *path_blob_ptr;
 
+	/**
+	 * @max_bpc_property: Default connector property for the max bpc to be
+	 * driven out of the connector.
+	 */
+	struct drm_property *max_bpc_property;
+
 #define DRM_CONNECTOR_POLL_HPD (1 << 0)
 #define DRM_CONNECTOR_POLL_CONNECT (1 << 1)
 #define DRM_CONNECTOR_POLL_DISCONNECT (1 << 2)
@@ -1202,6 +1220,8 @@ void drm_connector_set_link_status_property(struct drm_connector *connector,
 					    uint64_t link_status);
 int drm_connector_init_panel_orientation_property(
 	struct drm_connector *connector, int width, int height);
+int drm_connector_attach_max_bpc_property(struct drm_connector *connector,
+					  int min, int max);
 
 /**
  * struct drm_tile_group - Tile group metadata
Signature · 6 lines
2.9.3

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw

PATCH v12 2/2 drm/i915: Allow "max bpc" property to limit pipe_bpp

Use the newly added "max bpc" connector property to limit pipe bpp.

V3: Use drm_connector_state to access the "max bpc" property
V4: Initialize the drm property, add suuport to DP(Ville)
V5: Use the property in the connector and fix CI failure(Ville)
V6: Use the core function to attach max_bpc property, remove the redundant
clamping of pipe bpp based on connector info
V7: Fix Checkpatch warnings
V9: Cleanup connected_sink_max_bpp and fix initial value in DP(Ville)
V12: Fix debug message(Ville)

Cc Ville Syrjälä <[email protected]>
Cc Daniel Vetter <[email protected]>
Cc Rodrigo Vivi <[email protected]>
Cc Kishore Kadiyala <[email protected]>
Cc Manasi Navare <[email protected]>
Cc Stanislav Lisovskiy <[email protected]>
---
 drivers/gpu/drm/i915/intel_display.c | 48 +++++++++++++++++++++---------------
 drivers/gpu/drm/i915/intel_dp.c      |  4 +++
 drivers/gpu/drm/i915/intel_hdmi.c    |  5 ++++
 3 files changed, 37 insertions(+), 20 deletions(-)
drivers/gpu/drm/i915/intel_display.c +28 -20
index a145efba9157..a597c4410f5d 100644
@@ -10869,30 +10869,38 @@ static void intel_modeset_update_connector_atomic_state(struct drm_device *dev)
 	drm_connector_list_iter_end(&conn_iter);
 }
 
-static void
-connected_sink_compute_bpp(struct intel_connector *connector,
-			   struct intel_crtc_state *pipe_config)
+static int
+connected_sink_max_bpp(const struct drm_connector_state *conn_state,
+		       struct intel_crtc_state *pipe_config)
 {
-	const struct drm_display_info *info = &connector->base.display_info;
-	int bpp = pipe_config->pipe_bpp;
+	int bpp;
+	struct drm_display_info *info = &conn_state->connector->display_info;
 
-	DRM_DEBUG_KMS("[CONNECTOR:%d:%s] checking for sink bpp constrains\n",
-		      connector->base.base.id,
-		      connector->base.name);
+	bpp = min(pipe_config->pipe_bpp, conn_state->max_bpc * 3);
 
-	/* Don't use an invalid EDID bpc value */
-	if (info->bpc != 0 && info->bpc * 3 < bpp) {
-		DRM_DEBUG_KMS("clamping display bpp (was %d) to EDID reported max of %d\n",
-			      bpp, info->bpc * 3);
-		pipe_config->pipe_bpp = info->bpc * 3;
+	switch (conn_state->max_bpc) {
+	case 6 ... 7:
+		pipe_config->pipe_bpp = 6 * 3;
+	case 8 ... 9:
+		pipe_config->pipe_bpp = 8 * 3;
+		break;
+	case 10 ... 11:
+		pipe_config->pipe_bpp = 10 * 3;
+		break;
+	case 12:
+		pipe_config->pipe_bpp = 12 * 3;
+		break;
+	default:
+		return -EINVAL;
 	}
 
-	/* Clamp bpp to 8 on screens without EDID 1.4 */
-	if (info->bpc == 0 && bpp > 24) {
-		DRM_DEBUG_KMS("clamping display bpp (was %d) to default limit of 24\n",
-			      bpp);
-		pipe_config->pipe_bpp = 24;
+	if (bpp != pipe_config->pipe_bpp) {
+		DRM_DEBUG_KMS("Limiting display bpp to %d instead of Edid bpp "
+			      "%d, requested bpp %d\n", bpp, 3 * info->bpc,
+			      3 * conn_state->max_requested_bpc);
+		pipe_config->pipe_bpp = bpp;
 	}
+	return 0;
 }
 
 static int
@@ -10923,8 +10931,8 @@ compute_baseline_pipe_bpp(struct intel_crtc *crtc,
 		if (connector_state->crtc != &crtc->base)
 			continue;
 
-		connected_sink_compute_bpp(to_intel_connector(connector),
-					   pipe_config);
+		if (connected_sink_max_bpp(connector_state, pipe_config) < 0)
+			return -EINVAL;
 	}
 
 	return bpp;
drivers/gpu/drm/i915/intel_dp.c +4 -0
index 0855b9785f7b..863c8832fe8b 100644
@@ -5705,6 +5705,10 @@ intel_dp_add_properties(struct intel_dp *intel_dp, struct drm_connector *connect
 		intel_attach_force_audio_property(connector);
 
 	intel_attach_broadcast_rgb_property(connector);
+	if (HAS_GMCH_DISPLAY(dev_priv))
+		drm_connector_attach_max_bpc_property(connector, 6, 10);
+	else if (INTEL_GEN(dev_priv) >= 5)
+		drm_connector_attach_max_bpc_property(connector, 6, 12);
 
 	if (intel_dp_is_edp(intel_dp)) {
 		u32 allowed_scalers;
drivers/gpu/drm/i915/intel_hdmi.c +5 -0
index 2c53efc463e6..3158ab085a30 100644
@@ -2103,11 +2103,16 @@ static const struct drm_encoder_funcs intel_hdmi_enc_funcs = {
 static void
 intel_hdmi_add_properties(struct intel_hdmi *intel_hdmi, struct drm_connector *connector)
 {
+	struct drm_i915_private *dev_priv = to_i915(connector->dev);
+
 	intel_attach_force_audio_property(connector);
 	intel_attach_broadcast_rgb_property(connector);
 	intel_attach_aspect_ratio_property(connector);
 	drm_connector_attach_content_type_property(connector);
 	connector->state->picture_aspect_ratio = HDMI_PICTURE_ASPECT_NONE;
+
+	if (!HAS_GMCH_DISPLAY(dev_priv))
+		drm_connector_attach_max_bpc_property(connector, 8, 12);
 }
 
 /*
Signature · 6 lines
2.9.3

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#2 lore raw

Re: [PATCH v12 2/2] drm/i915: Allow "max bpc" property to limit pipe_bpp

Quoted 67 lines · Radhakrishna Sripada

Use the newly added "max bpc" connector property to limit pipe bpp.

V3: Use drm_connector_state to access the "max bpc" property
V4: Initialize the drm property, add suuport to DP(Ville)
V5: Use the property in the connector and fix CI failure(Ville)
V6: Use the core function to attach max_bpc property, remove the redundant
clamping of pipe bpp based on connector info
V7: Fix Checkpatch warnings
V9: Cleanup connected_sink_max_bpp and fix initial value in DP(Ville)
V12: Fix debug message(Ville)

Cc Ville Syrjälä <[email protected]>
Cc Daniel Vetter <[email protected]>
Cc Rodrigo Vivi <[email protected]>
Cc Kishore Kadiyala <[email protected]>
Cc Manasi Navare <[email protected]>
Cc Stanislav Lisovskiy <[email protected]>
---
 drivers/gpu/drm/i915/intel_display.c | 48 +++++++++++++++++++++-----
----------
 drivers/gpu/drm/i915/intel_dp.c      |  4 +++
 drivers/gpu/drm/i915/intel_hdmi.c    |  5 ++++
 3 files changed, 37 insertions(+), 20 deletions(-)
drivers/gpu/drm/i915/intel_display.c +11 -13
index a145efba9157..a597c4410f5d 100644
@@ -10869,30 +10869,38 @@ static void
 intel_modeset_update_connector_atomic_state(struct drm_device *dev)
 	drm_connector_list_iter_end(&conn_iter);
 }
 
-static void
-connected_sink_compute_bpp(struct intel_connector *connector,
-			   struct intel_crtc_state *pipe_config)
+static int
+connected_sink_max_bpp(const struct drm_connector_state *conn_state,
+		       struct intel_crtc_state *pipe_config)
 {
-	const struct drm_display_info *info = &connector-
 >base.display_info;
-	int bpp = pipe_config->pipe_bpp;
+	int bpp;
+	struct drm_display_info *info = &conn_state->connector-
 >display_info;
 
-	DRM_DEBUG_KMS("[CONNECTOR:%d:%s] checking for sink bpp
 constrains\n",
-		      connector->base.base.id,
-		      connector->base.name);
+	bpp = min(pipe_config->pipe_bpp, conn_state->max_bpc * 3);
 
-	/* Don't use an invalid EDID bpc value */
-	if (info->bpc != 0 && info->bpc * 3 < bpp) {
-		DRM_DEBUG_KMS("clamping display bpp (was %d) to EDID
 reported max of %d\n",
-			      bpp, info->bpc * 3);
-		pipe_config->pipe_bpp = info->bpc * 3;
+	switch (conn_state->max_bpc) {
+	case 6 ... 7:
+		pipe_config->pipe_bpp = 6 * 3;
+	case 8 ... 9:
+		pipe_config->pipe_bpp = 8 * 3;

drivers/gpu/drm/i915/intel_display.c static void · line 10900

Quoted 10 lines
drivers/gpu/drm/i915/intel_display.c +9 -0
+		break;
+	case 10 ... 11:
+		pipe_config->pipe_bpp = 10 * 3;
+		break;
+	case 12:
+		pipe_config->pipe_bpp = 12 * 3;
+		break;
+	default:
+		return -EINVAL;
 	}

Why do we need this assignment here? I mean you have already determined the minimum value which is stored in bpp, which should be used and then check again, that it is not equal and only then use it. Could it be just as simple as this(or I simply misunderstand something here):

switch (conn_state->max_bpc) {
case 6 ... 7:

	bpp = 6 * 3;
...
default:
	return -EINVAL;
}

so here we set bpp(instead of pipe_bpp) to correct value or return EINVAL.
And then we simply assign pipe_bpp to minimum of those and return:

pipe_bpp = min(pipe_config->pipe_bpp, bpp);

return 0;

Also that way get bpp values also check to correspond to the ranges given in cases labels, while initial expression min(pipe_config->pipe_bpp, conn_state->max_bpc * 3) could possibly give 7 * 3 but not 6 * 3(as specified in "case 6 .. 7") for conn_state->max_bpc = 7.

So then there is no need in next additional assignment and check:

Quoted 78 lines
drivers/gpu/drm/i915/intel_display.c +2 -5
-	/* Clamp bpp to 8 on screens without EDID 1.4 */
-	if (info->bpc == 0 && bpp > 24) {
-		DRM_DEBUG_KMS("clamping display bpp (was %d) to
 default limit of 24\n",
-			      bpp);
-		pipe_config->pipe_bpp = 24;
+	if (bpp != pipe_config->pipe_bpp) {
+		DRM_DEBUG_KMS("Limiting display bpp to %d instead of

Edid bpp "

drivers/gpu/drm/i915/intel_display.c +1 -0
+			      "%d, requested bpp %d\n", bpp, 3 *

info->bpc,

drivers/gpu/drm/i915/intel_display.c +5 -2
+			      3 * conn_state->max_requested_bpc);
+		pipe_config->pipe_bpp = bpp;
 	}
+	return 0;
 }
 
 static int
@@ -10923,8 +10931,8 @@ compute_baseline_pipe_bpp(struct intel_crtc
 *crtc,
 		if (connector_state->crtc != &crtc->base)
 			continue;
 
-		connected_sink_compute_bpp(to_intel_connector(connec
 tor),
-					   pipe_config);
+		if (connected_sink_max_bpp(connector_state,
 pipe_config) < 0)
+			return -EINVAL;
drivers/gpu/drm/i915/intel_display.c +0 -0
 	}
 
 	return bpp;
drivers/gpu/drm/i915/intel_dp.c +4 -0
index 0855b9785f7b..863c8832fe8b 100644
@@ -5705,6 +5705,10 @@ intel_dp_add_properties(struct intel_dp
 *intel_dp, struct drm_connector *connect
 		intel_attach_force_audio_property(connector);
 
 	intel_attach_broadcast_rgb_property(connector);
+	if (HAS_GMCH_DISPLAY(dev_priv))
+		drm_connector_attach_max_bpc_property(connector, 6,
 10);
+	else if (INTEL_GEN(dev_priv) >= 5)
+		drm_connector_attach_max_bpc_property(connector, 6,
 12);
drivers/gpu/drm/i915/intel_dp.c +0 -0
 	if (intel_dp_is_edp(intel_dp)) {
 		u32 allowed_scalers;
drivers/gpu/drm/i915/intel_hdmi.c +5 -0
index 2c53efc463e6..3158ab085a30 100644
@@ -2103,11 +2103,16 @@ static const struct drm_encoder_funcs
 intel_hdmi_enc_funcs = {
 static void
 intel_hdmi_add_properties(struct intel_hdmi *intel_hdmi, struct
 drm_connector *connector)
 {
+	struct drm_i915_private *dev_priv = to_i915(connector->dev);
+
 	intel_attach_force_audio_property(connector);
 	intel_attach_broadcast_rgb_property(connector);
 	intel_attach_aspect_ratio_property(connector);
 	drm_connector_attach_content_type_property(connector);
 	connector->state->picture_aspect_ratio =
 HDMI_PICTURE_ASPECT_NONE;
+
+	if (!HAS_GMCH_DISPLAY(dev_priv))
+		drm_connector_attach_max_bpc_property(connector, 8,

12);
}

/*

Signature · 7 lines
Best Regards,

Lisovskiy Stanislav
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#3 lore raw

Re: [PATCH v12 2/2] drm/i915: Allow "max bpc" property to limit pipe_bpp

Quoted 101 lines · Stanislav
Quoted 67 lines · Radhakrishna Sripada

Use the newly added "max bpc" connector property to limit pipe bpp.

V3: Use drm_connector_state to access the "max bpc" property
V4: Initialize the drm property, add suuport to DP(Ville)
V5: Use the property in the connector and fix CI failure(Ville)
V6: Use the core function to attach max_bpc property, remove the redundant
clamping of pipe bpp based on connector info
V7: Fix Checkpatch warnings
V9: Cleanup connected_sink_max_bpp and fix initial value in DP(Ville)
V12: Fix debug message(Ville)

Cc Ville Syrjälä <[email protected]>
Cc Daniel Vetter <[email protected]>
Cc Rodrigo Vivi <[email protected]>
Cc Kishore Kadiyala <[email protected]>
Cc Manasi Navare <[email protected]>
Cc Stanislav Lisovskiy <[email protected]>
---
 drivers/gpu/drm/i915/intel_display.c | 48 +++++++++++++++++++++-----
----------
 drivers/gpu/drm/i915/intel_dp.c      |  4 +++
 drivers/gpu/drm/i915/intel_hdmi.c    |  5 ++++
 3 files changed, 37 insertions(+), 20 deletions(-)
drivers/gpu/drm/i915/intel_display.c +11 -13
index a145efba9157..a597c4410f5d 100644
@@ -10869,30 +10869,38 @@ static void
 intel_modeset_update_connector_atomic_state(struct drm_device *dev)
 	drm_connector_list_iter_end(&conn_iter);
 }
 
-static void
-connected_sink_compute_bpp(struct intel_connector *connector,
-			   struct intel_crtc_state *pipe_config)
+static int
+connected_sink_max_bpp(const struct drm_connector_state *conn_state,
+		       struct intel_crtc_state *pipe_config)
 {
-	const struct drm_display_info *info = &connector-
 >base.display_info;
-	int bpp = pipe_config->pipe_bpp;
+	int bpp;
+	struct drm_display_info *info = &conn_state->connector-
 >display_info;
 
-	DRM_DEBUG_KMS("[CONNECTOR:%d:%s] checking for sink bpp
 constrains\n",
-		      connector->base.base.id,
-		      connector->base.name);
+	bpp = min(pipe_config->pipe_bpp, conn_state->max_bpc * 3);
 
-	/* Don't use an invalid EDID bpc value */
-	if (info->bpc != 0 && info->bpc * 3 < bpp) {
-		DRM_DEBUG_KMS("clamping display bpp (was %d) to EDID
 reported max of %d\n",
-			      bpp, info->bpc * 3);
-		pipe_config->pipe_bpp = info->bpc * 3;
+	switch (conn_state->max_bpc) {
+	case 6 ... 7:
+		pipe_config->pipe_bpp = 6 * 3;
+	case 8 ... 9:
+		pipe_config->pipe_bpp = 8 * 3;

drivers/gpu/drm/i915/intel_display.c static void · line 10900

Quoted 10 lines
drivers/gpu/drm/i915/intel_display.c +9 -0
+		break;
+	case 10 ... 11:
+		pipe_config->pipe_bpp = 10 * 3;
+		break;
+	case 12:
+		pipe_config->pipe_bpp = 12 * 3;
+		break;
+	default:
+		return -EINVAL;
 	}

Why do we need this assignment here? I mean you have already determined the minimum value which is stored in bpp, which should be used and then check again, that it is not equal and only then use it. Could it be just as simple as this(or I simply misunderstand something here):

switch (conn_state->max_bpc) {
case 6 ... 7:

	bpp = 6 * 3;
...
default:
	return -EINVAL;
}

so here we set bpp(instead of pipe_bpp) to correct value or return EINVAL.
And then we simply assign pipe_bpp to minimum of those and return:

pipe_bpp = min(pipe_config->pipe_bpp, bpp);

return 0;

Quoted 7 lines

Also that way get bpp values also check to correspond to the ranges given in cases labels, while initial expression min(pipe_config->pipe_bpp, conn_state->max_bpc * 3) could possibly give 7 * 3 but not 6 * 3(as specified in "case 6 .. 7") for conn_state->max_bpc = 7.

So then there is no need in next additional assignment and check:

This actually simplifies. I was trying to modify already existing code. This definitely looks cleaner. Will try these changes in the next rev.

Thanks,
Radhakrishna(RK) Sripada

Quoted 78 lines
Quoted 78 lines
drivers/gpu/drm/i915/intel_display.c +2 -5
-	/* Clamp bpp to 8 on screens without EDID 1.4 */
-	if (info->bpc == 0 && bpp > 24) {
-		DRM_DEBUG_KMS("clamping display bpp (was %d) to
 default limit of 24\n",
-			      bpp);
-		pipe_config->pipe_bpp = 24;
+	if (bpp != pipe_config->pipe_bpp) {
+		DRM_DEBUG_KMS("Limiting display bpp to %d instead of

Edid bpp "

drivers/gpu/drm/i915/intel_display.c +1 -0
+			      "%d, requested bpp %d\n", bpp, 3 *

info->bpc,

drivers/gpu/drm/i915/intel_display.c +5 -2
+			      3 * conn_state->max_requested_bpc);
+		pipe_config->pipe_bpp = bpp;
 	}
+	return 0;
 }
 
 static int
@@ -10923,8 +10931,8 @@ compute_baseline_pipe_bpp(struct intel_crtc
 *crtc,
 		if (connector_state->crtc != &crtc->base)
 			continue;
 
-		connected_sink_compute_bpp(to_intel_connector(connec
 tor),
-					   pipe_config);
+		if (connected_sink_max_bpp(connector_state,
 pipe_config) < 0)
+			return -EINVAL;
drivers/gpu/drm/i915/intel_display.c +0 -0
 	}
 
 	return bpp;
drivers/gpu/drm/i915/intel_dp.c +4 -0
index 0855b9785f7b..863c8832fe8b 100644
@@ -5705,6 +5705,10 @@ intel_dp_add_properties(struct intel_dp
 *intel_dp, struct drm_connector *connect
 		intel_attach_force_audio_property(connector);
 
 	intel_attach_broadcast_rgb_property(connector);
+	if (HAS_GMCH_DISPLAY(dev_priv))
+		drm_connector_attach_max_bpc_property(connector, 6,
 10);
+	else if (INTEL_GEN(dev_priv) >= 5)
+		drm_connector_attach_max_bpc_property(connector, 6,
 12);
drivers/gpu/drm/i915/intel_dp.c +0 -0
 	if (intel_dp_is_edp(intel_dp)) {
 		u32 allowed_scalers;
drivers/gpu/drm/i915/intel_hdmi.c +5 -0
index 2c53efc463e6..3158ab085a30 100644
@@ -2103,11 +2103,16 @@ static const struct drm_encoder_funcs
 intel_hdmi_enc_funcs = {
 static void
 intel_hdmi_add_properties(struct intel_hdmi *intel_hdmi, struct
 drm_connector *connector)
 {
+	struct drm_i915_private *dev_priv = to_i915(connector->dev);
+
 	intel_attach_force_audio_property(connector);
 	intel_attach_broadcast_rgb_property(connector);
 	intel_attach_aspect_ratio_property(connector);
 	drm_connector_attach_content_type_property(connector);
 	connector->state->picture_aspect_ratio =
 HDMI_PICTURE_ASPECT_NONE;
+
+	if (!HAS_GMCH_DISPLAY(dev_priv))
+		drm_connector_attach_max_bpc_property(connector, 8,

12);
}

Quoted 5 lines
Quoted 1 line

/*

Signature · 3 lines
Best Regards,

Lisovskiy Stanislav

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#4 lore raw

✗ Fi.CI.SPARSE: warning for series starting with [v12,1/2] drm: Add connector property to limit max bpc

In reply to Radhakrishna Sripada
== Series Details ==

== Series Details ==

Series: series starting with [v12,1/2] drm: Add connector property to limit max bpc
URL : https://patchwork.freedesktop.org/series/50837/
State : warning

== Summary ==

$ dim sparse origin/drm-tip
Sparse version: v0.5.2
Commit: drm: Add connector property to limit max bpc
+drivers/gpu/drm/drm_atomic.c:397:34: warning: expression using sizeof(void)
+drivers/gpu/drm/drm_atomic.c:397:34: warning: expression using sizeof(void)

Commit: drm/i915: Allow "max bpc" property to limit pipe_bpp +drivers/gpu/drm/i915/intel_display.c:10801:15: warning: expression using sizeof(void) +drivers/gpu/drm/i915/intel_display.c:10801:15: warning: expression using sizeof(void)

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#5 lore raw

✗ Fi.CI.BAT: failure for series starting with [v12,1/2] drm: Add connector property to limit max bpc

In reply to Radhakrishna Sripada
== Series Details ==

== Series Details ==

Series: series starting with [v12,1/2] drm: Add connector property to limit max bpc
URL : https://patchwork.freedesktop.org/series/50837/
State : failure

== Summary ==

= CI Bug Log - changes from CI_DRM_4966 -> Patchwork_10419 =

== Summary - FAILURE ==

Serious unknown changes coming with Patchwork_10419 absolutely need to be verified manually.

If you think the reported changes have nothing to do with the changes introduced in Patchwork_10419, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.

External URL: https://patchwork.freedesktop.org/api/1.0/series/50837/revisions/1/mbox/

== Possible new issues ==

Here are the unknown changes that may have been introduced in Patchwork_10419:

=== IGT changes ===

    ==== Possible regressions ====

    igt@kms_chamelium@dp-edid-read:
      fi-kbl-7500u:       PASS -> WARN

== Known issues ==

Here are the changes found in Patchwork_10419 that come from known issues:

=== IGT changes ===

    ==== Issues hit ====

    igt@gem_exec_suspend@basic-s3:
      fi-blb-e6850:       PASS -> INCOMPLETE (fdo#107718)

    igt@kms_flip@basic-plain-flip:
      fi-ilk-650:         PASS -> DMESG-WARN (fdo#106387)

    igt@kms_pipe_crc_basic@read-crc-pipe-a:
      fi-byt-clapper:     PASS -> FAIL (fdo#107362)

    
    ==== Possible fixes ====

    igt@gem_exec_suspend@basic-s3:
      fi-cfl-8109u:       INCOMPLETE (fdo#107187, fdo#108126) -> PASS

    igt@kms_pipe_crc_basic@hang-read-crc-pipe-b:
      fi-byt-clapper:     FAIL (fdo#103191, fdo#107362) -> PASS +1

    igt@kms_pipe_crc_basic@nonblocking-crc-pipe-b:
      fi-byt-clapper:     FAIL (fdo#107362) -> PASS

fdo#103191 https://bugs.freedesktop.org/show_bug.cgi?id=103191
fdo#106387 https://bugs.freedesktop.org/show_bug.cgi?id=106387
fdo#107187 https://bugs.freedesktop.org/show_bug.cgi?id=107187
fdo#107362 https://bugs.freedesktop.org/show_bug.cgi?id=107362
fdo#107718 https://bugs.freedesktop.org/show_bug.cgi?id=107718
fdo#108126 https://bugs.freedesktop.org/show_bug.cgi?id=108126

== Participating hosts (46 -> 41) ==

Missing (5): fi-ctg-p8600 fi-bsw-cyan fi-ilk-m540 fi-byt-squawks fi-icl-u2

== Build changes ==

* Linux: CI_DRM_4966 -> Patchwork_10419

CI_DRM_4966: 0ac03a984dd32a77b02eabb6f0ef110ec5b5bdf2 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4673: 54cb1aeb4e50dea9f3abae632e317875d147c4ab @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_10419: 9edc443b3a834eced3cc490a3a8b2bb03443c671 @ git://anongit.freedesktop.org/gfx-ci/linux

== Linux commits ==

9edc443b3a83 drm/i915: Allow "max bpc" property to limit pipe_bpp 6a34b028e864 drm: Add connector property to limit max bpc

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_10419/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx