diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2017-06-17 11:19:22 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2017-06-17 11:23:44 +1000 |
| commit | 7df1bb87b8cb0b618e4b5964f89d81d8ce52c58e (patch) | |
| tree | cc3cad38c64b3e565e5d8439a9e3f029d3fa0dbd /drivers/gpu/drm/nouveau/nvkm/engine/disp/dacgf119.c | |
| parent | 5499473c86503bb8e307ff7b554643a99a9478c2 (diff) | |
| download | linux-7df1bb87b8cb0b618e4b5964f89d81d8ce52c58e.tar.bz2 | |
drm/nouveau/disp/nv50-: avoid creating ORs that aren't present on HW
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/engine/disp/dacgf119.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/disp/dacgf119.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/dacgf119.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/dacgf119.c index 8392303b77ed..dbd032ef352a 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/dacgf119.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/dacgf119.c @@ -58,5 +58,8 @@ gf119_dac = { int gf119_dac_new(struct nvkm_disp *disp, int id) { + struct nvkm_device *device = disp->engine.subdev.device; + if (!(nvkm_rd32(device, 0x612004) & (0x00000010 << id))) + return 0; return nvkm_ior_new_(&gf119_dac, disp, DAC, id); } |