drm: Add connector property to limit max bpc
Subsystems (3)
PATCH v7 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
--- drivers/gpu/drm/drm_atomic.c | 24 ++++++++++++++++++++++++ drivers/gpu/drm/drm_atomic_helper.c | 4 ++++ drivers/gpu/drm/drm_atomic_uapi.c | 4 ++++ drivers/gpu/drm/drm_connector.c | 33 +++++++++++++++++++++++++++++++++ include/drm/drm_connector.h | 20 ++++++++++++++++++++ 5 files changed, 85 insertions(+)
drivers/gpu/drm/drm_atomic.c +24 -0
@@ -390,6 +390,7 @@ 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; +struct drm_display_info *info = &connector->display_info;if ((connector->connector_type !=DRM_MODE_CONNECTOR_WRITEBACK ) || !writeback_job)return 0 ;
@@ -400,6 +401,29 @@ static int drm_atomic_connector_check(struct drm_connector *connector,return -EINVAL ; } +if (connector->max_bpc_property) { +if (info->bpc !=0 && info->bpc < state->max_requested_bpc) { +/* Don't use an invalid EDID bpc value */ +DRM_DEBUG_ATOMIC ("[CONNECTOR:%d:%s] Clamping requested " +"display bpp (was %d) to EDID reported " +"max of %d\n" , connector->base.id, + connector->name, + state->max_requested_bpc, info->bpc); + state->max_bpc = info->bpc; + }else if (info->bpc !=0 ) { + state->max_bpc = state->max_requested_bpc; + }else { +/* Clamp bpc to 8 on screens witout EDID 1.4 */ +DRM_DEBUG_ATOMIC ("[CONNECTOR:%d:%s] Clamping requested " +"display bpp (was %d) to default limit " +"of 24\n" , connector->base.id, + connector->name, state->max_requested_bpc); + state->max_bpc =8 ; + } + }else { + state->max_bpc = info->bpc ? info->bpc :8 ; + } +if (state->crtc) crtc_state =drm_atomic_get_existing_crtc_state (state->state, state->crtc);
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 +33 -0
@@ -1583,6 +1583,39 @@ 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; + +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. +*/ +unsigned int max_requested_bpc; + +/** +* @max_bpc: Connector max_bpc based on the requested max_bpc property +* and the connector bpc limitations obtained from edid. +*/ +unsigned int 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 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v7 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
--- drivers/gpu/drm/i915/intel_display.c | 49 ++++++++++++++++++++---------------- drivers/gpu/drm/i915/intel_dp.c | 5 ++++ drivers/gpu/drm/i915/intel_hdmi.c | 5 ++++ 3 files changed, 38 insertions(+), 21 deletions(-)
drivers/gpu/drm/i915/intel_display.c +28 -21
@@ -10845,29 +10845,37 @@ static void intel_modeset_update_connector_atomic_state(struct drm_device *dev) }static void -connected_sink_compute_bpp (struct intel_connector *connector, -struct intel_crtc_state *pipe_config) +connected_sink_max_bpp (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; - -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 ; +if (pipe_config->pipe_bpp < conn_state->max_bpc *3 ) { + conn_state->max_bpc = pipe_config->pipe_bpp /3 ; +return ; } -/* 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 ; +switch (conn_state->max_bpc) { +case 8 : +case 9 : + pipe_config->pipe_bpp =8 *3 ; +break ; +case 10 : +case 11 : + pipe_config->pipe_bpp =10 *3 ; +break ; +case 12 : +case 13 : +case 14 : +case 15 : + pipe_config->pipe_bpp =12 *3 ; +break ; +case 16 : + pipe_config->pipe_bpp =16 *3 ; +break ; +default : +break ; } + +DRM_DEBUG_KMS ("Limiting display bpp to %d\n" , pipe_config->pipe_bpp); } static int
@@ -10898,8 +10906,7 @@ 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); +connected_sink_max_bpp (connector_state, pipe_config); }return bpp;
drivers/gpu/drm/i915/intel_dp.c +5 -0
@@ -5719,6 +5719,11 @@ 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 ((IS_G4X (dev_priv) ||IS_VALLEYVIEW (dev_priv) || +IS_CHERRYVIEW (dev_priv))) +drm_connector_attach_max_bpc_property (connector,8 ,10 ); +else if (INTEL_GEN (dev_priv) >=5 ) +drm_connector_attach_max_bpc_property (connector,8 ,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 [v7,1/2] drm: Add connector property to limit max bpc
In reply to Radhakrishna Sripada== Series Details ==
== Series Details ==
Series: series starting with [v7,1/2] drm: Add connector property to limit max bpc
URL : https://patchwork.freedesktop.org/series/49857/
State : warning
== Summary ==
$ dim sparse origin/drm-tip
Commit: drm: Add connector property to limit max bpc
+ ^~~~~~~~~~
+ ~~~~~~~~~~^~~~~~~~
+drivers/gpu/drm/drm_atomic.c:391:25: note: ‘crtc_state’ was declared here
+drivers/gpu/drm/drm_atomic.c:431:38: warning: ‘crtc_state’ may be used uninitialized in this function [-Wmaybe-uninitialized]
+drivers/gpu/drm/drm_atomic.c: In function ‘drm_atomic_check_only’:
+ if (writeback_job->fb && !crtc_state->active) {
+ struct drm_crtc_state *crtc_state;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 [v7,1/2] drm: Add connector property to limit max bpc
In reply to Radhakrishna Sripada== Series Details ==
== Series Details ==
Series: series starting with [v7,1/2] drm: Add connector property to limit max bpc
URL : https://patchwork.freedesktop.org/series/49857/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4839 -> Patchwork_10214 =
== Summary - SUCCESS ==
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/49857/revisions/1/mbox/
== Known issues ==
Here are the changes found in Patchwork_10214 that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@drv_module_reload@basic-reload-inject:
fi-bxt-dsi: PASS -> DMESG-WARN (fdo#105538, fdo#107821)
igt@kms_pipe_crc_basic@nonblocking-crc-pipe-a-frame-sequence:
fi-byt-clapper: PASS -> FAIL (fdo#107362, fdo#103191)
igt@kms_pipe_crc_basic@nonblocking-crc-pipe-c-frame-sequence:
fi-glk-dsi: PASS -> DMESG-WARN (fdo#105538) +26
igt@kms_pipe_crc_basic@read-crc-pipe-c-frame-sequence:
fi-bxt-dsi: PASS -> DMESG-WARN (fdo#105538) +25
igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a:
fi-bdw-samus: NOTRUN -> INCOMPLETE (fdo#107773)
igt@kms_psr@primary_page_flip:
fi-kbl-7560u: PASS -> FAIL (fdo#107336)
==== Possible fixes ====
igt@gem_exec_suspend@basic-s3:
fi-bdw-samus: INCOMPLETE (fdo#107773) -> PASS
igt@kms_psr@primary_page_flip:
fi-skl-6600u: FAIL (fdo#107336) -> PASS fdo#103191 https://bugs.freedesktop.org/show_bug.cgi?id=103191
fdo#105538 https://bugs.freedesktop.org/show_bug.cgi?id=105538
fdo#107336 https://bugs.freedesktop.org/show_bug.cgi?id=107336
fdo#107362 https://bugs.freedesktop.org/show_bug.cgi?id=107362
fdo#107773 https://bugs.freedesktop.org/show_bug.cgi?id=107773
fdo#107821 https://bugs.freedesktop.org/show_bug.cgi?id=107821
== Participating hosts (51 -> 46) ==
Missing (5): fi-ctg-p8600 fi-ilk-m540 fi-byt-squawks fi-bsw-cyan fi-hsw-4200u
== Build changes ==
* Linux: CI_DRM_4839 -> Patchwork_10214
CI_DRM_4839: d961d9f36347a91ae8f607cc8fe64ac1e5c3c349 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4646: d409cc6f234fbc0122c64be27ba85b5603658de5 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_10214: b24491422784c37c2431627715fd0588ce2fcb75 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
b24491422784 drm/i915: Allow "max bpc" property to limit pipe_bpp 820279be6c59 drm: Add connector property to limit max bpc
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_10214/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx