drm: Add connector property to limit max bpc
Subsystems (3)
PATCH v13 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)
--- 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
@@ -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
@@ -650,6 +650,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
@@ -761,6 +761,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);
@@ -825,6 +827,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
@@ -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
@@ -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
PATCH v13 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)
V13: Remove the redundant check and simplify the check logic(Stan)
--- drivers/gpu/drm/i915/intel_display.c | 49 ++++++++++++++++++++---------------- drivers/gpu/drm/i915/intel_dp.c | 4 +++ drivers/gpu/drm/i915/intel_hdmi.c | 5 ++++ 3 files changed, 37 insertions(+), 21 deletions(-)
drivers/gpu/drm/i915/intel_display.c +28 -21
@@ -10791,30 +10791,37 @@ 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); - -/* 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: + bpp =6 *3 ; + case 8 ... 9: + bpp =8 *3 ; +break ; + case 10 ... 11: + bpp =10 *3 ; +break ; +case 12 : + 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, max platform bpp %d\n" , bpp, +3 * info->bpc,3 * conn_state->max_requested_bpc, + pipe_config->pipe_bpp); + pipe_config->pipe_bpp = bpp; } +return 0 ; } static int
@@ -10845,8 +10852,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
@@ -5735,6 +5735,10 @@ intel_dp_add_properties(struct intel_dp *intel_dp, struct drm_connector *connectintel_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
@@ -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 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v13 2/2] drm/i915: Allow "max bpc" property to limit pipe_bpp
Quoted 91 lines · Radhakrishna Sripada
Use the newly added "max bpc" connector property to limit pipe bpp.
V3: Use
drm_connector_stateto 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 attachmax_bpcproperty, remove the redundant
clamping of pipe bpp based on connector info
V7: Fix Checkpatch warnings
V9: Cleanupconnected_sink_max_bppand fix initial value in DP(Ville)
V12: Fix debug message(Ville)
V13: Remove the redundant check and simplify the check logic(Stan)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]>Signed-off-by Radhakrishna Sripada <[email protected]>--- drivers/gpu/drm/i915/intel_display.c | 49 ++++++++++++++++++++---- ------------ drivers/gpu/drm/i915/intel_dp.c | 4 +++ drivers/gpu/drm/i915/intel_hdmi.c | 5 ++++ 3 files changed, 37 insertions(+), 21 deletions(-)drivers/gpu/drm/i915/intel_display.c +21
-19@@ -10791,30 +10791,37 @@ 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); - -/* 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: + bpp =6 *3 ; + case 8 ... 9: + bpp =8 *3 ; +break ; + case 10 ... 11: + bpp =10 *3 ; +break ; +case 12 : + 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 ofEdid bpp "
drivers/gpu/drm/i915/intel_display.c +1
-0+ "%d, requested bpp %d, max platformbpp %d\n", bpp,
drivers/gpu/drm/i915/intel_display.c +1
-0+ 3 * info->bpc, 3 * conn_state-Quoted 1 line
max_requested_bpc,
drivers/gpu/drm/i915/intel_display.c static void intel_modeset_update_connector_atomic_state(struct drm_device *dev) · line 10824
Quoted 4 lines
drivers/gpu/drm/i915/intel_display.c +3
-0+ pipe_config->pipe_bpp); + pipe_config->pipe_bpp = bpp; } +return 0 ;
That is definitely simplier. However I think there is still one thing:
you now assign pipe_bpp to bpp always if they are not equal. However bpp(which is literally max_bpc) is supposed to limit pipe_bpp from above, not from below. What if pipe_bpp < bpp already, then condition will still be executed and then you'll get pipe_bpp set to higher value than it was supposed to.
So I guess the condition should be "if (bpp < pipe_config->pipe_bpp)" or simply do pipe_config->pipe_bpp = min(pipe_config->pipe_bpp, bpp) as I said in previous email.
Quoted 62 lines
}
static int
drivers/gpu/drm/i915/intel_display.c +2
-2@@ -10845,8 +10852,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@@ -5735,6 +5735,10 @@ intel_dp_add_properties(struct intel_dp *intel_dp, struct drm_connector *connectintel_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
-0if (intel_dp_is_edp (intel_dp)) {u32 allowed_scalers;drivers/gpu/drm/i915/intel_hdmi.c +5
-0@@ -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 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.SPARSE: warning for series starting with [v13,1/2] drm: Add connector property to limit max bpc
In reply to Radhakrishna Sripada== Series Details ==
== Series Details ==
Series: series starting with [v13,1/2] drm: Add connector property to limit max bpc
URL : https://patchwork.freedesktop.org/series/50900/
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 Okay!
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for series starting with [v13,1/2] drm: Add connector property to limit max bpc
In reply to Radhakrishna Sripada== Series Details ==
== Series Details ==
Series: series starting with [v13,1/2] drm: Add connector property to limit max bpc
URL : https://patchwork.freedesktop.org/series/50900/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4976 -> Patchwork_10435 =
== Summary - SUCCESS ==
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/50900/revisions/1/mbox/
== Known issues ==
Here are the changes found in Patchwork_10435 that come from known issues:
=== IGT changes ===
==== Possible fixes ====
igt@kms_flip@basic-flip-vs-modeset:
fi-glk-j4005: DMESG-WARN (fdo#106097) -> PASS
igt@kms_frontbuffer_tracking@basic:
fi-byt-clapper: FAIL (fdo#103167) -> PASS
igt@kms_pipe_crc_basic@read-crc-pipe-c:
fi-skl-6700k2: FAIL (fdo#103191, fdo#107362) -> PASS
igt@pm_rpm@module-reload:
fi-skl-6600u: INCOMPLETE (fdo#107807) -> PASS
fi-glk-j4005: FAIL -> PASS fdo#103167 https://bugs.freedesktop.org/show_bug.cgi?id=103167
fdo#103191 https://bugs.freedesktop.org/show_bug.cgi?id=103191
fdo#106097 https://bugs.freedesktop.org/show_bug.cgi?id=106097
fdo#107362 https://bugs.freedesktop.org/show_bug.cgi?id=107362
fdo#107807 https://bugs.freedesktop.org/show_bug.cgi?id=107807
== Participating hosts (45 -> 40) ==
Missing (5): fi-ctg-p8600 fi-bsw-cyan fi-ilk-m540 fi-byt-squawks fi-gdg-551
== Build changes ==
* Linux: CI_DRM_4976 -> Patchwork_10435
CI_DRM_4976: dec9886eff39d38332bb5ea438b9b053d6b2177c @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4674: 93871c6fb3c25e5d350c9faf36ded917174214de @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_10435: 56c2c661025dfc78b691ed033865b3f16c1fac47 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
56c2c661025d drm/i915: Allow "max bpc" property to limit pipe_bpp 295604b7ae15 drm: Add connector property to limit max bpc
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_10435/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 23 lines · Radhakrishna Sripada
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_bpcto satisfykms_properties
V3: Move the property todrm_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 theattach_propertyfunction to core(Ville)
V7: Fix checkpatch warnings
V8: Simplify the connector check code(Ville)
V9: Constdisplay_info(Ville)
V10,V11: Fix CI issues.
V12: Add the Kernel documentation(Daniel)
Quoted 9 lines
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]>Acked-by Daniel Vetter <[email protected]>Signed-off-by Radhakrishna Sripada <[email protected]>
Some links between the different parts of the kerneldoc would be good here. E.g. reference the function for setting up the property from the property documentation, and mentioned where it is stored. See
https://dri.freedesktop.org/docs/drm/doc-guide/kernel-doc.html#highlights-and-cross-references
for how this works. I can help you over irc with this if you want to. -Daniel
Quoted 166 lines
--- 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@@ -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@@ -650,6 +650,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@@ -761,6 +761,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);@@ -825,6 +827,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@@ -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@@ -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 · 1 line
2.9.3
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Patchwork
CI✗ Fi.CI.IGT: failure for series starting with [v13,1/2] drm: Add connector property to limit max bpc
In reply to Radhakrishna Sripada== Series Details ==
== Series Details ==
Series: series starting with [v13,1/2] drm: Add connector property to limit max bpc
URL : https://patchwork.freedesktop.org/series/50900/
State : failure
== Summary ==
= CI Bug Log - changes from CI_DRM_4976_full -> Patchwork_10435_full =
== Summary - FAILURE ==
Serious unknown changes coming with Patchwork_10435_full absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_10435_full, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
== Possible new issues ==
Here are the unknown changes that may have been introduced in Patchwork_10435_full:
=== IGT changes ===
==== Possible regressions ====
igt@kms_busy@extended-modeset-hang-oldfb-with-reset-render-b:
shard-kbl: PASS -> DMESG-WARN +1
==== Warnings ====
igt@perf_pmu@rc6:
shard-kbl: PASS -> SKIP== Known issues ==
Here are the changes found in Patchwork_10435_full that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@gem_cpu_reloc@full:
shard-skl: NOTRUN -> INCOMPLETE (fdo#108073)
igt@gem_exec_schedule@pi-ringfull-render:
shard-skl: NOTRUN -> FAIL (fdo#103158) +1
igt@gem_ppgtt@blt-vs-render-ctx0:
shard-skl: NOTRUN -> TIMEOUT (fdo#108039)
igt@gem_ppgtt@blt-vs-render-ctxn:
shard-kbl: PASS -> INCOMPLETE (fdo#103665, fdo#106023)
igt@gem_userptr_blits@readonly-unsync:
shard-skl: NOTRUN -> INCOMPLETE (fdo#108074)
igt@kms_busy@extended-modeset-hang-newfb-render-a:
shard-skl: NOTRUN -> DMESG-WARN (fdo#107956) +2
igt@kms_busy@extended-modeset-hang-newfb-with-reset-render-b:
shard-snb: NOTRUN -> DMESG-WARN (fdo#107956) +1
igt@kms_ccs@pipe-b-crc-sprite-planes-basic:
shard-skl: NOTRUN -> FAIL (fdo#105458)
igt@kms_chv_cursor_fail@pipe-c-256x256-top-edge:
shard-skl: NOTRUN -> FAIL (fdo#104671)
igt@kms_cursor_crc@cursor-128x42-onscreen:
shard-apl: PASS -> FAIL (fdo#103232) +1
igt@kms_cursor_crc@cursor-128x42-sliding:
shard-skl: NOTRUN -> FAIL (fdo#103232) +2
igt@kms_cursor_crc@cursor-64x64-suspend:
shard-apl: PASS -> FAIL (fdo#103232, fdo#103191)
igt@kms_fbcon_fbt@fbc:
shard-skl: NOTRUN -> FAIL (fdo#103833, fdo#105682)
igt@kms_fbcon_fbt@psr-suspend:
shard-skl: NOTRUN -> FAIL (fdo#107882) +1
igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-pwrite:
shard-skl: NOTRUN -> FAIL (fdo#103167) +2
igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-mmap-cpu:
shard-apl: PASS -> FAIL (fdo#103167)
igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-onoff:
shard-glk: PASS -> FAIL (fdo#103167) +2
igt@kms_frontbuffer_tracking@fbcpsr-1p-indfb-fliptrack:
shard-skl: NOTRUN -> FAIL (fdo#105682) +1
igt@kms_plane@pixel-format-pipe-b-planes:
shard-skl: NOTRUN -> DMESG-FAIL (fdo#103166, fdo#106885)
igt@kms_plane_alpha_blend@pipe-a-alpha-7efc:
shard-skl: NOTRUN -> FAIL (fdo#108145) +6
igt@kms_plane_alpha_blend@pipe-c-alpha-7efc:
shard-skl: NOTRUN -> FAIL (fdo#108146) +2
igt@kms_plane_multiple@atomic-pipe-c-tiling-yf:
shard-apl: PASS -> FAIL (fdo#103166) +2
igt@kms_rotation_crc@exhaust-fences:
shard-skl: NOTRUN -> DMESG-WARN (fdo#105748)
igt@kms_setmode@basic:
shard-apl: PASS -> FAIL (fdo#99912)
shard-skl: NOTRUN -> FAIL (fdo#99912)
igt@kms_sysfs_edid_timing:
shard-skl: NOTRUN -> FAIL (fdo#100047)
igt@prime_vgem@basic-busy-default:
shard-glk: PASS -> DMESG-WARN (fdo#105763, fdo#106538) +1
==== Possible fixes ====
igt@kms_ccs@pipe-b-crc-sprite-planes-basic:
shard-glk: FAIL (fdo#108145) -> PASS
igt@kms_cursor_crc@cursor-256x256-random:
shard-apl: FAIL (fdo#103232) -> PASS
igt@kms_cursor_legacy@2x-long-cursor-vs-flip-legacy:
shard-hsw: FAIL (fdo#105767) -> PASS
igt@kms_cursor_legacy@cursorb-vs-flipb-toggle:
shard-glk: DMESG-WARN (fdo#105763, fdo#106538) -> PASS
igt@kms_flip@plain-flip-fb-recreate-interruptible:
shard-skl: FAIL (fdo#100368) -> PASS
igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-mmap-gtt:
shard-apl: FAIL (fdo#103167) -> PASS +1
igt@kms_frontbuffer_tracking@fbc-2p-primscrn-spr-indfb-onoff:
shard-glk: FAIL (fdo#103167) -> PASS +6
igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a:
shard-skl: INCOMPLETE (fdo#104108, fdo#107773) -> PASS +2
igt@kms_plane@plane-position-covered-pipe-a-planes:
shard-glk: FAIL (fdo#103166) -> PASS +1
igt@kms_plane_multiple@atomic-pipe-a-tiling-x:
shard-apl: FAIL (fdo#103166) -> PASS +1
igt@kms_setmode@basic:
shard-kbl: FAIL (fdo#99912) -> PASS fdo#100047 https://bugs.freedesktop.org/show_bug.cgi?id=100047
fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#103158 https://bugs.freedesktop.org/show_bug.cgi?id=103158
fdo#103166 https://bugs.freedesktop.org/show_bug.cgi?id=103166
fdo#103167 https://bugs.freedesktop.org/show_bug.cgi?id=103167
fdo#103191 https://bugs.freedesktop.org/show_bug.cgi?id=103191
fdo#103232 https://bugs.freedesktop.org/show_bug.cgi?id=103232
fdo#103665 https://bugs.freedesktop.org/show_bug.cgi?id=103665
fdo#103833 https://bugs.freedesktop.org/show_bug.cgi?id=103833
fdo#104108 https://bugs.freedesktop.org/show_bug.cgi?id=104108
fdo#104671 https://bugs.freedesktop.org/show_bug.cgi?id=104671
fdo#105458 https://bugs.freedesktop.org/show_bug.cgi?id=105458
fdo#105682 https://bugs.freedesktop.org/show_bug.cgi?id=105682
fdo#105748 https://bugs.freedesktop.org/show_bug.cgi?id=105748
fdo#105763 https://bugs.freedesktop.org/show_bug.cgi?id=105763
fdo#105767 https://bugs.freedesktop.org/show_bug.cgi?id=105767
fdo#106023 https://bugs.freedesktop.org/show_bug.cgi?id=106023
fdo#106538 https://bugs.freedesktop.org/show_bug.cgi?id=106538
fdo#106885 https://bugs.freedesktop.org/show_bug.cgi?id=106885
fdo#107773 https://bugs.freedesktop.org/show_bug.cgi?id=107773
fdo#107882 https://bugs.freedesktop.org/show_bug.cgi?id=107882
fdo#107956 https://bugs.freedesktop.org/show_bug.cgi?id=107956
fdo#108039 https://bugs.freedesktop.org/show_bug.cgi?id=108039
fdo#108073 https://bugs.freedesktop.org/show_bug.cgi?id=108073
fdo#108074 https://bugs.freedesktop.org/show_bug.cgi?id=108074
fdo#108145 https://bugs.freedesktop.org/show_bug.cgi?id=108145
fdo#108146 https://bugs.freedesktop.org/show_bug.cgi?id=108146
fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912
== Participating hosts (6 -> 6) ==
No changes in participating hosts
== Build changes ==
* Linux: CI_DRM_4976 -> Patchwork_10435
CI_DRM_4976: dec9886eff39d38332bb5ea438b9b053d6b2177c @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4674: 93871c6fb3c25e5d350c9faf36ded917174214de @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_10435: 56c2c661025dfc78b691ed033865b3f16c1fac47 @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_10435/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx