summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/nouveau_encoder.h
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2022-06-01 20:46:32 +1000
committerBen Skeggs <bskeggs@redhat.com>2022-11-07 12:59:28 +1000
commitea6143a86c67110a2c62deaf70d0b7b92e4f865f (patch)
treecac55fae72206788b5e272018167a25389272199 /drivers/gpu/drm/nouveau/nouveau_encoder.h
parent60ba8c5bd94e17ab4b024f5cecf8b48e2cf36412 (diff)
downloadlinux-stable-ea6143a86c67110a2c62deaf70d0b7b92e4f865f.tar.gz
linux-stable-ea6143a86c67110a2c62deaf70d0b7b92e4f865f.tar.bz2
linux-stable-ea6143a86c67110a2c62deaf70d0b7b92e4f865f.zip
drm/nouveau/disp: move and extend the role of outp acquire/release methods
There are various pieces of information we pass to NVKM about the next modeset, which are generally used while handling supervisor interrupts. We had to start passing in some information about audio requirements a while back to allocate an appropriate SOR in ACQUIRE, so we may as well move all this type of information here for other protocols too. Certain methods will be blocked on non-acquired outputs now, preventing NULL pointer derefs from KMS driver bugs. Signed-off-by: Ben Skeggs <bskeggs@redhat.com> Reviewed-by: Lyude Paul <lyude@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_encoder.h')
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_encoder.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_encoder.h b/drivers/gpu/drm/nouveau/nouveau_encoder.h
index b72e5783a00f..b6c51fc60d13 100644
--- a/drivers/gpu/drm/nouveau/nouveau_encoder.h
+++ b/drivers/gpu/drm/nouveau/nouveau_encoder.h
@@ -48,7 +48,6 @@ struct nouveau_encoder {
struct dcb_output *dcb;
struct nvif_outp outp;
int or;
- int link;
struct i2c_adapter *i2c;
struct nvkm_i2c_aux *aux;