diff options
| author |   Ben Skeggs <bskeggs@redhat.com> | 2020-05-29 17:57:29 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2020-06-01 17:28:42 +1000 |
| commit | 0ad679d157aa69ddf0ee46b564c9fbb646cf6d4e (patch) | |
| tree | 9d690e598b786630c9da5781dd54c0f135f432ce /drivers/gpu/drm/nouveau/nouveau_encoder.h | |
| parent | drm/nouveau/disp/gm200-: fix NV_PDISP_SOR_HDMI2_CTRL(n) selection (diff) | |
| download | linux-dev-0ad679d157aa69ddf0ee46b564c9fbb646cf6d4e.tar.xz linux-dev-0ad679d157aa69ddf0ee46b564c9fbb646cf6d4e.zip | |
drm/nouveau/kms/gt215-: fix race with audio driver runpm
The audio driver can call into nouveau right while we're in the middle
of re-fetching the EDID, and decide it no longer needs to be awake.
Stop depending on EDID in the audio component get_eld() callback, and
instead cache whether audio support is present from the prior modeset.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_encoder.h')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_encoder.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_encoder.h b/drivers/gpu/drm/nouveau/nouveau_encoder.h index de51733b0476..a72c412ac8b1 100644 --- a/drivers/gpu/drm/nouveau/nouveau_encoder.h +++ b/drivers/gpu/drm/nouveau/nouveau_encoder.h @@ -52,6 +52,7 @@ struct nouveau_encoder { * actually programmed on the hw, not the proposed crtc */ struct drm_crtc *crtc; u32 ctrl; + bool audio; struct drm_display_mode mode; int last_dpms; |