drm: Add connector property to limit max bpc
Subsystems (3)
PATCH v11 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.
--- 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 | 34 ++++++++++++++++++++++++++++++++++ include/drm/drm_connector.h | 20 ++++++++++++++++++++ 5 files changed, 67 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
@@ -639,6 +639,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
@@ -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 +34 -0
@@ -1583,6 +1583,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)
@@ -1201,6 +1219,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 v11 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)
--- 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
@@ -10853,30 +10853,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 requested " +"bpp %d, Edid bpp %d\n" , bpp,3 * info->bpc, +3 * conn_state->max_requested_bpc); + pipe_config->pipe_bpp = bpp; } +return 0 ; } static int
@@ -10907,8 +10915,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
@@ -5719,6 +5719,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
@@ -2109,11 +2109,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
Patchwork
CI✗ Fi.CI.SPARSE: warning for series starting with [v11,1/2] drm: Add connector property to limit max bpc
In reply to Radhakrishna Sripada== Series Details ==
== Series Details ==
Series: series starting with [v11,1/2] drm: Add connector property to limit max bpc
URL : https://patchwork.freedesktop.org/series/50295/
State : warning
== Summary ==
$ dim sparse origin/drm-tip 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:10863:15: warning: expression using sizeof(void) +drivers/gpu/drm/i915/intel_display.c:10863:15: warning: expression using sizeof(void)
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for series starting with [v11,1/2] drm: Add connector property to limit max bpc
In reply to Radhakrishna Sripada== Series Details ==
== Series Details ==
Series: series starting with [v11,1/2] drm: Add connector property to limit max bpc
URL : https://patchwork.freedesktop.org/series/50295/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4902 -> Patchwork_10299 =
== Summary - SUCCESS ==
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/50295/revisions/1/mbox/
== Known issues ==
Here are the changes found in Patchwork_10299 that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@kms_frontbuffer_tracking@basic:
fi-byt-clapper: PASS -> FAIL (fdo#103167)
igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a:
fi-byt-clapper: PASS -> FAIL (fdo#107362, fdo#103191) +1
fi-bdw-samus: NOTRUN -> INCOMPLETE (fdo#107773)
==== Possible fixes ====
igt@gem_exec_suspend@basic-s4-devices:
fi-bdw-samus: INCOMPLETE -> PASS
igt@kms_pipe_crc_basic@nonblocking-crc-pipe-a-frame-sequence:
fi-byt-clapper: FAIL (fdo#107362, fdo#103191) -> PASS
igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a:
fi-icl-u: INCOMPLETE (fdo#107713) -> PASS fdo#103167 https://bugs.freedesktop.org/show_bug.cgi?id=103167
fdo#103191 https://bugs.freedesktop.org/show_bug.cgi?id=103191
fdo#107362 https://bugs.freedesktop.org/show_bug.cgi?id=107362
fdo#107713 https://bugs.freedesktop.org/show_bug.cgi?id=107713
fdo#107773 https://bugs.freedesktop.org/show_bug.cgi?id=107773
== Participating hosts (43 -> 37) ==
Missing (6): fi-ilk-m540 fi-byt-squawks fi-bsw-cyan fi-ctg-p8600 fi-pnv-d510 fi-skl-6700hq
== Build changes ==
* Linux: CI_DRM_4902 -> Patchwork_10299
CI_DRM_4902: 7aaff646f1887301c8719e03c6b16b21ee1e65ee @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4656: 6f5d6b06a90526b4a8de93398f3c2dd537b3b7ba @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_10299: 1debc5acc8ca38f7830e6fb6d4d39346226a65a6 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
1debc5acc8ca drm/i915: Allow "max bpc" property to limit pipe_bpp 8ba47952e9e5 drm: Add connector property to limit max bpc
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_10299/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.IGT: success for series starting with [v11,1/2] drm: Add connector property to limit max bpc
In reply to Radhakrishna Sripada== Series Details ==
== Series Details ==
Series: series starting with [v11,1/2] drm: Add connector property to limit max bpc
URL : https://patchwork.freedesktop.org/series/50295/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4902_full -> Patchwork_10299_full =
== Summary - WARNING ==
Minor unknown changes coming with Patchwork_10299_full need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_10299_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_10299_full:
=== IGT changes ===
==== Warnings ====
igt@perf_pmu@rc6:
shard-kbl: SKIP -> PASS== Known issues ==
Here are the changes found in Patchwork_10299_full that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@gem_exec_await@wide-contexts:
shard-kbl: PASS -> FAIL (fdo#100007)
igt@gem_fenced_exec_thrash@no-spare-fences:
shard-snb: NOTRUN -> INCOMPLETE (fdo#105411)
igt@kms_busy@extended-modeset-hang-newfb-with-reset-render-b:
shard-kbl: PASS -> DMESG-WARN (fdo#107956) +1
igt@kms_setmode@basic:
shard-snb: NOTRUN -> FAIL (fdo#99912)
==== Possible fixes ====
igt@kms_busy@extended-modeset-hang-newfb-render-a:
shard-kbl: DMESG-WARN (fdo#107956) -> PASS
igt@kms_cursor_legacy@cursorb-vs-flipb-atomic-transitions-varying-size:
shard-glk: DMESG-WARN (fdo#105763, fdo#106538) -> PASS +1
igt@kms_flip@flip-vs-expired-vblank:
shard-glk: FAIL (fdo#105363, fdo#102887) -> PASS
igt@kms_frontbuffer_tracking@fbc-2p-primscrn-indfb-msflip-blt:
shard-glk: DMESG-FAIL (fdo#106538) -> PASS
igt@pm_rpm@modeset-stress-extra-wait:
shard-apl: INCOMPLETE (fdo#103927) -> PASS fdo#100007 https://bugs.freedesktop.org/show_bug.cgi?id=100007
fdo#102887 https://bugs.freedesktop.org/show_bug.cgi?id=102887
fdo#103927 https://bugs.freedesktop.org/show_bug.cgi?id=103927
fdo#105363 https://bugs.freedesktop.org/show_bug.cgi?id=105363
fdo#105411 https://bugs.freedesktop.org/show_bug.cgi?id=105411
fdo#105763 https://bugs.freedesktop.org/show_bug.cgi?id=105763
fdo#106538 https://bugs.freedesktop.org/show_bug.cgi?id=106538
fdo#107956 https://bugs.freedesktop.org/show_bug.cgi?id=107956
fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912
== Participating hosts (6 -> 5) ==
Missing (1): shard-skl
== Build changes ==
* Linux: CI_DRM_4902 -> Patchwork_10299
CI_DRM_4902: 7aaff646f1887301c8719e03c6b16b21ee1e65ee @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4656: 6f5d6b06a90526b4a8de93398f3c2dd537b3b7ba @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_10299: 1debc5acc8ca38f7830e6fb6d4d39346226a65a6 @ 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_10299/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx