drm/dp, i915, nouveau: Cleanup nouveau HPD and add DP features from i915
Subsystems (5)
Lyude Paul
maintainerv4 cover drm/dp, i915, nouveau: Cleanup nouveau HPD and add DP features from i915
Most of the reason I'm asking for an RFC here is because this code pulls a lot of code out of i915 and into shared DP helpers.
Anyway-nouveau's HPD related code has been collecting dust for a while. Other then the occasional runtime PM related and MST related fixes, we're missing a lot of nice things that have been added to DRM since this was originally written. Additionally, the code is just really unoptimized in general:
* We handle connector probing in the same context that we handle short IRQs in for DP, which means connector probing could potentially block ESI handling for MST
* When we receive a hotplug event from a connector, we reprobe every single connector instead of just the connector that was hotplugged
* Additionally because of the above reason, combined with the fact I had the bad idea of reusing some of the MST locks when I last rewrote nouveau's DP MST detection, trying to handle any other events that require short HPD IRQs is a bit awkward to actually implement.
* We don't actually properly check whether EDIDs change or not when reprobing, which means we basically send out a hotplug event every single time we receive one even if nothing has changed
Additionally, the code for handling DP that we have in nouveau is also quite unoptimized in general, doesn't use a lot of helpers that have been added since it was written, and is also missing quite a number of features:
* Downstream port capability probing
* Extended DPRX cap parsing
* SINK_COUNT handling for hpd on dongles
Luckily for us - all of these are implemented in i915 already. Since there's no reason for us to reinvent the wheel, and having more shared code is always nice, I decided to take the opportunity to extract the code for all of these features from i915 into a set of core DP helpers, which both i915 and nouveau (and hopefully other drivers in the future) can use.
As well, this patch series also addesses the other general connector probing related issues I mentioned above, along with rewriting how we handle MST probing so we don't hit any surprise locking design issues in the future.
As a note - most of this work is motivated by the fact that I'm planning on adding max_bpc/output_bpc prop support, DSC support (for both MST and SST, along with proper helpers for handling bandwidth limitations and DSC), and fallback link retraining. I figured I might as clean this code up and implement missing DP features like the ones mentioned here before moving on to those tasks.
Lyude Paul (20):
drm/nouveau/kms: Fix some indenting in nouveau_dp_detect() drm/nouveau/kms/nv50-: Remove open-coded drm_dp_read_desc() drm/nouveau/kms/nv50-: Just use drm_dp_dpcd_read() in nouveau_dp.c drm/nouveau/kms/nv50-: Use macros for DP registers in nouveau_dp.c drm/nouveau/kms: Don't clear DP_MST_CTRL DPCD in nv50_mstm_new() drm/nouveau/kms: Search for encoders' connectors properly drm/nouveau/kms/nv50-: Use drm_dp_dpcd_(readb|writeb)() in
nv50_sor_disable()
drm/nouveau/kms/nv50-: Refactor and cleanup DP HPD handling drm/i915/dp: Extract drm_dp_has_mst()
drm/nouveau/kms: Use new drm_dp_has_mst() helper for checking MST caps drm/nouveau/kms: Move drm_dp_cec_unset_edid() into
nouveau_connector_detect()
drm/nouveau/kms: Only use hpd_work for reprobing in HPD paths drm/i915/dp: Extract drm_dp_downstream_read_info() drm/nouveau/kms/nv50-: Use downstream DP clock limits for mode
validation
drm/i915/dp: Extract drm_dp_has_sink_count()
drm/i915/dp: Extract drm_dp_get_sink_count() drm/nouveau/kms/nv50-: Add support for DP_SINK_COUNT drm/nouveau/kms: Don't change EDID when it hasn't actually changed drm/i915/dp: Extract drm_dp_read_dpcd_caps() drm/nouveau/kms: Start using drm_dp_read_dpcd_caps()
drivers/gpu/drm/drm_dp_helper.c | 167 +++++++++++ drivers/gpu/drm/i915/display/intel_dp.c | 124 ++------ drivers/gpu/drm/i915/display/intel_dp.h | 1 - drivers/gpu/drm/i915/display/intel_lspcon.c | 2 +- drivers/gpu/drm/nouveau/dispnv04/dac.c | 2 +- drivers/gpu/drm/nouveau/dispnv04/dfp.c | 7 +- drivers/gpu/drm/nouveau/dispnv04/disp.c | 24 +- drivers/gpu/drm/nouveau/dispnv04/disp.h | 4 + drivers/gpu/drm/nouveau/dispnv04/tvnv04.c | 2 +- drivers/gpu/drm/nouveau/dispnv04/tvnv17.c | 2 +- drivers/gpu/drm/nouveau/dispnv50/disp.c | 305 +++++++++++--------- drivers/gpu/drm/nouveau/nouveau_connector.c | 132 ++++----- drivers/gpu/drm/nouveau/nouveau_connector.h | 1 + drivers/gpu/drm/nouveau/nouveau_display.c | 72 ++++- drivers/gpu/drm/nouveau/nouveau_display.h | 3 +- drivers/gpu/drm/nouveau/nouveau_dp.c | 211 +++++++++++--- drivers/gpu/drm/nouveau/nouveau_drm.c | 4 +- drivers/gpu/drm/nouveau/nouveau_drv.h | 2 + drivers/gpu/drm/nouveau/nouveau_encoder.h | 48 ++- include/drm/drm_dp_helper.h | 15 +- include/drm/drm_dp_mst_helper.h | 22 ++ 21 files changed, 761 insertions(+), 389 deletions(-)
Signature · 1 line
2.26.2
Lyude Paul
maintainerRFC v4 1/20 drm/nouveau/kms: Fix some indenting in nouveau_dp_detect()
--- drivers/gpu/drm/nouveau/nouveau_dp.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/nouveau/nouveau_dp.c +4 -4
@@ -76,10 +76,10 @@ nouveau_dp_detect(struct nouveau_encoder *nv_encoder) nv_encoder->dp.link_nr = dpcd[2 ] &DP_MAX_LANE_COUNT_MASK ;NV_DEBUG (drm,"display: %dx%d dpcd 0x%02x\n" , - nv_encoder->dp.link_nr, nv_encoder->dp.link_bw, dpcd[0 ]); + nv_encoder->dp.link_nr, nv_encoder->dp.link_bw, dpcd[0 ]);NV_DEBUG (drm,"encoder: %dx%d\n" , - nv_encoder->dcb->dpconf.link_nr, - nv_encoder->dcb->dpconf.link_bw); + nv_encoder->dcb->dpconf.link_nr, + nv_encoder->dcb->dpconf.link_bw);if (nv_encoder->dcb->dpconf.link_nr < nv_encoder->dp.link_nr) nv_encoder->dp.link_nr = nv_encoder->dcb->dpconf.link_nr;
@@ -87,7 +87,7 @@ nouveau_dp_detect(struct nouveau_encoder *nv_encoder) nv_encoder->dp.link_bw = nv_encoder->dcb->dpconf.link_bw;NV_DEBUG (drm,"maximum: %dx%d\n" , - nv_encoder->dp.link_nr, nv_encoder->dp.link_bw); + nv_encoder->dp.link_nr, nv_encoder->dp.link_bw);nouveau_dp_probe_oui (dev, aux, dpcd);
Signature · 1 line
2.26.2
Lyude Paul
maintainerRFC v4 2/20 drm/nouveau/kms/nv50-: Remove open-coded drm_dp_read_desc()
In reply to Lyude PaulNoticed this while going through our DP code - we use an open-coded version of drm_dp_read_desc() instead of just using the helper, so change that. This will also let us use quirks in the future if we end up needing them.
--- drivers/gpu/drm/nouveau/nouveau_connector.c | 3 ++- drivers/gpu/drm/nouveau/nouveau_dp.c | 30 +++++++-------------- drivers/gpu/drm/nouveau/nouveau_encoder.h | 4 ++- 3 files changed, 14 insertions(+), 23 deletions(-)
drivers/gpu/drm/nouveau/nouveau_connector.c +2 -1
@@ -435,7 +435,8 @@ nouveau_connector_ddc_detect(struct drm_connector *connector)switch (nv_encoder->dcb->type) {case DCB_OUTPUT_DP : - ret =nouveau_dp_detect (nv_encoder); + ret =nouveau_dp_detect (nouveau_connector (connector), + nv_encoder);if (ret ==NOUVEAU_DP_MST )return NULL ;else if (ret ==NOUVEAU_DP_SST )
drivers/gpu/drm/nouveau/nouveau_dp.c +9 -21
@@ -36,27 +36,9 @@ MODULE_PARM_DESC(mst, "Enable DisplayPort multi-stream (default: enabled)");static int nouveau_mst =1 ;module_param_named (mst, nouveau_mst, int,0400 ); -static void -nouveau_dp_probe_oui (struct drm_device *dev,struct nvkm_i2c_aux *aux,u8 *dpcd) -{ -struct nouveau_drm *drm =nouveau_drm (dev); -u8 buf[3 ]; - -if (!(dpcd[DP_DOWN_STREAM_PORT_COUNT ] &DP_OUI_SUPPORT )) -return ; - -if (!nvkm_rdaux (aux,DP_SINK_OUI , buf,3 )) -NV_DEBUG (drm,"Sink OUI: %02hx%02hx%02hx\n" , - buf[0 ], buf[1 ], buf[2 ]); - -if (!nvkm_rdaux (aux,DP_BRANCH_OUI , buf,3 )) -NV_DEBUG (drm,"Branch OUI: %02hx%02hx%02hx\n" , - buf[0 ], buf[1 ], buf[2 ]); - -} -int -nouveau_dp_detect (struct nouveau_encoder *nv_encoder) +nouveau_dp_detect (struct nouveau_connector *nv_connector, +struct nouveau_encoder *nv_encoder) {struct drm_device *dev = nv_encoder->base.base.dev;struct nouveau_drm *drm =nouveau_drm (dev);
@@ -89,7 +71,13 @@ nouveau_dp_detect(struct nouveau_encoder *nv_encoder)NV_DEBUG (drm,"maximum: %dx%d\n" , nv_encoder->dp.link_nr, nv_encoder->dp.link_bw); -nouveau_dp_probe_oui (dev, aux, dpcd); + ret =drm_dp_read_desc (&nv_connector->aux, &nv_encoder->dp.desc, +drm_dp_is_branch (dpcd)); +if (ret) { +NV_ERROR (drm,"Failed to read DP descriptor on %s: %d\n" , + nv_connector->base.name, ret); +return ret; + } ret =nv50_mstm_detect (nv_encoder->dp.mstm, dpcd, nouveau_mst);if (ret ==1 )
drivers/gpu/drm/nouveau/nouveau_encoder.h +3 -1
@@ -33,6 +33,7 @@#include <drm/drm_dp_mst_helper.h> #include "dispnv04/disp.h" struct nv50_head_atom ; +struct nouveau_connector ;#define NV_DPMS_CLEARED 0x80
@@ -64,6 +65,7 @@ struct nouveau_encoder {struct nv50_mstm *mstm;int link_nr;int link_bw; +struct drm_dp_desc desc; } dp; };
@@ -104,7 +106,7 @@ enum nouveau_dp_status { NOUVEAU_DP_MST, }; -int nouveau_dp_detect (struct nouveau_encoder *); +int nouveau_dp_detect (struct nouveau_connector *,struct nouveau_encoder *); enum drm_mode_status nv50_dp_mode_valid(struct drm_connector *, struct nouveau_encoder *, const struct drm_display_mode *,
Signature · 1 line
2.26.2
Lyude Paul
maintainerRFC v4 3/20 drm/nouveau/kms/nv50-: Just use drm_dp_dpcd_read() in nouveau_dp.c
In reply to Lyude PaulSince this actually logs accesses, we should probably always be using this imho…
--- drivers/gpu/drm/nouveau/nouveau_dp.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)
drivers/gpu/drm/nouveau/nouveau_dp.c +4 -8
@@ -42,16 +42,12 @@ nouveau_dp_detect(struct nouveau_connector *nv_connector, {struct drm_device *dev = nv_encoder->base.base.dev;struct nouveau_drm *drm =nouveau_drm (dev); -struct nvkm_i2c_aux *aux; -u8 dpcd[8 ]; +struct drm_dp_aux *aux = &nv_connector->aux; +u8 dpcd[DP_RECEIVER_CAP_SIZE ];int ret; - aux = nv_encoder->aux; -if (!aux) -return -ENODEV ; - - ret =nvkm_rdaux (aux,DP_DPCD_REV , dpcd,sizeof (dpcd)); -if (ret) + ret =drm_dp_dpcd_read (aux,DP_DPCD_REV , dpcd,DP_RECEIVER_CAP_SIZE ); +if (ret !=sizeof (dpcd))return ret; nv_encoder->dp.link_bw =27000 * dpcd[1 ];
Signature · 6 lines
2.26.2 _______________________________________________ Nouveau mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/nouveau
Lyude Paul
maintainerRFC v4 4/20 drm/nouveau/kms/nv50-: Use macros for DP registers in nouveau_dp.c
In reply to Lyude PaulNo functional changes.
--- drivers/gpu/drm/nouveau/nouveau_dp.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/gpu/drm/nouveau/nouveau_dp.c +5 -3
@@ -50,11 +50,13 @@ nouveau_dp_detect(struct nouveau_connector *nv_connector,if (ret !=sizeof (dpcd))return ret; - nv_encoder->dp.link_bw =27000 * dpcd[1 ]; - nv_encoder->dp.link_nr = dpcd[2 ] &DP_MAX_LANE_COUNT_MASK ; + nv_encoder->dp.link_bw =27000 * dpcd[DP_MAX_LINK_RATE ]; + nv_encoder->dp.link_nr = + dpcd[DP_MAX_LANE_COUNT ] &DP_MAX_LANE_COUNT_MASK ;NV_DEBUG (drm,"display: %dx%d dpcd 0x%02x\n" , - nv_encoder->dp.link_nr, nv_encoder->dp.link_bw, dpcd[0 ]); + nv_encoder->dp.link_nr, nv_encoder->dp.link_bw, + dpcd[DP_DPCD_REV ]);NV_DEBUG (drm,"encoder: %dx%d\n" , nv_encoder->dcb->dpconf.link_nr, nv_encoder->dcb->dpconf.link_bw);
Signature · 1 line
2.26.2
Lyude Paul
maintainerRFC v4 5/20 drm/nouveau/kms: Don't clear DP_MST_CTRL DPCD in nv50_mstm_new()
In reply to Lyude PaulSince fa3cdf8d0b09 ("drm/nouveau: Reset MST branching unit before enabling") we've been clearing DP_MST_CTRL before we start enabling MST. Since then clearing DP_MST_CTRL in nv50_mstm_new() has been unnecessary and redundant, so let's remove it.
--- drivers/gpu/drm/nouveau/dispnv50/disp.c | 11 ----------- 1 file changed, 11 deletions(-)
drivers/gpu/drm/nouveau/dispnv50/disp.c +0 -11
@@ -1535,17 +1535,6 @@ nv50_mstm_new(struct nouveau_encoder *outp, struct drm_dp_aux *aux, int aux_max,struct drm_device *dev = outp->base.base.dev;struct nv50_mstm *mstm;int ret; -u8 dpcd; - -/* This is a workaround for some monitors not functioning -* correctly in MST mode on initial module load. I think -* some bad interaction with the VBIOS may be responsible. -* -* A good ol' off and on again seems to work here ;) -*/ - ret =drm_dp_dpcd_readb (aux,DP_DPCD_REV , &dpcd); -if (ret >=0 && dpcd >=0x12 ) -drm_dp_dpcd_writeb (aux,DP_MSTM_CTRL ,0 );if (!(mstm = *pmstm =kzalloc (sizeof (*mstm),GFP_KERNEL )))return -ENOMEM ;
Signature · 1 line
2.26.2
Lyude Paul
maintainerRFC v4 6/20 drm/nouveau/kms: Search for encoders' connectors properly
In reply to Lyude PaulWhile the way we find the associated connector for an encoder is just fine for legacy modesetting, it's not correct for nv50+ since that uses atomic modesetting. For reference, see the drm_encoder kdocs.
Fix this by removing nouveau_encoder_connector_get(), and replacing it with nv04_encoder_get_connector(), nv50_outp_get_old_connector(), and nv50_outp_get_new_connector().
v2:
* Don't line-wrap for_each_(old|new)_connector_in_state in nv50_outp_get_(old|new)_connector() - sravn
v3:
* Fix potential uninitialized usage of nv_connector (needs to be initialized to NULL at the start). Thanks kernel test robot!
v4:
* Actually fix uninitialized nv_connector usage in nv50_audio_component_get_eld(). The previous fix wouldn't have worked since we would have started out with nv_connector == NULL, but wouldn't clear it after a single drm_for_each_encoder() iteration. Thanks again Kernel bot!
--- drivers/gpu/drm/nouveau/dispnv04/dac.c | 2 +- drivers/gpu/drm/nouveau/dispnv04/dfp.c | 7 +- drivers/gpu/drm/nouveau/dispnv04/disp.c | 18 +++++ drivers/gpu/drm/nouveau/dispnv04/disp.h | 4 + drivers/gpu/drm/nouveau/dispnv04/tvnv04.c | 2 +- drivers/gpu/drm/nouveau/dispnv04/tvnv17.c | 2 +- drivers/gpu/drm/nouveau/dispnv50/disp.c | 88 +++++++++++++++++---- drivers/gpu/drm/nouveau/nouveau_connector.c | 14 ---- drivers/gpu/drm/nouveau/nouveau_encoder.h | 6 +- 9 files changed, 105 insertions(+), 38 deletions(-)
drivers/gpu/drm/nouveau/dispnv04/dac.c +1 -1
@@ -419,7 +419,7 @@ static void nv04_dac_commit(struct drm_encoder *encoder) helper->dpms (encoder,DRM_MODE_DPMS_ON );NV_DEBUG (drm,"Output %s is running on CRTC %d using output %c\n" , -nouveau_encoder_connector_get (nv_encoder)->base.name, +nv04_encoder_get_connector (nv_encoder)->base.name, nv_crtc->index,'@' +ffs (nv_encoder->dcb->or)); }
drivers/gpu/drm/nouveau/dispnv04/dfp.c +4 -3
@@ -184,7 +184,8 @@ static bool nv04_dfp_mode_fixup(struct drm_encoder *encoder, struct drm_display_mode *adjusted_mode) {struct nouveau_encoder *nv_encoder =nouveau_encoder (encoder); -struct nouveau_connector *nv_connector =nouveau_encoder_connector_get (nv_encoder); +struct nouveau_connector *nv_connector = +nv04_encoder_get_connector (nv_encoder); if (!nv_connector->native_mode || nv_connector->scaling_mode == DRM_MODE_SCALE_NONE ||
@@ -478,7 +479,7 @@ static void nv04_dfp_commit(struct drm_encoder *encoder) helper->dpms (encoder,DRM_MODE_DPMS_ON );NV_DEBUG (drm,"Output %s is running on CRTC %d using output %c\n" , -nouveau_encoder_connector_get (nv_encoder)->base.name, +nv04_encoder_get_connector (nv_encoder)->base.name, nv_crtc->index,'@' +ffs (nv_encoder->dcb->or)); }
@@ -591,7 +592,7 @@ static void nv04_dfp_restore(struct drm_encoder *encoder)if (nv_encoder->dcb->type ==DCB_OUTPUT_LVDS ) {struct nouveau_connector *connector = -nouveau_encoder_connector_get (nv_encoder); +nv04_encoder_get_connector (nv_encoder);if (connector && connector->native_mode) call_lvds_script(dev, nv_encoder->dcb, head,
drivers/gpu/drm/nouveau/dispnv04/disp.c +18 -0
@@ -35,6 +35,24 @@#include <nvif/if0004.h> +struct nouveau_connector * +nv04_encoder_get_connector (struct nouveau_encoder *encoder) +{ +struct drm_device *dev =to_drm_encoder (encoder)->dev; +struct drm_connector *connector; +struct drm_connector_list_iter conn_iter; +struct nouveau_connector *nv_connector =NULL ; + +drm_connector_list_iter_begin (dev, &conn_iter); +drm_for_each_connector_iter (connector, &conn_iter) { +if (connector->encoder ==to_drm_encoder (encoder)) + nv_connector =nouveau_connector (connector); + } +drm_connector_list_iter_end (&conn_iter); + +return nv_connector; +} +static void nv04_display_fini (struct drm_device *dev,bool suspend) {
drivers/gpu/drm/nouveau/dispnv04/disp.h +4 -0
@@ -6,6 +6,8 @@#include "nouveau_display.h" +struct nouveau_encoder ; +enum nv04_fp_display_regs {FP_DISPLAY_END ,FP_TOTAL ,
@@ -93,6 +95,8 @@ nv04_display(struct drm_device *dev)/* nv04_display.c */ int nv04_display_create (struct drm_device *); +struct nouveau_connector * +nv04_encoder_get_connector (struct nouveau_encoder *nv_encoder);/* nv04_crtc.c */ int nv04_crtc_create (struct drm_device *,int index);
drivers/gpu/drm/nouveau/dispnv04/tvnv04.c +1 -1
@@ -172,7 +172,7 @@ static void nv04_tv_commit(struct drm_encoder *encoder) helper->dpms (encoder,DRM_MODE_DPMS_ON );NV_DEBUG (drm,"Output %s is running on CRTC %d using output %c\n" , -nouveau_encoder_connector_get (nv_encoder)->base.name, +nv04_encoder_get_connector (nv_encoder)->base.name, nv_crtc->index,'@' +ffs (nv_encoder->dcb->or)); }
drivers/gpu/drm/nouveau/dispnv04/tvnv17.c +1 -1
@@ -599,7 +599,7 @@ static void nv17_tv_commit(struct drm_encoder *encoder) helper->dpms (encoder,DRM_MODE_DPMS_ON );NV_INFO (drm,"Output %s is running on CRTC %d using output %c\n" , -nouveau_encoder_connector_get (nv_encoder)->base.name, +nv04_encoder_get_connector (nv_encoder)->base.name, nv_crtc->index,'@' +ffs (nv_encoder->dcb->or)); }
drivers/gpu/drm/nouveau/dispnv50/disp.c +71 -17
191 lines not on this page · raw message
drivers/gpu/drm/nouveau/nouveau_connector.c +0 -14
@@ -391,20 +391,6 @@ find_encoder(struct drm_connector *connector, int type)return NULL ; } -struct nouveau_connector * -nouveau_encoder_connector_get (struct nouveau_encoder *encoder) -{ -struct drm_device *dev =to_drm_encoder (encoder)->dev; -struct drm_connector *drm_connector; - -list_for_each_entry (drm_connector, &dev->mode_config.connector_list, head) { -if (drm_connector->encoder ==to_drm_encoder (encoder)) -return nouveau_connector (drm_connector); - } - -return NULL ; -} -static void nouveau_connector_destroy (struct drm_connector *connector) {
drivers/gpu/drm/nouveau/nouveau_encoder.h +5 -1
@@ -113,7 +113,11 @@ enum drm_mode_status nv50_dp_mode_valid(struct drm_connector *, unsigned *clock);struct nouveau_connector * -nouveau_encoder_connector_get (struct nouveau_encoder *encoder); +nv50_outp_get_new_connector (struct nouveau_encoder *outp, +struct drm_atomic_state *state); +struct nouveau_connector * +nv50_outp_get_old_connector (struct nouveau_encoder *outp, +struct drm_atomic_state *state);int nv50_mstm_detect (struct nv50_mstm *,u8 dpcd[8 ],int allow);void nv50_mstm_remove (struct nv50_mstm *);
Signature · 1 line
2.26.2
Lyude Paul
maintainerRFC v4 7/20 drm/nouveau/kms/nv50-: Use drm_dp_dpcd_(readb|writeb)() in nv50_sor_disable()
In reply to Lyude PaulJust use drm_dp_dpcd_(readb|writeb)() so we get automatic DPCD logging
--- drivers/gpu/drm/nouveau/dispnv50/disp.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
drivers/gpu/drm/nouveau/dispnv50/disp.c +7 -4
@@ -1630,19 +1630,22 @@ nv50_sor_disable(struct drm_encoder *encoder, {struct nouveau_encoder *nv_encoder =nouveau_encoder (encoder);struct nouveau_crtc *nv_crtc =nouveau_crtc (nv_encoder->crtc); +struct nouveau_connector *nv_connector = +nv50_outp_get_old_connector (nv_encoder, state); nv_encoder->crtc =NULL ;if (nv_crtc) { -struct nvkm_i2c_aux *aux = nv_encoder->aux; +struct drm_dp_aux *aux = &nv_connector->aux;u8 pwr; -if (aux) { -int ret =nvkm_rdaux (aux,DP_SET_POWER , &pwr,1 ); +if (nv_encoder->dcb->type ==DCB_OUTPUT_DP ) { +int ret =drm_dp_dpcd_readb (aux,DP_SET_POWER , &pwr); +if (ret ==0 ) { pwr &= ~DP_SET_POWER_MASK ; pwr |=DP_SET_POWER_D3 ; -nvkm_wraux (aux,DP_SET_POWER , &pwr,1 ); +drm_dp_dpcd_writeb (aux,DP_SET_POWER , pwr); } }
Signature · 1 line
2.26.2
Lyude Paul
maintainerRFC v4 8/20 drm/nouveau/kms/nv50-: Refactor and cleanup DP HPD handling
In reply to Lyude PaulFirst some backstory here: Currently, we keep track of whether or not we've enabled MST or not by trying to piggy-back off the MST helpers. This means that in order to check whether MST is enabled or not, we actually need to grab drm_dp_mst_topology_mgr.lock.
Back when I originally wrote this, I did this piggy-backing with the intention that I'd eventually be teaching our MST helpers how to recover when an MST device has stopped responding, which in turn would require the MST helpers having a way of disabling MST independently of the driver. Note that this was before I reworked locking in the MST helpers, so at the time we were sticking random things under &mgr->lock - which grabbing this lock was meant to protect against.
This never came to fruition because doing such a reset safely turned out to be a lot more painful and impossible then it sounds, and also just risks us working around issues with our MST handlers that should be properly fixed instead. Even if it did though, simply calling drm_dp_mst_topology_mgr_set_mst() from the MST helpers (with the exception of when we're tearing down our MST managers, that's always OK) wouldn't have been a bad idea, since drivers like nouveau and i915 need to do their own book keeping immediately after disabling MST. So-implementing that would likely require adding a hook for helper-triggered MST disables anyway.
So, fast forward to now - we want to start adding support for all of the miscellaneous bits of the DP protocol (for both SST and MST) we're missing before moving on to supporting more complicated features like supporting different BPP values on MST, DSC, etc. Since many of these features only exist on SST and make use of DP HPD IRQs, we want to be able to atomically check whether we're servicing an MST IRQ or SST IRQ in nouveau_connector_hotplug(). Currently we literally don't do this at all, and just handle any kind of possible DP IRQ we could get including ESIs - even if MST isn't actually enabled.
This would be very complicated and difficult to fix if we need to hold &mgr->lock while handling SST IRQs to ensure that the MST topology state doesn't change under us. What we really want here is to do our own tracking of whether MST is enabled or not, similar to drivers like i915, and define our own locking order to decomplicate things and avoid hitting locking issues in the future.
So, let's do this by refactoring our MST probing/enabling code to use our own MST bookkeeping, along with adding a lock for protecting DP state that needs to be checked outside of our connector probing functions. While we're at it, we also remove a bunch of unneeded steps we perform when probing/enabling MST:
* Enabling bits in MSTM_CTRL before calling drm_dp_mst_topology_mgr_set_mst(). I don't think these ever actually did anything, since the nvif methods for enabling MST don't actually do anything DPCD related and merely indicate to nvkm that we've turned on MST.
* Checking the MSTM_CTRL bit is intact when checking the state of an enabled MST topology in nv50_mstm_detect(). I just added this to be safe originally, but now that we try reading the DPCD when probing DP connectors it shouldn't be needed as that will abort our hotplug probing if the device was removed well before we start checking for MST..
* All of the duplicate DPCD version checks.
This leaves us with much nicer looking code, a much more sensible locking scheme, and an easy way of checking whether MST is enabled or not for handling DP HPD IRQs.
v2:
* Get rid of accidental newlines
v4:
* Fix uninitialized usage of mstm in nv50_mstm_detect() - thanks kernel bot!
--- drivers/gpu/drm/nouveau/dispnv04/disp.c | 6 +- drivers/gpu/drm/nouveau/dispnv50/disp.c | 192 +++++++++----------- drivers/gpu/drm/nouveau/nouveau_connector.c | 14 +- drivers/gpu/drm/nouveau/nouveau_display.c | 2 +- drivers/gpu/drm/nouveau/nouveau_display.h | 2 +- drivers/gpu/drm/nouveau/nouveau_dp.c | 132 ++++++++++++-- drivers/gpu/drm/nouveau/nouveau_encoder.h | 33 +++- 7 files changed, 244 insertions(+), 137 deletions(-)
drivers/gpu/drm/nouveau/dispnv04/disp.c +5 -1
@@ -54,8 +54,9 @@ nv04_encoder_get_connector(struct nouveau_encoder *encoder) }static void -nv04_display_fini (struct drm_device *dev,bool suspend) +nv04_display_fini (struct drm_device *dev,bool runtime,bool suspend) { +struct nouveau_drm *drm =nouveau_drm (dev);struct nv04_display *disp =nv04_display (dev);struct drm_crtc *crtc;
@@ -67,6 +68,9 @@ nv04_display_fini(struct drm_device *dev, bool suspend)if (nv_two_heads (dev))NVWriteCRTC (dev,1 ,NV_PCRTC_INTR_EN_0 ,0 ); +if (!runtime) +cancel_work_sync (&drm->hpd_work); +if (!suspend)return ;
drivers/gpu/drm/nouveau/dispnv50/disp.c +89 -103
291 lines not on this page · raw message
drivers/gpu/drm/nouveau/nouveau_connector.c +3 -11
@@ -1143,19 +1143,15 @@ nouveau_connector_hotplug(struct nvif_notify *notify)struct nouveau_connector *nv_connector =container_of (notify,typeof (*nv_connector), hpd);struct drm_connector *connector = &nv_connector->base; -struct nouveau_drm *drm =nouveau_drm (connector->dev); +struct drm_device *dev = connector->dev; +struct nouveau_drm *drm =nouveau_drm (dev);const struct nvif_notify_conn_rep_v0 *rep = notify->data;const char *name = connector->name; -struct nouveau_encoder *nv_encoder;int ret;bool plugged = (rep->mask !=NVIF_NOTIFY_CONN_V0_UNPLUG );if (rep->mask &NVIF_NOTIFY_CONN_V0_IRQ ) { -NV_DEBUG (drm,"service %s\n" , name); -drm_dp_cec_irq (&nv_connector->aux); -if ((nv_encoder =find_encoder (connector,DCB_OUTPUT_DP ))) -nv50_mstm_service (nv_encoder->dp.mstm); - +nouveau_dp_irq (drm, nv_connector);return NVIF_NOTIFY_KEEP ; }
@@ -1181,10 +1177,6 @@ nouveau_connector_hotplug(struct nvif_notify *notify)if (!plugged)drm_dp_cec_unset_edid (&nv_connector->aux);NV_DEBUG (drm,"%splugged %s\n" , plugged ?"" :"un" , name); -if ((nv_encoder =find_encoder (connector,DCB_OUTPUT_DP ))) { -if (!plugged) -nv50_mstm_remove (nv_encoder->dp.mstm); - }drm_helper_hpd_irq_event (connector->dev);
drivers/gpu/drm/nouveau/nouveau_display.c +1 -1
@@ -569,7 +569,7 @@ nouveau_display_fini(struct drm_device *dev, bool suspend, bool runtime)cancel_work_sync (&drm->hpd_work);drm_kms_helper_poll_disable (dev); - disp->fini (dev, suspend); + disp->fini (dev, runtime, suspend); } static void
drivers/gpu/drm/nouveau/nouveau_display.h +1 -1
@@ -18,7 +18,7 @@ struct nouveau_display {void *priv;void (*dtor)(struct drm_device *);int (*init)(struct drm_device *,bool resume,bool runtime); -void (*fini)(struct drm_device *,bool suspend); +void (*fini)(struct drm_device *,bool suspend,bool runtime);struct nvif_disp disp;
drivers/gpu/drm/nouveau/nouveau_dp.c +115 -17
156 lines not on this page · raw message
drivers/gpu/drm/nouveau/nouveau_encoder.h +30 -3
@@ -65,6 +65,13 @@ struct nouveau_encoder {struct nv50_mstm *mstm;int link_nr;int link_bw; + +/* Protects DP state that needs to be accessed outside +* connector reprobing contexts +*/ +struct mutex hpd_irq_lock; + +u8 dpcd[DP_RECEIVER_CAP_SIZE ];struct drm_dp_desc desc; } dp; };
@@ -79,6 +86,21 @@ struct nouveau_encoder { struct nv50_head_atom *, u8 proto, u8 depth); }; +struct nv50_mstm { +struct nouveau_encoder *outp; + +struct drm_dp_mst_topology_mgr mgr; + +/* Protected under nouveau_encoder->dp.hpd_irq_lock */ +bool can_mst; +bool is_mst; +bool suspended; + +bool modified; +bool disabled; +int links; +}; +struct nouveau_encoder *find_encoder (struct drm_connector *connector,int type);
@@ -102,11 +124,14 @@ get_slave_funcs(struct drm_encoder *enc)/* nouveau_dp.c */ enum nouveau_dp_status { +NOUVEAU_DP_NONE ,NOUVEAU_DP_SST ,NOUVEAU_DP_MST , };int nouveau_dp_detect (struct nouveau_connector *,struct nouveau_encoder *); +void nouveau_dp_irq (struct nouveau_drm *drm, +struct nouveau_connector *nv_connector); enum drm_mode_status nv50_dp_mode_valid(struct drm_connector *, struct nouveau_encoder *, const struct drm_display_mode *,
@@ -119,7 +144,9 @@ struct nouveau_connector * nv50_outp_get_old_connector(struct nouveau_encoder *outp, struct drm_atomic_state *state); -int nv50_mstm_detect (struct nv50_mstm *,u8 dpcd[8 ],int allow); -void nv50_mstm_remove (struct nv50_mstm *); -void nv50_mstm_service (struct nv50_mstm *); +int nv50_mstm_detect (struct nouveau_encoder *encoder); +void nv50_mstm_remove (struct nv50_mstm *mstm); +bool nv50_mstm_service (struct nouveau_drm *drm, +struct nouveau_connector *nv_connector, +struct nv50_mstm *mstm);#endif /* __NOUVEAU_ENCODER_H__ */
Signature · 1 line
2.26.2
Lyude Paul
maintainerRFC v4 9/20 drm/i915/dp: Extract drm_dp_has_mst()
In reply to Lyude PaulJust a tiny drive-by cleanup, we can consolidate i915's code for checking for MST support into a helper to be shared across drivers.
--- drivers/gpu/drm/i915/display/intel_dp.c | 18 ++---------------- include/drm/drm_dp_mst_helper.h | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+), 16 deletions(-)
drivers/gpu/drm/i915/display/intel_dp.c +2 -16
@@ -4699,20 +4699,6 @@ intel_dp_get_dpcd(struct intel_dp *intel_dp)return true; } -static bool -intel_dp_sink_can_mst (struct intel_dp *intel_dp) -{ -u8 mstm_cap; - -if (intel_dp->dpcd[DP_DPCD_REV ] <0x12 ) -return false; - -if (drm_dp_dpcd_readb (&intel_dp->aux,DP_MSTM_CAP , &mstm_cap) !=1 ) -return false; - -return mstm_cap &DP_MST_CAP ; -} -static bool intel_dp_can_mst (struct intel_dp *intel_dp) {
@@ -4720,7 +4706,7 @@ intel_dp_can_mst(struct intel_dp *intel_dp)return i915->params.enable_dp_mst && intel_dp->can_mst && -intel_dp_sink_can_mst (intel_dp); +drm_dp_has_mst (&intel_dp->aux, intel_dp->dpcd); } static void
@@ -4729,7 +4715,7 @@ intel_dp_configure_mst(struct intel_dp *intel_dp)struct drm_i915_private *i915 =dp_to_i915 (intel_dp);struct intel_encoder *encoder = &dp_to_dig_port (intel_dp)->base; -bool sink_can_mst =intel_dp_sink_can_mst (intel_dp); +bool sink_can_mst =drm_dp_has_mst (&intel_dp->aux, intel_dp->dpcd); drm_dbg_kms(&i915->drm, "[ENCODER:%d:%s] MST support: port: %s, sink: %s, modparam: %s\n",
include/drm/drm_dp_mst_helper.h +22 -0
@@ -911,4 +911,26 @@ __drm_dp_mst_state_iter_get(struct drm_atomic_state *state,for ((__i) =0 ; (__i) < (__state)->num_private_objs; (__i)++) \for_each_if (__drm_dp_mst_state_iter_get ((__state), &(mgr),NULL , &(new_state), (__i))) +/** +* drm_dp_has_mst() - check whether or not a sink supports MST +* @aux: The DP AUX channel to use +* @dpcd: A cached copy of the DPCD capabilities for this sink +* +* Returns: %True if the sink supports MST, %false otherwise + */ +static inline bool +drm_dp_has_mst (struct drm_dp_aux *aux, +const u8 dpcd[DP_RECEIVER_CAP_SIZE ]) +{ +u8 mstm_cap; + +if (dpcd[DP_DPCD_REV ] <DP_DPCD_REV_12 ) +return false; + +if (drm_dp_dpcd_readb (aux,DP_MSTM_CAP , &mstm_cap) !=1 ) +return false; + +return !!(mstm_cap &DP_MST_CAP ); +} +#endif
Signature · 1 line
2.26.2
Jani Nikula
maintainerRe: [RFC v4 09/20] drm/i915/dp: Extract drm_dp_has_mst()
Quoted 59 lines · Lyude Paul
Just a tiny drive-by cleanup, we can consolidate i915's code for checking for MST support into a helper to be shared across drivers.
Signed-off-by Lyude Paul <[email protected]>Reviewed-by Sean Paul <[email protected]>--- drivers/gpu/drm/i915/display/intel_dp.c | 18 ++---------------- include/drm/drm_dp_mst_helper.h | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+), 16 deletions(-)drivers/gpu/drm/i915/display/intel_dp.c +2
-16@@ -4699,20 +4699,6 @@ intel_dp_get_dpcd(struct intel_dp *intel_dp)return true; } -static bool -intel_dp_sink_can_mst (struct intel_dp *intel_dp) -{ -u8 mstm_cap; - -if (intel_dp->dpcd[DP_DPCD_REV ] <0x12 ) -return false; - -if (drm_dp_dpcd_readb (&intel_dp->aux,DP_MSTM_CAP , &mstm_cap) !=1 ) -return false; - -return mstm_cap &DP_MST_CAP ; -} -static bool intel_dp_can_mst (struct intel_dp *intel_dp) {@@ -4720,7 +4706,7 @@ intel_dp_can_mst(struct intel_dp *intel_dp)return i915->params.enable_dp_mst && intel_dp->can_mst && -intel_dp_sink_can_mst (intel_dp); +drm_dp_has_mst (&intel_dp->aux, intel_dp->dpcd); } static void@@ -4729,7 +4715,7 @@ intel_dp_configure_mst(struct intel_dp *intel_dp)struct drm_i915_private *i915 =dp_to_i915 (intel_dp);struct intel_encoder *encoder = &dp_to_dig_port (intel_dp)->base; -bool sink_can_mst =intel_dp_sink_can_mst (intel_dp); +bool sink_can_mst =drm_dp_has_mst (&intel_dp->aux, intel_dp->dpcd); drm_dbg_kms(&i915->drm, "[ENCODER:%d:%s] MST support: port: %s, sink: %s, modparam: %s\n",include/drm/drm_dp_mst_helper.h +0
-0@@ -911,4 +911,26 @@ __drm_dp_mst_state_iter_get(struct drm_atomic_state *state,for ((__i) =0 ; (__i) < (__state)->num_private_objs; (__i)++) \
include/drm/drm_dp_mst_helper.h __drm_dp_mst_state_iter_get(struct drm_atomic_state *state, · line 921
Quoted 10 lines
include/drm/drm_dp_mst_helper.h +8
-0for_each_if (__drm_dp_mst_state_iter_get ((__state), &(mgr),NULL , &(new_state), (__i))) +/** +* drm_dp_has_mst() - check whether or not a sink supports MST +* @aux: The DP AUX channel to use +* @dpcd: A cached copy of the DPCD capabilities for this sink +* +* Returns: %True if the sink supports MST, %false otherwise +*/ +static inline bool
I've become more and more critical of accumulating a lot of inlines in headers. Do we really want this in the header?
include/drm/drm_dp_mst_helper.h __drm_dp_mst_state_iter_get(struct drm_atomic_state *state, · line 933
Quoted 12 lines
include/drm/drm_dp_mst_helper.h +12
-0+drm_dp_has_mst(struct drm_dp_aux *aux, + const u8 dpcd[DP_RECEIVER_CAP_SIZE]) +{ + u8 mstm_cap; + +if (dpcd[DP_DPCD_REV ] <DP_DPCD_REV_12 ) +return false; + +if (drm_dp_dpcd_readb (aux,DP_MSTM_CAP , &mstm_cap) !=1 ) +return false; + +return !!(mstm_cap &DP_MST_CAP );
The !! is superfluous.
BR,
Jani.
Quoted 3 lines
include/drm/drm_dp_mst_helper.h +2
-0+} +#endif
Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center
Lyude Paul
maintainerRFC v4 10/20 drm/nouveau/kms: Use new drm_dp_has_mst() helper for checking MST caps
In reply to Lyude Paul--- drivers/gpu/drm/nouveau/nouveau_dp.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-)
drivers/gpu/drm/nouveau/nouveau_dp.c +3 -13
@@ -44,7 +44,6 @@ nouveau_dp_probe_dpcd(struct nouveau_connector *nv_connector,struct nv50_mstm *mstm =NULL ;int ret;u8 *dpcd = outp->dp.dpcd; -u8 tmp; ret =drm_dp_dpcd_read (aux,DP_DPCD_REV , dpcd,DP_RECEIVER_CAP_SIZE );if (ret ==DP_RECEIVER_CAP_SIZE && dpcd[DP_DPCD_REV ]) {
@@ -56,19 +55,10 @@ nouveau_dp_probe_dpcd(struct nouveau_connector *nv_connector,return connector_status_disconnected; } -if (nouveau_mst) +if (nouveau_mst) { mstm = outp->dp.mstm; - -if (mstm) { -if (dpcd[DP_DPCD_REV ] >=DP_DPCD_REV_12 ) { - ret =drm_dp_dpcd_readb (aux,DP_MSTM_CAP , &tmp); -if (ret <0 ) -return connector_status_disconnected; - - mstm->can_mst = !!(tmp &DP_MST_CAP ); - }else { - mstm->can_mst = false; - } +if (mstm) + mstm->can_mst =drm_dp_has_mst (aux, dpcd); }return connector_status_connected;
Signature · 1 line
2.26.2
Lyude Paul
maintainerRFC v4 11/20 drm/nouveau/kms: Move drm_dp_cec_unset_edid() into nouveau_connector_detect()
In reply to Lyude PaulFor whatever reason we currently unset the EDID for DP CEC support when responding to the connector being unplugged, instead of just doing it in nouveau_connector_detect() where we set the CEC EDID. This isn't really needed and could even potentially cause us to forget to unset the EDID if the connector is removed without a corresponding hpd event, so let's fix that.
--- drivers/gpu/drm/nouveau/nouveau_connector.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/gpu/drm/nouveau/nouveau_connector.c +2 -3
@@ -633,10 +633,11 @@ nouveau_connector_detect(struct drm_connector *connector, bool force) conn_status = connector_status_connected; goto out; } - } out: +if (!nv_connector->edid) +drm_dp_cec_unset_edid (&nv_connector->aux);pm_runtime_mark_last_busy (dev->dev);pm_runtime_put_autosuspend (dev->dev);
@@ -1174,8 +1175,6 @@ nouveau_connector_hotplug(struct nvif_notify *notify)return NVIF_NOTIFY_DROP ; } -if (!plugged) -drm_dp_cec_unset_edid (&nv_connector->aux);NV_DEBUG (drm,"%splugged %s\n" , plugged ?"" :"un" , name);drm_helper_hpd_irq_event (connector->dev);
Signature · 1 line
2.26.2
Lyude Paul
maintainerRFC v4 12/20 drm/nouveau/kms: Only use hpd_work for reprobing in HPD paths
In reply to Lyude PaulCurrently we perform both short IRQ handling for DP, and connector reprobing in the HPD IRQ handler. However since we need to grab connection_mutex in order to reprobe a connector, in theory we could accidentally block ourselves from handling any short IRQs until after a modeset completes if a connector hotplug happens to occur in parallel with a modeset.
I haven't seen this actually happen yet, but since we're cleaning up nouveau's hotplug handling code anyway and we already have a hpd worker, we can simply fix this by only relying on the HPD worker to actually reprobe connectors when we receive a HPD IRQ. We also add a mask to nouveau_drm to keep track of which connectors are waiting to be reprobed in response to an HPD IRQ.
--- drivers/gpu/drm/nouveau/nouveau_connector.c | 42 +++++-------- drivers/gpu/drm/nouveau/nouveau_connector.h | 1 + drivers/gpu/drm/nouveau/nouveau_display.c | 70 ++++++++++++++++++--- drivers/gpu/drm/nouveau/nouveau_display.h | 1 + drivers/gpu/drm/nouveau/nouveau_dp.c | 2 +- drivers/gpu/drm/nouveau/nouveau_drm.c | 4 +- drivers/gpu/drm/nouveau/nouveau_drv.h | 2 + 7 files changed, 86 insertions(+), 36 deletions(-)
drivers/gpu/drm/nouveau/nouveau_connector.c +16 -26
@@ -1138,6 +1138,20 @@ nouveau_connector_funcs_lvds = { .early_unregister = nouveau_connector_early_unregister, }; +void +nouveau_connector_hpd (struct drm_connector *connector) +{ +struct nouveau_drm *drm =nouveau_drm (connector->dev); +u32 mask =drm_connector_mask (connector); + +mutex_lock (&drm->hpd_lock); +if (!(drm->hpd_pending & mask)) { + drm->hpd_pending |= mask; +schedule_work (&drm->hpd_work); + } +mutex_unlock (&drm->hpd_lock); +} +static int nouveau_connector_hotplug (struct nvif_notify *notify) {
@@ -1147,8 +1161,6 @@ nouveau_connector_hotplug(struct nvif_notify *notify)struct drm_device *dev = connector->dev;struct nouveau_drm *drm =nouveau_drm (dev);const struct nvif_notify_conn_rep_v0 *rep = notify->data; -const char *name = connector->name; -int ret;bool plugged = (rep->mask !=NVIF_NOTIFY_CONN_V0_UNPLUG );if (rep->mask &NVIF_NOTIFY_CONN_V0_IRQ ) {
@@ -1156,31 +1168,9 @@ nouveau_connector_hotplug(struct nvif_notify *notify)return NVIF_NOTIFY_KEEP ; } - ret =pm_runtime_get (drm->dev->dev); -if (ret ==0 ) { -/* We can't block here if there's a pending PM request -* running, as we'll deadlock nouveau_display_fini() when it -* calls nvif_put() on our nvif_notify struct. So, simply -* defer the hotplug event until the device finishes resuming -*/ -NV_DEBUG (drm,"Deferring HPD on %s until runtime resume\n" , - name); -schedule_work (&drm->hpd_work); - -pm_runtime_put_noidle (drm->dev->dev); -return NVIF_NOTIFY_KEEP ; - }else if (ret !=1 && ret != -EACCES ) { -NV_WARN (drm,"HPD on %s dropped due to RPM failure: %d\n" , - name, ret); -return NVIF_NOTIFY_DROP ; - } - -NV_DEBUG (drm,"%splugged %s\n" , plugged ?"" :"un" , name); - -drm_helper_hpd_irq_event (connector->dev); +NV_DEBUG (drm,"%splugged %s\n" , plugged ?"" :"un" , connector->name); +nouveau_connector_hpd (connector); -pm_runtime_mark_last_busy (drm->dev->dev); -pm_runtime_put_autosuspend (drm->dev->dev);return NVIF_NOTIFY_KEEP ; }
drivers/gpu/drm/nouveau/nouveau_connector.h +1 -0
@@ -187,6 +187,7 @@ nouveau_crtc_connector_get(struct nouveau_crtc *nv_crtc)struct drm_connector *nouveau_connector_create (struct drm_device *,const struct dcb_output *); +void nouveau_connector_hpd (struct drm_connector *connector);extern int nouveau_tv_disable;extern int nouveau_ignorelid;
drivers/gpu/drm/nouveau/nouveau_display.c +63 -7
112 lines not on this page · raw message
drivers/gpu/drm/nouveau/nouveau_display.h +1 -0
@@ -45,6 +45,7 @@ nouveau_display(struct drm_device *dev)int nouveau_display_create (struct drm_device *dev);void nouveau_display_destroy (struct drm_device *dev);int nouveau_display_init (struct drm_device *dev,bool resume,bool runtime); +void nouveau_display_hpd_resume (struct drm_device *dev);void nouveau_display_fini (struct drm_device *dev,bool suspend,bool runtime);int nouveau_display_suspend (struct drm_device *dev,bool runtime);void nouveau_display_resume (struct drm_device *dev,bool runtime);
drivers/gpu/drm/nouveau/nouveau_dp.c +1 -1
@@ -165,7 +165,7 @@ void nouveau_dp_irq(struct nouveau_drm *drm,if (mstm && mstm->is_mst) {if (!nv50_mstm_service (drm, nv_connector, mstm)) -schedule_work (&drm->hpd_work); +nouveau_connector_hpd (connector); }else {drm_dp_cec_irq (&nv_connector->aux); }
drivers/gpu/drm/nouveau/nouveau_drm.c +2 -2
@@ -953,7 +953,7 @@ nouveau_pmops_resume(struct device *dev) ret =nouveau_do_resume (drm_dev, false);/* Monitors may have been connected / disconnected during suspend */ -schedule_work (&nouveau_drm (drm_dev)->hpd_work); +nouveau_display_hpd_resume (drm_dev);return ret; }
@@ -1036,7 +1036,7 @@ nouveau_pmops_runtime_resume(struct device *dev) drm_dev->switch_power_state =DRM_SWITCH_POWER_ON ;/* Monitors may have been connected / disconnected during suspend */ -schedule_work (&nouveau_drm (drm_dev)->hpd_work); +nouveau_display_hpd_resume (drm_dev);return ret; }
drivers/gpu/drm/nouveau/nouveau_drv.h +2 -0
@@ -198,6 +198,8 @@ struct nouveau_drm {struct nvbios vbios;struct nouveau_display *display;struct work_struct hpd_work; +struct mutex hpd_lock; +u32 hpd_pending;struct work_struct fbcon_work;int fbcon_new_state;#ifdef CONFIG_ACPI
Signature · 1 line
2.26.2
Lyude Paul
maintainerRFC v4 13/20 drm/i915/dp: Extract drm_dp_downstream_read_info()
In reply to Lyude PaulWe're going to be doing the same probing process in nouveau for determining downstream DP port capabilities, so let's deduplicate the work by moving i915's code for handling this into a shared helper:drm_dp_downstream_read_info().
Note that when we do this, we also do make some functional changes while we're at it:
* We always clear the downstream port info before trying to read it, just to make things easier for the caller
* We skip reading downstream port info if the DPCD indicates that we don't support downstream port info
* We only read as many bytes as needed for the reported number of downstream ports, no sense in reading the whole thing every time
v2:
* Fixup logic for calculating the downstream port length to account for the fact that downstream port caps can be either 1 byte or 4 bytes long. We can actually skip fixing the max_clock/max_bpc helpers here since they all check for DP_DETAILED_CAP_INFO_AVAILABLE anyway.
* Fix ret code check for drm_dp_dpcd_read
--- drivers/gpu/drm/drm_dp_helper.c | 46 +++++++++++++++++++++++++ drivers/gpu/drm/i915/display/intel_dp.c | 14 ++------ include/drm/drm_dp_helper.h | 3 ++ 3 files changed, 51 insertions(+), 12 deletions(-)
drivers/gpu/drm/drm_dp_helper.c +46 -0
@@ -423,6 +423,52 @@ bool drm_dp_send_real_edid_checksum(struct drm_dp_aux *aux, }EXPORT_SYMBOL (drm_dp_send_real_edid_checksum); +static u8 drm_dp_downstream_port_count (const u8 dpcd[DP_RECEIVER_CAP_SIZE ]) +{ +u8 port_count = dpcd[DP_DOWN_STREAM_PORT_COUNT ] &DP_PORT_COUNT_MASK ; + +if (dpcd[DP_DOWNSTREAMPORT_PRESENT ] &DP_DETAILED_CAP_INFO_AVAILABLE && port_count >4 ) + port_count =4 ; + +return port_count; +} + +/** +* drm_dp_downstream_read_info() - read DPCD downstream port info if available +* @aux: DisplayPort AUX channel +* @dpcd: A cached copy of the port's DPCD +* @downstream_ports: buffer to store the downstream port info in +* +* Returns: 0 if either the downstream port info was read successfully or +* there was no downstream info to read, or a negative error code otherwise. +*/ +int drm_dp_downstream_read_info (struct drm_dp_aux *aux, +const u8 dpcd[DP_RECEIVER_CAP_SIZE ], +u8 downstream_ports[DP_MAX_DOWNSTREAM_PORTS ]) +{ +int ret; +u8 len; + +memset (downstream_ports,0 ,DP_MAX_DOWNSTREAM_PORTS ); + +/* No downstream info to read */ +if (!drm_dp_is_branch (dpcd) || + dpcd[DP_DPCD_REV ] <DP_DPCD_REV_10 || + !(dpcd[DP_DOWNSTREAMPORT_PRESENT ] &DP_DWN_STRM_PORT_PRESENT )) +return 0 ; + + len =drm_dp_downstream_port_count (dpcd); +if (dpcd[DP_DOWNSTREAMPORT_PRESENT ] &DP_DETAILED_CAP_INFO_AVAILABLE ) + len *=4 ; + + ret =drm_dp_dpcd_read (aux,DP_DOWNSTREAM_PORT_0 , downstream_ports, len); +if (ret <0 ) +return ret; + +return ret == len ?0 : -EIO ; +} +EXPORT_SYMBOL (drm_dp_downstream_read_info); +/** * drm_dp_downstream_max_clock() - extract branch device max * pixel rate for legacy VGA
drivers/gpu/drm/i915/display/intel_dp.c +2 -12
@@ -4685,18 +4685,8 @@ intel_dp_get_dpcd(struct intel_dp *intel_dp)return false; } -if (!drm_dp_is_branch (intel_dp->dpcd)) -return true;/* native DP sink */ - -if (intel_dp->dpcd[DP_DPCD_REV ] ==0x10 ) -return true;/* no per-port downstream info */ - -if (drm_dp_dpcd_read (&intel_dp->aux,DP_DOWNSTREAM_PORT_0 , - intel_dp->downstream_ports, -DP_MAX_DOWNSTREAM_PORTS ) <0 ) -return false;/* downstream port status fetch failed */ - -return true; +return drm_dp_downstream_read_info (&intel_dp->aux, intel_dp->dpcd, + intel_dp->downstream_ports) ==0 ; } static bool
include/drm/drm_dp_helper.h +3 -0
@@ -1613,6 +1613,9 @@ int drm_dp_dpcd_read_link_status(struct drm_dp_aux *aux,bool drm_dp_send_real_edid_checksum (struct drm_dp_aux *aux,u8 real_edid_checksum); +int drm_dp_downstream_read_info (struct drm_dp_aux *aux, +const u8 dpcd[DP_RECEIVER_CAP_SIZE ], +u8 downstream_ports[DP_MAX_DOWNSTREAM_PORTS ]);int drm_dp_downstream_max_clock (const u8 dpcd[DP_RECEIVER_CAP_SIZE ],const u8 port_cap[4 ]); int drm_dp_downstream_max_bpc(const u8 dpcd[DP_RECEIVER_CAP_SIZE],
Signature · 1 line
2.26.2
Lyude Paul
maintainerRFC v4 14/20 drm/nouveau/kms/nv50-: Use downstream DP clock limits for mode validation
In reply to Lyude PaulThis adds support for querying the maximum clock rate of a downstream port on a DisplayPort connection. Generally, downstream ports refer to active dongles which can have their own pixel clock limits.
Note as well, we also start marking the connector as disconnected if we can't read the DPCD, since we wouldn't be able to do anything without DPCD access anyway.
--- drivers/gpu/drm/nouveau/dispnv50/disp.c | 3 +++ drivers/gpu/drm/nouveau/nouveau_dp.c | 15 +++++++++++---- drivers/gpu/drm/nouveau/nouveau_encoder.h | 1 + 3 files changed, 15 insertions(+), 4 deletions(-)
drivers/gpu/drm/nouveau/dispnv50/disp.c +3 -0
@@ -1258,7 +1258,10 @@ nv50_mstc_detect(struct drm_connector *connector, ret =drm_dp_mst_detect_port (connector, ctx, mstc->port->mgr, mstc->port); +if (ret != connector_status_connected) + goto out; +out:pm_runtime_mark_last_busy (connector->dev->dev);pm_runtime_put_autosuspend (connector->dev->dev);return ret;
drivers/gpu/drm/nouveau/nouveau_dp.c +11 -4
@@ -61,6 +61,11 @@ nouveau_dp_probe_dpcd(struct nouveau_connector *nv_connector, mstm->can_mst =drm_dp_has_mst (aux, dpcd); } + ret =drm_dp_downstream_read_info (aux, dpcd, + outp->dp.downstream_ports); +if (ret <0 ) +return connector_status_disconnected; +return connector_status_connected; }
@@ -176,8 +181,6 @@ void nouveau_dp_irq(struct nouveau_drm *drm,/* TODO: * - Use the minimum possible BPC here, once we add support for the max bpc * property. -* - Validate the mode against downstream port caps (see -* drm_dp_downstream_max_clock()) * - Validate against the DP caps advertised by the GPU (we don't check these * yet) */
@@ -188,15 +191,19 @@ nv50_dp_mode_valid(struct drm_connector *connector, unsigned *out_clock) {const unsigned min_clock =25000 ; -unsigned max_clock, clock; +unsigned max_clock, ds_clock, clock;enum drm_mode_status ret;if (mode->flags &DRM_MODE_FLAG_INTERLACE && !outp->caps.dp_interlace)return MODE_NO_INTERLACE ; max_clock = outp->dp.link_nr * outp->dp.link_bw; - clock = mode->clock * (connector->display_info.bpc *3 ) /10 ; + ds_clock =drm_dp_downstream_max_clock (outp->dp.dpcd, + outp->dp.downstream_ports); +if (ds_clock) + max_clock =min (max_clock, ds_clock); + clock = mode->clock * (connector->display_info.bpc *3 ) /10 ; ret =nouveau_conn_mode_clock_valid (mode, min_clock, max_clock, &clock);if (out_clock)
drivers/gpu/drm/nouveau/nouveau_encoder.h +1 -0
@@ -72,6 +72,7 @@ struct nouveau_encoder {struct mutex hpd_irq_lock;u8 dpcd[DP_RECEIVER_CAP_SIZE ]; +u8 downstream_ports[DP_MAX_DOWNSTREAM_PORTS ];struct drm_dp_desc desc; } dp; };
Signature · 1 line
2.26.2
Lyude Paul
maintainerRFC v4 15/20 drm/i915/dp: Extract drm_dp_has_sink_count()
In reply to Lyude PaulSince other drivers are also going to need to be aware of the sink count in order to do proper dongle detection, we might as well steal i915's DP_SINK_COUNT helpers and move them into DRM helpers so that other dirvers can use them as well.
Note that this also starts using intel_dp_has_sink_count() in intel_dp_detect_dpcd(), which is a functional change.
--- drivers/gpu/drm/drm_dp_helper.c | 22 ++++++++++++++++++++++ drivers/gpu/drm/i915/display/intel_dp.c | 21 ++++++++++++--------- include/drm/drm_dp_helper.h | 8 +++++++- 3 files changed, 41 insertions(+), 10 deletions(-)
drivers/gpu/drm/drm_dp_helper.c +22 -0
@@ -714,6 +714,28 @@ void drm_dp_set_subconnector_property(struct drm_connector *connector, }EXPORT_SYMBOL (drm_dp_set_subconnector_property); +/** +* drm_dp_has_sink_count() - Check whether a given connector has a valid sink +* count +* @connector: The DRM connector to check +* @dpcd: A cached copy of the connector's DPCD RX capabilities +* @desc: A cached copy of the connector's DP descriptor +* +* Returns: %True if the (e)DP connector has a valid sink count that should +* be probed, %false otherwise. +*/ +bool drm_dp_has_sink_count (struct drm_connector *connector, +const u8 dpcd[DP_RECEIVER_CAP_SIZE ], +const struct drm_dp_desc *desc) +{ +/* Some eDP panels don't set a valid value for the sink count */ +return connector->connector_type != DRM_MODE_CONNECTOR_eDP && + dpcd[DP_DPCD_REV ] >=DP_DPCD_REV_11 && + dpcd[DP_DOWNSTREAMPORT_PRESENT ] &DP_DWN_STRM_PORT_PRESENT && + !drm_dp_has_quirk (desc,0 ,DP_DPCD_QUIRK_NO_SINK_COUNT ); +} +EXPORT_SYMBOL (drm_dp_has_sink_count); +/* * I2C-over-AUX implementation */
drivers/gpu/drm/i915/display/intel_dp.c +12 -9
@@ -4634,6 +4634,16 @@ intel_edp_init_dpcd(struct intel_dp *intel_dp)return true; } +static bool +intel_dp_has_sink_count (struct intel_dp *intel_dp) +{ +if (!intel_dp->attached_connector) +return false; + +return drm_dp_has_sink_count (&intel_dp->attached_connector->base, + intel_dp->dpcd, + &intel_dp->desc); +}static bool intel_dp_get_dpcd (struct intel_dp *intel_dp)
@@ -4653,13 +4663,7 @@ intel_dp_get_dpcd(struct intel_dp *intel_dp)intel_dp_set_common_rates (intel_dp); } -/* -* Some eDP panels do not set a valid value for sink count, that is why -* it don't care about read it here and in intel_edp_init_dpcd(). -*/ -if (!intel_dp_is_edp (intel_dp) && - !drm_dp_has_quirk (&intel_dp->desc,0 , -DP_DPCD_QUIRK_NO_SINK_COUNT )) { +if (intel_dp_has_sink_count (intel_dp)) {u8 count;ssize_t r;
@@ -5939,9 +5943,8 @@ intel_dp_detect_dpcd(struct intel_dp *intel_dp)return connector_status_connected;/* If we're HPD-aware, SINK_COUNT changes dynamically */ -if (intel_dp->dpcd[DP_DPCD_REV ] >=0x11 && +if (intel_dp_has_sink_count (intel_dp) && intel_dp->downstream_ports[0 ] &DP_DS_PORT_HPD ) { -return intel_dp->sink_count ? connector_status_connected : connector_status_disconnected; }
include/drm/drm_dp_helper.h +7 -1
@@ -1631,6 +1631,11 @@ void drm_dp_set_subconnector_property(struct drm_connector *connector,const u8 *dpcd, const u8 port_cap[4]); +struct drm_dp_desc ; +bool drm_dp_has_sink_count (struct drm_connector *connector, +const u8 dpcd[DP_RECEIVER_CAP_SIZE ], +const struct drm_dp_desc *desc); +void drm_dp_remote_aux_init (struct drm_dp_aux *aux);void drm_dp_aux_init (struct drm_dp_aux *aux);int drm_dp_aux_register (struct drm_dp_aux *aux);
@@ -1689,7 +1694,8 @@ enum drm_dp_quirk {* @DP_DPCD_QUIRK_NO_SINK_COUNT: * * The device does not set SINK_COUNT to a non-zero value. -* The driver should ignore SINK_COUNT during detection. +* The driver should ignore SINK_COUNT during detection. Note that +* drm_dp_has_sink_count() automatically checks for this quirk. */ DP_DPCD_QUIRK_NO_SINK_COUNT,/**
Signature · 1 line
2.26.2
Lyude Paul
maintainerRFC v4 16/20 drm/i915/dp: Extract drm_dp_get_sink_count()
In reply to Lyude PaulAnd of course, we'll also need to read the sink count from other drivers as well if we're checking whether or not it's supported. So, let's extract the code for this into another helper.
v2:
* Fix drm_dp_dpcd_readb() ret check
* Add back comment and move back sink_count assignment in intel_dp_get_dpcd()
--- drivers/gpu/drm/drm_dp_helper.c | 22 ++++++++++++++++++++++ drivers/gpu/drm/i915/display/intel_dp.c | 11 +++++------ include/drm/drm_dp_helper.h | 1 + 3 files changed, 28 insertions(+), 6 deletions(-)
drivers/gpu/drm/drm_dp_helper.c +22 -0
@@ -736,6 +736,28 @@ bool drm_dp_has_sink_count(struct drm_connector *connector, }EXPORT_SYMBOL (drm_dp_has_sink_count); +/** +* drm_dp_get_sink_count() - Retrieve the sink count for a given sink +* @aux: The DP AUX channel to use +* +* Returns: The current sink count reported by @aux, or a negative error code +* otherwise. +*/ +int drm_dp_get_sink_count (struct drm_dp_aux *aux) +{ +u8 count; +int ret; + + ret =drm_dp_dpcd_readb (aux,DP_SINK_COUNT , &count); +if (ret <0 ) +return ret; +if (ret !=1 ) +return -EIO ; + +return DP_GET_SINK_COUNT (count); +} +EXPORT_SYMBOL (drm_dp_get_sink_count); +/* * I2C-over-AUX implementation */
drivers/gpu/drm/i915/display/intel_dp.c +5 -6
@@ -4648,6 +4648,8 @@ intel_dp_has_sink_count(struct intel_dp *intel_dp)static bool intel_dp_get_dpcd (struct intel_dp *intel_dp) { +int ret; +if (!intel_dp_read_dpcd (intel_dp))return false;
@@ -4664,11 +4666,8 @@ intel_dp_get_dpcd(struct intel_dp *intel_dp) }if (intel_dp_has_sink_count (intel_dp)) { -u8 count; -ssize_t r; - - r =drm_dp_dpcd_readb (&intel_dp->aux,DP_SINK_COUNT , &count); -if (r <1 ) + ret =drm_dp_get_sink_count (&intel_dp->aux); +if (ret <0 )return false;/*
@@ -4676,7 +4675,7 @@ intel_dp_get_dpcd(struct intel_dp *intel_dp)* a member variable in intel_dp will track any changes * between short pulse interrupts. */ - intel_dp->sink_count =DP_GET_SINK_COUNT (count); + intel_dp->sink_count = ret;/* * SINK_COUNT == 0 and DOWNSTREAM_PORT_PRESENT == 1 implies that
include/drm/drm_dp_helper.h +1 -0
@@ -1635,6 +1635,7 @@ struct drm_dp_desc;bool drm_dp_has_sink_count (struct drm_connector *connector,const u8 dpcd[DP_RECEIVER_CAP_SIZE ],const struct drm_dp_desc *desc); +int drm_dp_get_sink_count (struct drm_dp_aux *aux);void drm_dp_remote_aux_init (struct drm_dp_aux *aux);void drm_dp_aux_init (struct drm_dp_aux *aux);
Signature · 1 line
2.26.2
Jani Nikula
maintainerRe: [RFC v4 16/20] drm/i915/dp: Extract drm_dp_get_sink_count()
Quoted 21 lines · Lyude Paul
And of course, we'll also need to read the sink count from other drivers as well if we're checking whether or not it's supported. So, let's extract the code for this into another helper.
v2:
* Fixdrm_dp_dpcd_readb()ret check
* Add back comment and move backsink_countassignment inintel_dp_get_dpcd()Signed-off-by Lyude Paul <[email protected]>Reviewed-by Sean Paul <[email protected]>--- drivers/gpu/drm/drm_dp_helper.c | 22 ++++++++++++++++++++++ drivers/gpu/drm/i915/display/intel_dp.c | 11 +++++------ include/drm/drm_dp_helper.h | 1 + 3 files changed, 28 insertions(+), 6 deletions(-)drivers/gpu/drm/drm_dp_helper.c +0
-0
drivers/gpu/drm/drm_dp_helper.c bool drm_dp_has_sink_count(struct drm_connector *connector, · line 740
Quoted 5 lines
drivers/gpu/drm/drm_dp_helper.c +2
-0@@ -736,6 +736,28 @@ bool drm_dp_has_sink_count(struct drm_connector *connector, }EXPORT_SYMBOL (drm_dp_has_sink_count); +/** +* drm_dp_get_sink_count() - Retrieve the sink count for a given sink
From the department of bikeshedding...
Should we have a naming scheme where it's obvious whether a function will do DPCD access, or just shuffle existing data?
For example, drm_dp_read_foo() for anything with DPCD access vs. drm_dp_get_foo() or even simpler for anything that only processes pre-read data?
Quoted 5 lines
drivers/gpu/drm/drm_dp_helper.c +5
-0+* @aux: The DP AUX channel to use +* +* Returns: The current sink count reported by @aux, or a negative error code +* otherwise. +*/
drivers/gpu/drm/drm_dp_helper.c bool drm_dp_has_sink_count(struct drm_connector *connector, · line 755
Quoted 10 lines
drivers/gpu/drm/drm_dp_helper.c +10
-0+int drm_dp_get_sink_count (struct drm_dp_aux *aux) +{ +u8 count; +int ret; + + ret =drm_dp_dpcd_readb (aux,DP_SINK_COUNT , &count); +if (ret <0 ) +return ret; +if (ret !=1 ) +return -EIO ;
Makes me wonder if that shouldn't be at drm_dp_dpcd_read() level, for reads returning 0..len-1 bytes. Not necessarily part of this series, but seems silly to set a precedent to start handling that return value all over the place.
BR,
Jani.
Quoted 56 lines
drivers/gpu/drm/drm_dp_helper.c +5
-0+ +return DP_GET_SINK_COUNT (count); +} +EXPORT_SYMBOL (drm_dp_get_sink_count); +/* * I2C-over-AUX implementation */ drivers/gpu/drm/i915/display/intel_dp.c +5
-6@@ -4648,6 +4648,8 @@ intel_dp_has_sink_count(struct intel_dp *intel_dp)static bool intel_dp_get_dpcd (struct intel_dp *intel_dp) { +int ret; +if (!intel_dp_read_dpcd (intel_dp))return false;@@ -4664,11 +4666,8 @@ intel_dp_get_dpcd(struct intel_dp *intel_dp) }if (intel_dp_has_sink_count (intel_dp)) { -u8 count; -ssize_t r; - - r =drm_dp_dpcd_readb (&intel_dp->aux,DP_SINK_COUNT , &count); -if (r <1 ) + ret =drm_dp_get_sink_count (&intel_dp->aux); +if (ret <0 )return false;/* @@ -4676,7 +4675,7 @@ intel_dp_get_dpcd(struct intel_dp *intel_dp)* a member variable in intel_dp will track any changes * between short pulse interrupts. */ - intel_dp->sink_count =DP_GET_SINK_COUNT (count); + intel_dp->sink_count = ret;/* * SINK_COUNT == 0 and DOWNSTREAM_PORT_PRESENT == 1 implies that include/drm/drm_dp_helper.h +1
-0@@ -1635,6 +1635,7 @@ struct drm_dp_desc;bool drm_dp_has_sink_count (struct drm_connector *connector,const u8 dpcd[DP_RECEIVER_CAP_SIZE ],const struct drm_dp_desc *desc); +int drm_dp_get_sink_count (struct drm_dp_aux *aux);void drm_dp_remote_aux_init (struct drm_dp_aux *aux);void drm_dp_aux_init (struct drm_dp_aux *aux);
Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center
Lyude Paul
maintainerRe: [RFC v4 16/20] drm/i915/dp: Extract drm_dp_get_sink_count()
Quoted 53 lines · Jani Nikula
Quoted 23 lines · Lyude Paul
And of course, we'll also need to read the sink count from other drivers as well if we're checking whether or not it's supported. So, let's extract the code for this into another helper.
v2:
* Fixdrm_dp_dpcd_readb()ret check
* Add back comment and move backsink_countassignment inintel_dp_get_dpcd()Signed-off-by Lyude Paul <[email protected]>Reviewed-by Sean Paul <[email protected]>--- drivers/gpu/drm/drm_dp_helper.c | 22 ++++++++++++++++++++++ drivers/gpu/drm/i915/display/intel_dp.c | 11 +++++------ include/drm/drm_dp_helper.h | 1 + 3 files changed, 28 insertions(+), 6 deletions(-)drivers/gpu/drm/drm_dp_helper.c +0
-0drivers/gpu/drm/drm_dp_helper.c bool drm_dp_has_sink_count(struct drm_connector · line 741
Quoted 6 lines
drivers/gpu/drm/drm_dp_helper.c +2
-0@@ -736,6 +736,28 @@ bool drm_dp_has_sink_count(struct drm_connector *connector, }EXPORT_SYMBOL (drm_dp_has_sink_count); +/** +* drm_dp_get_sink_count() - Retrieve the sink count for a given sink From the department of bikeshedding...
Should we have a naming scheme where it's obvious whether a function will do DPCD access, or just shuffle existing data?
For example,
drm_dp_read_foo()for anything with DPCD access vs.drm_dp_get_foo()or even simpler for anything that only processes pre-read data?Quoted 13 lines
drivers/gpu/drm/drm_dp_helper.c +3
-0+* @aux: The DP AUX channel to use +* +* Returns: The current sink count reported by @aux, or a negative error code
+ * otherwise.
+ */drivers/gpu/drm/drm_dp_helper.c +7
-0+int drm_dp_get_sink_count (struct drm_dp_aux *aux) +{ +u8 count; +int ret; + + ret =drm_dp_dpcd_readb (aux,DP_SINK_COUNT , &count); +if (ret <0 )
Quoted 9 lines
drivers/gpu/drm/drm_dp_helper.c bool drm_dp_has_sink_count(struct drm_connector *connector, · line 755
Quoted 3 lines
drivers/gpu/drm/drm_dp_helper.c +3
-0+return ret; +if (ret !=1 ) +return -EIO ;Makes me wonder if that shouldn't be at
drm_dp_dpcd_read()level, for reads returning 0..len-1 bytes. Not necessarily part of this series, but seems silly to set a precedent to start handling that return value all over the place.
Yeah definitely - I'm probably going to keep this code here for now, but I would like to convert drm_dp_dpcd_readb/writeb() to just return 0 on success (all bytes written, I've never once seen a situation where we got less bytes than we read - it's always all or nothing) and negative error code on failure. I'll get to that soon
Quoted 60 lines
BR,
Jani.Quoted 57 lines
drivers/gpu/drm/drm_dp_helper.c +5
-0+ +return DP_GET_SINK_COUNT (count); +} +EXPORT_SYMBOL (drm_dp_get_sink_count); +/* * I2C-over-AUX implementation */ drivers/gpu/drm/i915/display/intel_dp.c +5
-6@@ -4648,6 +4648,8 @@ intel_dp_has_sink_count(struct intel_dp *intel_dp)static bool intel_dp_get_dpcd (struct intel_dp *intel_dp) { +int ret; +if (!intel_dp_read_dpcd (intel_dp))return false;@@ -4664,11 +4666,8 @@ intel_dp_get_dpcd(struct intel_dp *intel_dp) }if (intel_dp_has_sink_count (intel_dp)) { -u8 count; -ssize_t r; - - r =drm_dp_dpcd_readb (&intel_dp->aux,DP_SINK_COUNT , &count); -if (r <1 ) + ret =drm_dp_get_sink_count (&intel_dp->aux); +if (ret <0 )return false;/* @@ -4676,7 +4675,7 @@ intel_dp_get_dpcd(struct intel_dp *intel_dp)* a member variable in intel_dp will track any changes * between short pulse interrupts. */ - intel_dp->sink_count =DP_GET_SINK_COUNT (count); + intel_dp->sink_count = ret;/* * SINK_COUNT == 0 and DOWNSTREAM_PORT_PRESENT == 1 implies that include/drm/drm_dp_helper.h +1
-0@@ -1635,6 +1635,7 @@ struct drm_dp_desc;bool drm_dp_has_sink_count (struct drm_connector *connector,const u8 dpcd[DP_RECEIVER_CAP_SIZE ],const struct drm_dp_desc *desc); +int drm_dp_get_sink_count (struct drm_dp_aux *aux);void drm_dp_remote_aux_init (struct drm_dp_aux *aux);void drm_dp_aux_init (struct drm_dp_aux *aux);
Signature · 3 lines
Sincerely,
Lyude Paul (she/her)
Software Engineer at Red HatLyude Paul
maintainerRe: [RFC v4 16/20] drm/i915/dp: Extract drm_dp_get_sink_count()
In reply to Jani NikulaQuoted 33 lines · Jani Nikula
Quoted 23 lines · Lyude Paul
And of course, we'll also need to read the sink count from other drivers as well if we're checking whether or not it's supported. So, let's extract the code for this into another helper.
v2:
* Fixdrm_dp_dpcd_readb()ret check
* Add back comment and move backsink_countassignment inintel_dp_get_dpcd()Signed-off-by Lyude Paul <[email protected]>Reviewed-by Sean Paul <[email protected]>--- drivers/gpu/drm/drm_dp_helper.c | 22 ++++++++++++++++++++++ drivers/gpu/drm/i915/display/intel_dp.c | 11 +++++------ include/drm/drm_dp_helper.h | 1 + 3 files changed, 28 insertions(+), 6 deletions(-)drivers/gpu/drm/drm_dp_helper.c +0
-0drivers/gpu/drm/drm_dp_helper.c bool drm_dp_has_sink_count(struct drm_connector · line 741
Quoted 6 lines
drivers/gpu/drm/drm_dp_helper.c +2
-0@@ -736,6 +736,28 @@ bool drm_dp_has_sink_count(struct drm_connector *connector, }EXPORT_SYMBOL (drm_dp_has_sink_count); +/** +* drm_dp_get_sink_count() - Retrieve the sink count for a given sink From the department of bikeshedding...
Quoted 6 lines
Should we have a naming scheme where it's obvious whether a function will do DPCD access, or just shuffle existing data?
For example,
drm_dp_read_foo()for anything with DPCD access vs.drm_dp_get_foo()or even simpler for anything that only processes pre-read data?
Forgot to address this comment - yeah, I think that would be a good idea. I'll go through my previous patches and make sure that they match this naming scheme as well.
Quoted 83 lines
Quoted 7 lines
drivers/gpu/drm/drm_dp_helper.c +3
-0+* @aux: The DP AUX channel to use +* +* Returns: The current sink count reported by @aux, or a negative error code
+ * otherwise.
+ */drivers/gpu/drm/drm_dp_helper.c bool drm_dp_has_sink_count(struct drm_connector *connector, · line 755
Quoted 10 lines
drivers/gpu/drm/drm_dp_helper.c +10
-0+int drm_dp_get_sink_count (struct drm_dp_aux *aux) +{ +u8 count; +int ret; + + ret =drm_dp_dpcd_readb (aux,DP_SINK_COUNT , &count); +if (ret <0 ) +return ret; +if (ret !=1 ) +return -EIO ;Makes me wonder if that shouldn't be at
drm_dp_dpcd_read()level, for reads returning 0..len-1 bytes. Not necessarily part of this series, but seems silly to set a precedent to start handling that return value all over the place.BR,
Jani.Quoted 57 lines
drivers/gpu/drm/drm_dp_helper.c +5
-0+ +return DP_GET_SINK_COUNT (count); +} +EXPORT_SYMBOL (drm_dp_get_sink_count); +/* * I2C-over-AUX implementation */ drivers/gpu/drm/i915/display/intel_dp.c +5
-6@@ -4648,6 +4648,8 @@ intel_dp_has_sink_count(struct intel_dp *intel_dp)static bool intel_dp_get_dpcd (struct intel_dp *intel_dp) { +int ret; +if (!intel_dp_read_dpcd (intel_dp))return false;@@ -4664,11 +4666,8 @@ intel_dp_get_dpcd(struct intel_dp *intel_dp) }if (intel_dp_has_sink_count (intel_dp)) { -u8 count; -ssize_t r; - - r =drm_dp_dpcd_readb (&intel_dp->aux,DP_SINK_COUNT , &count); -if (r <1 ) + ret =drm_dp_get_sink_count (&intel_dp->aux); +if (ret <0 )return false;/* @@ -4676,7 +4675,7 @@ intel_dp_get_dpcd(struct intel_dp *intel_dp)* a member variable in intel_dp will track any changes * between short pulse interrupts. */ - intel_dp->sink_count =DP_GET_SINK_COUNT (count); + intel_dp->sink_count = ret;/* * SINK_COUNT == 0 and DOWNSTREAM_PORT_PRESENT == 1 implies that include/drm/drm_dp_helper.h +1
-0@@ -1635,6 +1635,7 @@ struct drm_dp_desc;bool drm_dp_has_sink_count (struct drm_connector *connector,const u8 dpcd[DP_RECEIVER_CAP_SIZE ],const struct drm_dp_desc *desc); +int drm_dp_get_sink_count (struct drm_dp_aux *aux);void drm_dp_remote_aux_init (struct drm_dp_aux *aux);void drm_dp_aux_init (struct drm_dp_aux *aux);
Signature · 3 lines
Sincerely,
Lyude Paul (she/her)
Software Engineer at Red HatLyude Paul
maintainerRFC v4 17/20 drm/nouveau/kms/nv50-: Add support for DP_SINK_COUNT
In reply to Lyude PaulThis is another bit that we never implemented for nouveau: dongle detection. When a "dongle", e.g. an active display adaptor, is hooked up to the system and causes an HPD to be fired, we don't actually know whether or not there's anything plugged into the dongle without checking the sink count. As a result, plugging in a dongle without anything plugged into it currently results in a bogus EDID retrieval error in the kernel log.
Additionally, most dongles won't send another long HPD signal if the user suddenly plugs something in, they'll only send a short HPD IRQ with the expectation that the source will check the sink count and reprobe the connector if it's changed - something we don't actually do. As a result, nothing will happen if the user plugs the dongle in before plugging something into the dongle.
So, let's fix this by checking the sink count in both nouveau_dp_probe_dpcd() and nouveau_dp_irq(), and reprobing the connector if things change.
--- drivers/gpu/drm/nouveau/nouveau_dp.c | 54 ++++++++++++++++++++--- drivers/gpu/drm/nouveau/nouveau_encoder.h | 2 + 2 files changed, 51 insertions(+), 5 deletions(-)
drivers/gpu/drm/nouveau/nouveau_dp.c +49 -5
@@ -36,12 +36,22 @@ MODULE_PARM_DESC(mst, "Enable DisplayPort multi-stream (default: enabled)");static int nouveau_mst =1 ;module_param_named (mst, nouveau_mst, int,0400 ); +static bool +nouveau_dp_has_sink_count (struct drm_connector *connector, +struct nouveau_encoder *outp) +{ +return drm_dp_has_sink_count (connector, outp->dp.dpcd, + &outp->dp.desc); +} +static enum drm_connector_status nouveau_dp_probe_dpcd (struct nouveau_connector *nv_connector,struct nouveau_encoder *outp) { +struct drm_connector *connector = &nv_connector->base;struct drm_dp_aux *aux = &nv_connector->aux;struct nv50_mstm *mstm =NULL ; +enum drm_connector_status status = connector_status_disconnected;int ret;u8 *dpcd = outp->dp.dpcd;
@@ -50,9 +60,9 @@ nouveau_dp_probe_dpcd(struct nouveau_connector *nv_connector, ret =drm_dp_read_desc (aux, &outp->dp.desc,drm_dp_is_branch (dpcd));if (ret <0 ) -return connector_status_disconnected; + goto out; }else { -return connector_status_disconnected; + goto out; }if (nouveau_mst) {
@@ -61,12 +71,33 @@ nouveau_dp_probe_dpcd(struct nouveau_connector *nv_connector, mstm->can_mst =drm_dp_has_mst (aux, dpcd); } +if (nouveau_dp_has_sink_count (connector, outp)) { + ret =drm_dp_get_sink_count (aux); +if (ret <0 ) + goto out; + + outp->dp.sink_count = ret; + +/* +* Dongle connected, but no display. Don't bother reading +* downstream port info +*/ +if (!outp->dp.sink_count) +return connector_status_disconnected; + } + ret =drm_dp_downstream_read_info (aux, dpcd, outp->dp.downstream_ports);if (ret <0 ) -return connector_status_disconnected; + goto out; -return connector_status_connected; + status = connector_status_connected; +out: +if (status != connector_status_connected) { +/* Clear any cached info */ + outp->dp.sink_count =0 ; + } +return status; }int
@@ -159,6 +190,8 @@ void nouveau_dp_irq(struct nouveau_drm *drm,struct drm_connector *connector = &nv_connector->base;struct nouveau_encoder *outp =find_encoder (connector,DCB_OUTPUT_DP );struct nv50_mstm *mstm; +int ret; +bool send_hpd = false;if (!outp)return ;
@@ -170,12 +203,23 @@ void nouveau_dp_irq(struct nouveau_drm *drm,if (mstm && mstm->is_mst) {if (!nv50_mstm_service (drm, nv_connector, mstm)) -nouveau_connector_hpd (connector); + send_hpd = true; }else {drm_dp_cec_irq (&nv_connector->aux); + +if (nouveau_dp_has_sink_count (connector, outp)) { + ret =drm_dp_get_sink_count (&nv_connector->aux); +if (ret != outp->dp.sink_count) + send_hpd = true; +if (ret >=0 ) + outp->dp.sink_count = ret; + } }mutex_unlock (&outp->dp.hpd_irq_lock); + +if (send_hpd) +nouveau_connector_hpd (connector); }/* TODO:
drivers/gpu/drm/nouveau/nouveau_encoder.h +2 -0
@@ -74,6 +74,8 @@ struct nouveau_encoder {u8 dpcd[DP_RECEIVER_CAP_SIZE ];u8 downstream_ports[DP_MAX_DOWNSTREAM_PORTS ];struct drm_dp_desc desc; + +u8 sink_count; } dp; };
Signature · 1 line
2.26.2
Lyude Paul
maintainerRFC v4 18/20 drm/nouveau/kms: Don't change EDID when it hasn't actually changed
In reply to Lyude PaulCurrently in nouveau_connector_ddc_detect() and nouveau_connector_detect_lvds(), we start the connector probing process by releasing the previous EDID and informing DRM of the change. However, since commit 5186421cbfe2 ("drm: Introduce epoch counter to drm_connector") drm_connector_update_edid_property() actually checks whether the new EDID we've specified is different from the previous one, and updates the connector's epoch accordingly if it is. But, because we always set the EDID to NULL first in nouveau_connector_ddc_detect() and nouveau_connector_detect_lvds() we end up making DRM think that the EDID changes every single time we do a connector probe - which isn't needed.
So, let's fix this by not clearing the EDID at the start of the connector probing process, and instead simply changing or removing it once near the end of the probing process. This will help prevent us from sending unneeded hotplug events to userspace when nothing has actually changed.
--- drivers/gpu/drm/nouveau/nouveau_connector.c | 54 ++++++++++----------- 1 file changed, 27 insertions(+), 27 deletions(-)
drivers/gpu/drm/nouveau/nouveau_connector.c +27 -27
@@ -528,6 +528,17 @@ nouveau_connector_set_encoder(struct drm_connector *connector, } } +static void +nouveau_connector_set_edid (struct nouveau_connector *nv_connector, +struct edid *edid) +{ +struct edid *old_edid = nv_connector->edid; + +drm_connector_update_edid_property (&nv_connector->base, edid); +kfree (old_edid); + nv_connector->edid = edid; +} +static enum drm_connector_status nouveau_connector_detect (struct drm_connector *connector,bool force) {
@@ -541,13 +552,6 @@ nouveau_connector_detect(struct drm_connector *connector, bool force)int ret;enum drm_connector_status conn_status = connector_status_disconnected; -/* Cleanup the previous EDID block. */ -if (nv_connector->edid) { -drm_connector_update_edid_property (connector,NULL ); -kfree (nv_connector->edid); - nv_connector->edid =NULL ; - } -/* Outputs are only polled while runtime active, so resuming the * device here is unnecessary (and would deadlock upon runtime suspend * because it waits for polling to finish). We do however, want to
@@ -560,22 +564,23 @@ nouveau_connector_detect(struct drm_connector *connector, bool force) ret =pm_runtime_get_sync (dev->dev);if (ret <0 && ret != -EACCES ) {pm_runtime_put_autosuspend (dev->dev); +nouveau_connector_set_edid (nv_connector,NULL );return conn_status; } } nv_encoder =nouveau_connector_ddc_detect (connector);if (nv_encoder && (i2c = nv_encoder->i2c) !=NULL ) { +struct edid *new_edid; +if ((vga_switcheroo_handler_flags () &VGA_SWITCHEROO_CAN_SWITCH_DDC ) && nv_connector->type ==DCB_CONNECTOR_LVDS ) - nv_connector->edid =drm_get_edid_switcheroo (connector, - i2c); + new_edid =drm_get_edid_switcheroo (connector, i2c);else - nv_connector->edid =drm_get_edid (connector, i2c); + new_edid =drm_get_edid (connector, i2c); -drm_connector_update_edid_property (connector, - nv_connector->edid); +nouveau_connector_set_edid (nv_connector, new_edid);if (!nv_connector->edid) {NV_ERROR (drm,"DDC responded, but no EDID for %s\n" , connector->name);
@@ -609,6 +614,8 @@ nouveau_connector_detect(struct drm_connector *connector, bool force) conn_status = connector_status_connected;drm_dp_cec_set_edid (&nv_connector->aux, nv_connector->edid); goto out; + }else { +nouveau_connector_set_edid (nv_connector,NULL ); } nv_encoder =nouveau_connector_of_detect (connector);
@@ -652,18 +659,12 @@ nouveau_connector_detect_lvds(struct drm_connector *connector, bool force)struct nouveau_drm *drm =nouveau_drm (dev);struct nouveau_connector *nv_connector =nouveau_connector (connector);struct nouveau_encoder *nv_encoder =NULL ; +struct edid *edid =NULL ;enum drm_connector_status status = connector_status_disconnected; -/* Cleanup the previous EDID block. */ -if (nv_connector->edid) { -drm_connector_update_edid_property (connector,NULL ); -kfree (nv_connector->edid); - nv_connector->edid =NULL ; - } - nv_encoder =find_encoder (connector,DCB_OUTPUT_LVDS );if (!nv_encoder) -return connector_status_disconnected; + goto out;/* Try retrieving EDID via DDC */ if (!drm->vbios.fp_no_ddc) {
@@ -682,7 +683,8 @@ nouveau_connector_detect_lvds(struct drm_connector *connector, bool force)* valid - it's not (rh#613284) */ if (nv_encoder->dcb->lvdsconf.use_acpi_for_edid) { -if ((nv_connector->edid =nouveau_acpi_edid (dev, connector))) { + edid =nouveau_acpi_edid (dev, connector); +if (edid) { status = connector_status_connected; goto out; }
@@ -702,12 +704,10 @@ nouveau_connector_detect_lvds(struct drm_connector *connector, bool force)* stored for the panel stored in them. */ if (!drm->vbios.fp_no_ddc) { -struct edid *edid = - (struct edid *)nouveau_bios_embedded_edid (dev); + edid = (struct edid *)nouveau_bios_embedded_edid (dev);if (edid) { - nv_connector->edid = -kmemdup (edid,EDID_LENGTH ,GFP_KERNEL ); -if (nv_connector->edid) + edid =kmemdup (edid,EDID_LENGTH ,GFP_KERNEL ); +if (edid) status = connector_status_connected; } }
@@ -720,7 +720,7 @@ nouveau_connector_detect_lvds(struct drm_connector *connector, bool force) status = connector_status_unknown;#endif -drm_connector_update_edid_property (connector, nv_connector->edid); +nouveau_connector_set_edid (nv_connector, edid);nouveau_connector_set_encoder (connector, nv_encoder);return status; }
Signature · 1 line
2.26.2
Lyude Paul
maintainerRFC v4 19/20 drm/i915/dp: Extract drm_dp_read_dpcd_caps()
In reply to Lyude PaulSince DP 1.3, it's been possible for DP receivers to specify an additional set of DPCD capabilities, which can take precedence over the capabilities reported at DP_DPCD_REV.
Basically any device supporting DP is going to need to read these in an identical manner, in particular nouveau, so let's go ahead and just move this code out of i915 into a shared DRM DP helper that we can use in other drivers.
v2:
* Remove redundant dpcd[DP_DPCD_REV] == 0 check
* Fix drm_dp_dpcd_read() ret checks
--- drivers/gpu/drm/drm_dp_helper.c | 77 +++++++++++++++++++++ drivers/gpu/drm/i915/display/intel_dp.c | 60 +--------------- drivers/gpu/drm/i915/display/intel_dp.h | 1 - drivers/gpu/drm/i915/display/intel_lspcon.c | 2 +- include/drm/drm_dp_helper.h | 3 + 5 files changed, 83 insertions(+), 60 deletions(-)
drivers/gpu/drm/drm_dp_helper.c +77 -0
@@ -433,6 +433,83 @@ static u8 drm_dp_downstream_port_count(const u8 dpcd[DP_RECEIVER_CAP_SIZE])return port_count; } +static int drm_dp_read_extended_dpcd_caps (struct drm_dp_aux *aux, +u8 dpcd[DP_RECEIVER_CAP_SIZE ]) +{ +u8 dpcd_ext[6 ]; +int ret; + +/* +* Prior to DP1.3 the bit represented by +* DP_EXTENDED_RECEIVER_CAP_FIELD_PRESENT was reserved. +* If it is set DP_DPCD_REV at 0000h could be at a value less than +* the true capability of the panel. The only way to check is to +* then compare 0000h and 2200h. +*/ +if (!(dpcd[DP_TRAINING_AUX_RD_INTERVAL ] & +DP_EXTENDED_RECEIVER_CAP_FIELD_PRESENT )) +return 0 ; + + ret =drm_dp_dpcd_read (aux,DP_DP13_DPCD_REV , &dpcd_ext, +sizeof (dpcd_ext)); +if (ret <0 ) +return ret; +if (ret !=sizeof (dpcd_ext)) +return -EIO ; + +if (dpcd[DP_DPCD_REV ] > dpcd_ext[DP_DPCD_REV ]) { +DRM_DEBUG_KMS ("%s: Extended DPCD rev less than base DPCD rev (%d > %d)\n" , + aux->name, dpcd[DP_DPCD_REV ], + dpcd_ext[DP_DPCD_REV ]); +return 0 ; + } + +if (!memcmp (dpcd, dpcd_ext,sizeof (dpcd_ext))) +return 0 ; + +DRM_DEBUG_KMS ("%s: Base DPCD: %*ph\n" , + aux->name,DP_RECEIVER_CAP_SIZE , dpcd); + +memcpy (dpcd, dpcd_ext,sizeof (dpcd_ext)); + +return 0 ; +} + +/** +* drm_dp_read_dpcd_caps() - read DPCD caps and extended DPCD caps if +* available +* @aux: DisplayPort AUX channel +* @dpcd: Buffer to store the resulting DPCD in +* +* Attempts to read the base DPCD caps for @aux. Additionally, this function +* checks for and reads the extended DPRX caps (%DP_DP13_DPCD_REV) if +* present. +* +* Returns: %0 if the DPCD was read successfully, negative error code +* otherwise. +*/ +int drm_dp_read_dpcd_caps (struct drm_dp_aux *aux, +u8 dpcd[DP_RECEIVER_CAP_SIZE ]) +{ +int ret; + + ret =drm_dp_dpcd_read (aux,DP_DPCD_REV , dpcd,DP_RECEIVER_CAP_SIZE ); +if (ret <0 ) +return ret; +if (ret !=DP_RECEIVER_CAP_SIZE || dpcd[DP_DPCD_REV ] ==0 ) +return -EIO ; + + ret =drm_dp_read_extended_dpcd_caps (aux, dpcd); +if (ret <0 ) +return ret; + +DRM_DEBUG_KMS ("%s: DPCD: %*ph\n" , + aux->name,DP_RECEIVER_CAP_SIZE , dpcd); + +return ret; +} +EXPORT_SYMBOL (drm_dp_read_dpcd_caps); +/** * drm_dp_downstream_read_info() - read DPCD downstream port info if available * @aux: DisplayPort AUX channel
drivers/gpu/drm/i915/display/intel_dp.c +2 -58
78 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_dp.h +0 -1
@@ -99,7 +99,6 @@ bool intel_dp_source_supports_hbr3(struct intel_dp *intel_dp);bool intel_dp_get_link_status (struct intel_dp *intel_dp,u8 *link_status); -bool intel_dp_read_dpcd (struct intel_dp *intel_dp);bool intel_dp_get_colorimetry_status (struct intel_dp *intel_dp);int intel_dp_link_required (int pixel_clock,int bpp);int intel_dp_max_data_rate (int max_link_clock,int max_lanes);
drivers/gpu/drm/i915/display/intel_lspcon.c +1 -1
@@ -571,7 +571,7 @@ bool lspcon_init(struct intel_digital_port *dig_port)return false; } -if (!intel_dp_read_dpcd (dp)) { +if (drm_dp_read_dpcd_caps (&dp->aux, dp->dpcd) !=0 ) {DRM_ERROR ("LSPCON DPCD read failed\n" );return false; }
include/drm/drm_dp_helper.h +3 -0
@@ -1607,6 +1607,9 @@ static inline ssize_t drm_dp_dpcd_writeb(struct drm_dp_aux *aux,return drm_dp_dpcd_write (aux, offset, &value,1 ); } +int drm_dp_read_dpcd_caps (struct drm_dp_aux *aux, +u8 dpcd[DP_RECEIVER_CAP_SIZE ]); +int drm_dp_dpcd_read_link_status (struct drm_dp_aux *aux,u8 status[DP_LINK_STATUS_SIZE ]);
Signature · 1 line
2.26.2
Lyude Paul
maintainerRFC v4 20/20 drm/nouveau/kms: Start using drm_dp_read_dpcd_caps()
In reply to Lyude PaulNow that we've extracted i915's code for reading both the normal DPCD caps and extended DPCD caps into a shared helper, let's start using this in nouveau to enable us to start checking extended DPCD caps for free.
--- drivers/gpu/drm/nouveau/nouveau_dp.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-)
drivers/gpu/drm/nouveau/nouveau_dp.c +6 -8
@@ -55,15 +55,13 @@ nouveau_dp_probe_dpcd(struct nouveau_connector *nv_connector,int ret;u8 *dpcd = outp->dp.dpcd; - ret =drm_dp_dpcd_read (aux,DP_DPCD_REV , dpcd,DP_RECEIVER_CAP_SIZE ); -if (ret ==DP_RECEIVER_CAP_SIZE && dpcd[DP_DPCD_REV ]) { - ret =drm_dp_read_desc (aux, &outp->dp.desc, -drm_dp_is_branch (dpcd)); -if (ret <0 ) - goto out; - }else { + ret =drm_dp_read_dpcd_caps (aux, dpcd); +if (ret <0 ) + goto out; + + ret =drm_dp_read_desc (aux, &outp->dp.desc,drm_dp_is_branch (dpcd)); +if (ret <0 ) goto out; - }if (nouveau_mst) { mstm = outp->dp.mstm;
Signature · 1 line
2.26.2
Patchwork
CI[Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/dp, i915, nouveau: Cleanup nouveau HPD and add DP features from i915 (rev6)
In reply to Lyude Paul== Series Details ==
== Series Details ==
Series: drm/dp, i915, nouveau: Cleanup nouveau HPD and add DP features from i915 (rev6)
URL : https://patchwork.freedesktop.org/series/80542/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip eb602825d26c drm/nouveau/kms: Fix some indenting in nouveau_dp_detect() -:7: WARNING:COMMIT_MESSAGE: Missing commit description - Add an appropriate one
total: 0 errors, 1 warnings, 0 checks, 21 lines checked72930d9382f6 drm/nouveau/kms/nv50-: Remove open-coded drm_dp_read_desc()
-:102: WARNING:FUNCTION_ARGUMENTS: function definition argument 'struct nouveau_connector *' should also have an identifier name #102: FILE: drivers/gpu/drm/nouveau/nouveau_encoder.h:109:
+int nouveau_dp_detect(struct nouveau_connector *, struct nouveau_encoder *);
-:102: WARNING:FUNCTION_ARGUMENTS: function definition argument 'struct nouveau_encoder *' should also have an identifier name #102: FILE: drivers/gpu/drm/nouveau/nouveau_encoder.h:109:
+int nouveau_dp_detect(struct nouveau_connector *, struct nouveau_encoder *);
total: 0 errors, 2 warnings, 0 checks, 74 lines checked8759e1743599 drm/nouveau/kms/nv50-: Just use drm_dp_dpcd_read() in nouveau_dp.ce43e30c39e26 drm/nouveau/kms/nv50-: Use macros for DP registers in nouveau_dp.c8f3b7f3b21f2 drm/nouveau/kms: Don't clear DP_MST_CTRL DPCD in nv50_mstm_new()
-:7: ERROR:GIT_COMMIT_ID: Please use git commit description style 'commit <12+ chars of sha1> ("<title line>")' - ie: 'commit fa3cdf8d0b09 ("drm/nouveau: Reset MST branching unit before enabling")' #7:
Since fa3cdf8d0b09 ("drm/nouveau: Reset MST branching unit before
total: 1 errors, 0 warnings, 0 checks, 17 lines checked8f57184d747b drm/nouveau/kms: Search for encoders' connectors properly09f88a09f081 drm/nouveau/kms/nv50-: Use drm_dp_dpcd_(readb|writeb)() in nv50_sor_disable() 7a508e1c0b76 drm/nouveau/kms/nv50-: Refactor and cleanup DP HPD handling
-:53: WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line) #53:
* Enabling bits in MSTM_CTRL before calling drm_dp_mst_topology_mgr_set_mst().
-:465: WARNING:FUNCTION_ARGUMENTS: function definition argument 'struct drm_device *' should also have an identifier name #465: FILE: drivers/gpu/drm/nouveau/nouveau_display.h:21:
+ void (*fini)(struct drm_device *, bool suspend, bool runtime);
total: 0 errors, 2 warnings, 0 checks, 574 lines checkedfd0c71a5229b drm/i915/dp: Extract drm_dp_has_mst()fc79d4524d15 drm/nouveau/kms: Use new drm_dp_has_mst() helper for checking MST caps -:8: WARNING:COMMIT_MESSAGE: Missing commit description - Add an appropriate one
total: 0 errors, 1 warnings, 0 checks, 29 lines checkeda6246286cc09 drm/nouveau/kms: Move drm_dp_cec_unset_edid() into nouveau_connector_detect() a122aee25a76 drm/nouveau/kms: Only use hpd_work for reprobing in HPD paths -:279: CHECK:UNCOMMENTED_DEFINITION: struct mutex definition without comment #279: FILE: drivers/gpu/drm/nouveau/nouveau_drv.h:201:
+ struct mutex hpd_lock;
total: 0 errors, 0 warnings, 1 checks, 219 lines checked41fcfb67337b drm/i915/dp: Extract drm_dp_downstream_read_info() cca56ef60b60 drm/nouveau/kms/nv50-: Use downstream DP clock limits for mode validation -:63: WARNING:UNSPECIFIED_INT: Prefer 'unsigned int' to bare use of 'unsigned' #63: FILE: drivers/gpu/drm/nouveau/nouveau_dp.c:194:
+ unsigned max_clock, ds_clock, clock;
total: 0 errors, 1 warnings, 0 checks, 57 lines checked31c957b672ab drm/i915/dp: Extract drm_dp_has_sink_count()05083fd03635 drm/i915/dp: Extract drm_dp_get_sink_count()
-:12: WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line) #12:
* Add back comment and move back sink_count assignment in intel_dp_get_dpcd()
total: 0 errors, 1 warnings, 0 checks, 64 lines checked390fb4de03ef drm/nouveau/kms/nv50-: Add support for DP_SINK_COUNT
-:11: WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line) #11:
plugged into it currently results in a bogus EDID retrieval error in the kernel log.
total: 0 errors, 1 warnings, 0 checks, 108 lines checked 774099851b4b drm/nouveau/kms: Don't change EDID when it hasn't actually changed 016677842b85 drm/i915/dp: Extract drm_dp_read_dpcd_caps() 14b3532be864 drm/nouveau/kms: Start using drm_dp_read_dpcd_caps()
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✗ Fi.CI.SPARSE: warning for drm/dp, i915, nouveau: Cleanup nouveau HPD and add DP features from i915 (rev6)
In reply to Lyude Paul== Series Details ==
== Series Details ==
Series: drm/dp, i915, nouveau: Cleanup nouveau HPD and add DP features from i915 (rev6)
URL : https://patchwork.freedesktop.org/series/80542/
State : warning
== Summary ==
$ dim sparse --fast origin/drm-tip Sparse version: v0.6.2 Fast mode used, each commit won't be checked separately. - +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:1019:47: expected unsigned int [addressable] [usertype] ulClockParams +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:1019:47: got restricted __le32 [usertype] +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:1019:47: warning: incorrect type in assignment (different base types) +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:1028:50: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:1029:49: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:1037:47: warning: too many warnings +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:184:44: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:283:14: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:320:14: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:323:14: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:326:14: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:329:18: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:330:26: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:338:30: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:340:38: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:342:30: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:346:30: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:348:30: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:353:33: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:367:43: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:369:38: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:374:67: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:375:53: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:378:66: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:389:80: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:395:57: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:402:69: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:403:53: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:406:66: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:414:66: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:423:69: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:424:69: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:473:30: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:476:45: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:477:45: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:484:54: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:52:28: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:531:35: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:53:29: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:533:25: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:54:26: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:55:27: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:56:25: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:57:26: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:577:21: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:581:25: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:58:25: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:583:21: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:586:25: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:590:25: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:59:26: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:598:21: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:600:21: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:617:25: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:621:21: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:623:21: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:630:21: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:632:21: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:644:25: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:648:21: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:650:21: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:657:21: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:659:21: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:662:21: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:664:21: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:676:25: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:688:25: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:691:47: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:697:25: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:796:46: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:797:40: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:800:46: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:801:40: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:804:46: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:805:40: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:812:46: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:813:40: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:816:46: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:817:40: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:820:46: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:821:40: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:828:46: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:829:40: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:832:46: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:833:40: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:836:46: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:837:40: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:844:46: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:845:40: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:848:46: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:849:40: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:852:46: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:853:40: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:916:47: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:918:49: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:920:52: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:934:47: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:936:49: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:938:52: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:956:47: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:958:49: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:960:52: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c:328:34: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c:365:34: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c:395:25: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c:397:25: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c:404:25: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c:418:40: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c:441:40: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c:44:21: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c:482:53: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c:486:33: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c:489:61: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c:490:64: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c:492:54: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c:518:17: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c:521:21: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c:64:25: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c:80:17: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c:80:17: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c:80:17: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c:85:30: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c:86:24: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c:98:39: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c:222:29: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c:226:37: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c:226:37: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c:226:37: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c:227:37: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c:233:43: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c:236:44: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c:239:51: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c:458:41: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c:458:41: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c:458:41: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c:464:39: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c:465:30: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c:466:39: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c:468:24: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c:140:26: expected unsigned long long [usertype] *chunk_array_user +drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c:140:26: got void [noderef] __user * +drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c:140:26: warning: incorrect type in assignment (different address spaces) +drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c:141:41: expected void const [noderef] __user *from +drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c:141:41: got unsigned long long [usertype] *chunk_array_user +drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c:141:41: warning: incorrect type in argument 2 (different address spaces) +drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c:160:27: expected struct drm_amdgpu_cs_chunk [noderef] __user **chunk_ptr +drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c:160:27: got void [noderef] __user * +drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c:160:27: warning: incorrect type in assignment (different address spaces) +drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c:1613:21: expected struct drm_amdgpu_fence *fences_user +drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c:1613:21: got void [noderef] __user * +drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c:1613:21: warning: incorrect type in assignment (different address spaces) +drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c:1614:36: expected void const [noderef] __user *from +drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c:1614:36: got struct drm_amdgpu_fence *fences_user +drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c:1614:36: warning: incorrect type in argument 2 (different address spaces) +drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c:161:49: expected void const [noderef] __user *from +drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c:161:49: got struct drm_amdgpu_cs_chunk [noderef] __user **chunk_ptr +drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c:161:49: warning: incorrect type in argument 2 (different address spaces) +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:1357:25: error: incompatible types in comparison expression (different address spaces): +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:1357:25: struct dma_fence * +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:1357:25: struct dma_fence [noderef] __rcu * +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:1358:17: error: incompatible types in comparison expression (different address spaces): +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:1358:17: struct dma_fence * +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:1358:17: struct dma_fence [noderef] __rcu * +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:138:17: expected restricted __poll_t ( *poll )( ... ) +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:138:17: got unsigned int ( * )( ... ) +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:138:17: warning: incorrect type in initializer (different base types) +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:1417:17: error: incompatible types in comparison expression (different address spaces): +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:1417:17: struct dma_fence * +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:1417:17: struct dma_fence [noderef] __rcu * +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:261:29: expected void const volatile [noderef] __user * +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:261:29: got unsigned int [usertype] * +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:261:29: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:261:29: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:261:29: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:261:29: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:261:29: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:261:29: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:261:29: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:261:29: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:261:29: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:261:29: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:261:29: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:261:29: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:261:29: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:261:29: warning: incorrect type in argument 1 (different address spaces) +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:263:29: expected void const volatile [noderef] __user * +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:263:29: got unsigned int [usertype] * +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:263:29: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:263:29: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:263:29: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:263:29: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:263:29: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:263:29: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:263:29: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:263:29: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:263:29: warning: incorrect type in argument 1 (different address spaces) +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:354:21: expected void const volatile [noderef] __user * +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:354:21: got unsigned int [usertype] * +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:354:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:354:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:354:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:354:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:354:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:354:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:354:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:354:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:354:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:354:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:354:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:354:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:354:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:354:21: warning: incorrect type in argument 1 (different address spaces) +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:412:21: expected void const volatile [noderef] __user * +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:412:21: got unsigned int [usertype] * +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:412:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:412:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:412:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:412:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:412:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:412:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:412:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:412:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:412:21: warning: incorrect type in argument 1 (different address spaces) +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:473:21: expected void const volatile [noderef] __user * +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:473:21: got unsigned int [usertype] * +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:473:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:473:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:473:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:473:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:473:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:473:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:473:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:473:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:473:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:473:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:473:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:473:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:473:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:473:21: warning: incorrect type in argument 1 (different address spaces) +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:531:21: expected void const volatile [noderef] __user * +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:531:21: got unsigned int [usertype] * +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:531:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:531:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:531:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:531:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:531:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:531:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:531:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:531:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:531:21: warning: incorrect type in argument 1 (different address spaces) +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:592:21: expected void const volatile [noderef] __user * +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:592:21: got unsigned int [usertype] * +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:592:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:592:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:592:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:592:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:592:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:592:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:592:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:592:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:592:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:592:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:592:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:592:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:592:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:592:21: warning: incorrect type in argument 1 (different address spaces) +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:650:21: expected void const volatile [noderef] __user * +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:650:21: got unsigned int [usertype] * +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:650:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:650:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:650:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:650:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:650:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:650:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:650:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:650:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:650:21: warning: incorrect type in argument 1 (different address spaces) +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:747:21: expected void const volatile [noderef] __user * +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:747:21: got unsigned int [usertype] * +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:747:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:747:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:747:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:747:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:747:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:747:21: warning: incorrect type in argument 1 (different address spaces) +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:747:21: warning: too many warnings +drivers/gpu/drm/amd/amdgpu/amdgpu_device.c:1666:65: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_device.c:1674:55: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_device.c:1675:50: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_device.c:1676:50: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_device.c:1677:56: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_device.c:1679:25: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_device.c:1680:45: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_device.c:1681:51: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_device.c:1682:55: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_device.c:1683:57: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_device.c:1685:25: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_device.c:1686:53: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_device.c:1688:25: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_device.c:1690:25: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_device.c:1691:46: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_device.c:1695:73: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_device.c:1697:33: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_device.c:1699:33: warning: cast to restricted __le32 +drivers/gpu/drm/amd/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✗ Fi.CI.BAT: failure for drm/dp, i915, nouveau: Cleanup nouveau HPD and add DP features from i915 (rev6)
In reply to Lyude Paul== Series Details ==
== Series Details ==
Series: drm/dp, i915, nouveau: Cleanup nouveau HPD and add DP features from i915 (rev6)
URL : https://patchwork.freedesktop.org/series/80542/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_8924 -> Patchwork_18400
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_18400 absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_18400, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18400/index.html
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_18400:
### IGT changes ###
#### Possible regressions ####
* igt@runner@aborted:
- fi-kbl-7500u: NOTRUN -> [FAIL][1]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18400/fi-kbl-7500u/igt@[email protected]
Known issues
------------
Here are the changes found in Patchwork_18400 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_parallel@engines@fds:
- fi-kbl-guc: [PASS][2] -> [INCOMPLETE][3] ([i915#794])
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8924/fi-kbl-guc/igt@gem_exec_parallel@[email protected]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18400/fi-kbl-guc/igt@gem_exec_parallel@[email protected]
* igt@kms_busy@basic@flip:
- fi-kbl-x1275: [PASS][4] -> [DMESG-WARN][5] ([i915#62] / [i915#92] / [i915#95])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8924/fi-kbl-x1275/igt@kms_busy@[email protected]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18400/fi-kbl-x1275/igt@kms_busy@[email protected]
* igt@kms_flip@basic-flip-vs-wf_vblank@c-edp1:
- fi-icl-u2: [PASS][6] -> [DMESG-WARN][7] ([i915#1982]) +1 similar issue
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8924/fi-icl-u2/igt@kms_flip@[email protected]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18400/fi-icl-u2/igt@kms_flip@[email protected]
#### Possible fixes ####
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic:
- fi-bsw-n3050: [DMESG-WARN][8] ([i915#1982]) -> [PASS][9]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8924/fi-bsw-n3050/igt@[email protected]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18400/fi-bsw-n3050/igt@[email protected]
- fi-byt-j1900: [DMESG-WARN][10] ([i915#1982]) -> [PASS][11] +1 similar issue
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8924/fi-byt-j1900/igt@[email protected]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18400/fi-byt-j1900/igt@[email protected]
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy:
- fi-icl-u2: [DMESG-WARN][12] ([i915#1982]) -> [PASS][13]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8924/fi-icl-u2/igt@[email protected]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18400/fi-icl-u2/igt@[email protected]
* igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a:
- fi-apl-guc: [INCOMPLETE][14] ([i915#1635] / [i915#337]) -> [PASS][15]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8924/fi-apl-guc/igt@[email protected]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18400/fi-apl-guc/igt@[email protected]
#### Warnings ####
* igt@gem_exec_suspend@basic-s0:
- fi-kbl-x1275: [DMESG-WARN][16] ([i915#62] / [i915#92]) -> [DMESG-WARN][17] ([i915#1982] / [i915#62] / [i915#92] / [i915#95])
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8924/fi-kbl-x1275/igt@[email protected]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18400/fi-kbl-x1275/igt@[email protected]
* igt@gem_exec_suspend@basic-s3:
- fi-kbl-x1275: [DMESG-WARN][18] ([i915#62] / [i915#92] / [i915#95]) -> [DMESG-WARN][19] ([i915#1982] / [i915#62] / [i915#92] / [i915#95])
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8924/fi-kbl-x1275/igt@[email protected]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18400/fi-kbl-x1275/igt@[email protected]
* igt@i915_pm_rpm@module-reload:
- fi-kbl-x1275: [DMESG-FAIL][20] ([i915#62] / [i915#95]) -> [DMESG-FAIL][21] ([i915#62])
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8924/fi-kbl-x1275/igt@[email protected]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18400/fi-kbl-x1275/igt@[email protected]
* igt@kms_cursor_legacy@basic-flip-after-cursor-legacy:
- fi-kbl-x1275: [DMESG-WARN][22] ([i915#62] / [i915#92]) -> [DMESG-WARN][23] ([i915#62] / [i915#92] / [i915#95]) +3 similar issues
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8924/fi-kbl-x1275/igt@[email protected]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18400/fi-kbl-x1275/igt@[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[i915#1635]: https://gitlab.freedesktop.org/drm/intel/issues/1635
[i915#1814]: https://gitlab.freedesktop.org/drm/intel/issues/1814
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#337]: https://gitlab.freedesktop.org/drm/intel/issues/337
[i915#62]: https://gitlab.freedesktop.org/drm/intel/issues/62
[i915#794]: https://gitlab.freedesktop.org/drm/intel/issues/794
[i915#92]: https://gitlab.freedesktop.org/drm/intel/issues/92
[i915#95]: https://gitlab.freedesktop.org/drm/intel/issues/95
Participating hosts (37 -> 34)
------------------------------
Missing (3): fi-byt-clapper fi-byt-squawks fi-bsw-cyan
Build changes
-------------
* Linux: CI_DRM_8924 -> Patchwork_18400
CI-20190529: 20190529
CI_DRM_8924: a8c0611e412aab46eab5475b0117d074892b96e2 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5770: f1d0c240ea2e631dfb9f493f37f8fb61cb2b1cf2 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_18400: 14b3532be864e204aa07bf7e37e53ff40c2cb576 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
14b3532be864 drm/nouveau/kms: Start using drm_dp_read_dpcd_caps() 016677842b85 drm/i915/dp: Extract drm_dp_read_dpcd_caps()774099851b4b drm/nouveau/kms: Don't change EDID when it hasn't actually changed 390fb4de03ef drm/nouveau/kms/nv50-: Add support for DP_SINK_COUNT 05083fd03635 drm/i915/dp: Extract drm_dp_get_sink_count()31c957b672ab drm/i915/dp: Extract drm_dp_has_sink_count()cca56ef60b60 drm/nouveau/kms/nv50-: Use downstream DP clock limits for mode validation 41fcfb67337b drm/i915/dp: Extract drm_dp_downstream_read_info() a122aee25a76 drm/nouveau/kms: Only use hpd_work for reprobing in HPD paths a6246286cc09 drm/nouveau/kms: Move drm_dp_cec_unset_edid() into nouveau_connector_detect() fc79d4524d15 drm/nouveau/kms: Use new drm_dp_has_mst() helper for checking MST caps fd0c71a5229b drm/i915/dp: Extract drm_dp_has_mst()7a508e1c0b76 drm/nouveau/kms/nv50-: Refactor and cleanup DP HPD handling 09f88a09f081 drm/nouveau/kms/nv50-: Use drm_dp_dpcd_(readb|writeb)() in nv50_sor_disable() 8f57184d747b drm/nouveau/kms: Search for encoders' connectors properly 8f3b7f3b21f2 drm/nouveau/kms: Don't clear DP_MST_CTRL DPCD in nv50_mstm_new() e43e30c39e26 drm/nouveau/kms/nv50-: Use macros for DP registers in nouveau_dp.c 8759e1743599 drm/nouveau/kms/nv50-: Just use drm_dp_dpcd_read() in nouveau_dp.c 72930d9382f6 drm/nouveau/kms/nv50-: Remove open-coded drm_dp_read_desc() eb602825d26c drm/nouveau/kms: Fix some indenting in nouveau_dp_detect()
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18400/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx