2009-12-11 17:24:15 +08:00
|
|
|
/*
|
|
|
|
* Copyright (C) 2008 Maarten Maathuis.
|
|
|
|
* All Rights Reserved.
|
|
|
|
*
|
|
|
|
* Permission is hereby granted, free of charge, to any person obtaining
|
|
|
|
* a copy of this software and associated documentation files (the
|
|
|
|
* "Software"), to deal in the Software without restriction, including
|
|
|
|
* without limitation the rights to use, copy, modify, merge, publish,
|
|
|
|
* distribute, sublicense, and/or sell copies of the Software, and to
|
|
|
|
* permit persons to whom the Software is furnished to do so, subject to
|
|
|
|
* the following conditions:
|
|
|
|
*
|
|
|
|
* The above copyright notice and this permission notice (including the
|
|
|
|
* next paragraph) shall be included in all copies or substantial
|
|
|
|
* portions of the Software.
|
|
|
|
*
|
|
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
|
|
|
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
|
|
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
|
|
|
* IN NO EVENT SHALL THE COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE
|
|
|
|
* LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
|
|
|
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
|
|
|
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
|
|
|
#ifndef __NOUVEAU_ENCODER_H__
|
|
|
|
#define __NOUVEAU_ENCODER_H__
|
|
|
|
|
2012-07-26 07:12:47 +08:00
|
|
|
#include <subdev/bios/dcb.h>
|
|
|
|
|
2012-10-03 01:01:07 +08:00
|
|
|
#include <drm/drm_encoder_slave.h>
|
2016-11-04 15:20:36 +08:00
|
|
|
#include <drm/drm_dp_mst_helper.h>
|
2013-03-21 13:45:11 +08:00
|
|
|
#include "dispnv04/disp.h"
|
2018-05-08 18:39:47 +08:00
|
|
|
struct nv50_head_atom;
|
2020-08-27 02:24:38 +08:00
|
|
|
struct nouveau_connector;
|
2009-12-11 17:24:15 +08:00
|
|
|
|
|
|
|
#define NV_DPMS_CLEARED 0x80
|
|
|
|
|
2015-01-14 13:36:34 +08:00
|
|
|
struct nvkm_i2c_port;
|
2012-07-10 12:36:38 +08:00
|
|
|
|
2009-12-11 17:24:15 +08:00
|
|
|
struct nouveau_encoder {
|
|
|
|
struct drm_encoder_slave base;
|
|
|
|
|
2012-07-11 08:44:20 +08:00
|
|
|
struct dcb_output *dcb;
|
2009-12-11 17:24:15 +08:00
|
|
|
int or;
|
2017-05-19 21:59:35 +08:00
|
|
|
int link;
|
2015-08-20 12:54:15 +08:00
|
|
|
|
|
|
|
struct i2c_adapter *i2c;
|
|
|
|
struct nvkm_i2c_aux *aux;
|
2009-12-11 17:24:15 +08:00
|
|
|
|
2010-07-01 13:33:45 +08:00
|
|
|
/* different to drm_encoder.crtc, this reflects what's
|
|
|
|
* actually programmed on the hw, not the proposed crtc */
|
|
|
|
struct drm_crtc *crtc;
|
2014-06-05 08:59:55 +08:00
|
|
|
u32 ctrl;
|
2020-11-14 08:14:17 +08:00
|
|
|
|
|
|
|
/* Protected by nouveau_drm.audio.lock */
|
|
|
|
struct {
|
|
|
|
bool enabled;
|
|
|
|
struct drm_connector *connector;
|
|
|
|
} audio;
|
2010-07-01 13:33:45 +08:00
|
|
|
|
2009-12-11 17:24:15 +08:00
|
|
|
struct drm_display_mode mode;
|
|
|
|
int last_dpms;
|
|
|
|
|
|
|
|
struct nv04_output_reg restore;
|
|
|
|
|
|
|
|
union {
|
|
|
|
struct {
|
2016-11-04 15:20:36 +08:00
|
|
|
struct nv50_mstm *mstm;
|
2009-12-11 17:24:15 +08:00
|
|
|
int link_nr;
|
|
|
|
int link_bw;
|
drm/nouveau/kms/nv50-: Refactor and cleanup DP HPD handling
First 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!
Signed-off-by: Lyude Paul <lyude@redhat.com>
Reviewed-by: Ben Skeggs <bskeggs@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200826182456.322681-9-lyude@redhat.com
2020-08-27 02:24:44 +08:00
|
|
|
|
|
|
|
/* Protects DP state that needs to be accessed outside
|
|
|
|
* connector reprobing contexts
|
|
|
|
*/
|
|
|
|
struct mutex hpd_irq_lock;
|
|
|
|
|
|
|
|
u8 dpcd[DP_RECEIVER_CAP_SIZE];
|
2020-08-27 02:24:50 +08:00
|
|
|
u8 downstream_ports[DP_MAX_DOWNSTREAM_PORTS];
|
2020-08-27 02:24:38 +08:00
|
|
|
struct drm_dp_desc desc;
|
2020-08-27 02:24:53 +08:00
|
|
|
|
|
|
|
u8 sink_count;
|
2009-12-11 17:24:15 +08:00
|
|
|
} dp;
|
|
|
|
};
|
2015-12-05 00:14:07 +08:00
|
|
|
|
2020-05-12 06:41:24 +08:00
|
|
|
struct {
|
|
|
|
bool dp_interlace : 1;
|
|
|
|
} caps;
|
|
|
|
|
2015-12-05 00:14:07 +08:00
|
|
|
void (*enc_save)(struct drm_encoder *encoder);
|
|
|
|
void (*enc_restore)(struct drm_encoder *encoder);
|
2016-11-04 15:20:36 +08:00
|
|
|
void (*update)(struct nouveau_encoder *, u8 head,
|
2018-05-08 18:39:47 +08:00
|
|
|
struct nv50_head_atom *, u8 proto, u8 depth);
|
2009-12-11 17:24:15 +08:00
|
|
|
};
|
|
|
|
|
drm/nouveau/kms/nv50-: Refactor and cleanup DP HPD handling
First 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!
Signed-off-by: Lyude Paul <lyude@redhat.com>
Reviewed-by: Ben Skeggs <bskeggs@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200826182456.322681-9-lyude@redhat.com
2020-08-27 02:24:44 +08:00
|
|
|
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;
|
|
|
|
};
|
|
|
|
|
2011-08-02 17:29:37 +08:00
|
|
|
struct nouveau_encoder *
|
|
|
|
find_encoder(struct drm_connector *connector, int type);
|
|
|
|
|
2009-12-11 17:24:15 +08:00
|
|
|
static inline struct nouveau_encoder *nouveau_encoder(struct drm_encoder *enc)
|
|
|
|
{
|
|
|
|
struct drm_encoder_slave *slave = to_encoder_slave(enc);
|
|
|
|
|
|
|
|
return container_of(slave, struct nouveau_encoder, base);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline struct drm_encoder *to_drm_encoder(struct nouveau_encoder *enc)
|
|
|
|
{
|
|
|
|
return &enc->base.base;
|
|
|
|
}
|
|
|
|
|
2015-12-15 19:20:58 +08:00
|
|
|
static inline const struct drm_encoder_slave_funcs *
|
2010-07-20 22:48:08 +08:00
|
|
|
get_slave_funcs(struct drm_encoder *enc)
|
|
|
|
{
|
|
|
|
return to_encoder_slave(enc)->slave_funcs;
|
|
|
|
}
|
|
|
|
|
2012-03-09 14:22:56 +08:00
|
|
|
/* nouveau_dp.c */
|
2016-11-04 15:20:36 +08:00
|
|
|
enum nouveau_dp_status {
|
drm/nouveau/kms/nv50-: Refactor and cleanup DP HPD handling
First 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!
Signed-off-by: Lyude Paul <lyude@redhat.com>
Reviewed-by: Ben Skeggs <bskeggs@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200826182456.322681-9-lyude@redhat.com
2020-08-27 02:24:44 +08:00
|
|
|
NOUVEAU_DP_NONE,
|
2016-11-04 15:20:36 +08:00
|
|
|
NOUVEAU_DP_SST,
|
|
|
|
NOUVEAU_DP_MST,
|
|
|
|
};
|
|
|
|
|
2020-08-27 02:24:38 +08:00
|
|
|
int nouveau_dp_detect(struct nouveau_connector *, struct nouveau_encoder *);
|
drm/nouveau/kms/nv50-: Refactor and cleanup DP HPD handling
First 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!
Signed-off-by: Lyude Paul <lyude@redhat.com>
Reviewed-by: Ben Skeggs <bskeggs@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200826182456.322681-9-lyude@redhat.com
2020-08-27 02:24:44 +08:00
|
|
|
void nouveau_dp_irq(struct nouveau_drm *drm,
|
|
|
|
struct nouveau_connector *nv_connector);
|
2020-05-12 06:41:27 +08:00
|
|
|
enum drm_mode_status nv50_dp_mode_valid(struct drm_connector *,
|
|
|
|
struct nouveau_encoder *,
|
|
|
|
const struct drm_display_mode *,
|
|
|
|
unsigned *clock);
|
2012-03-09 14:22:56 +08:00
|
|
|
|
2009-12-11 17:24:15 +08:00
|
|
|
struct nouveau_connector *
|
2020-11-14 08:14:14 +08:00
|
|
|
nv50_outp_get_new_connector(struct drm_atomic_state *state, struct nouveau_encoder *outp);
|
2020-08-27 02:24:42 +08:00
|
|
|
struct nouveau_connector *
|
2020-11-14 08:14:14 +08:00
|
|
|
nv50_outp_get_old_connector(struct drm_atomic_state *state, struct nouveau_encoder *outp);
|
2012-03-09 14:22:56 +08:00
|
|
|
|
drm/nouveau/kms/nv50-: Refactor and cleanup DP HPD handling
First 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!
Signed-off-by: Lyude Paul <lyude@redhat.com>
Reviewed-by: Ben Skeggs <bskeggs@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200826182456.322681-9-lyude@redhat.com
2020-08-27 02:24:44 +08:00
|
|
|
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);
|
2009-12-11 17:24:15 +08:00
|
|
|
#endif /* __NOUVEAU_ENCODER_H__ */
|