nouveau: fix devinit paths to only handle display on GSP.
Subsystems (3)
Dave Airlie
maintainerPATCH 1/1 nouveau: fix devinit paths to only handle display on GSP.
This reverts:
nouveau/gsp: don't check devinit disable on GSP.
and applies a further fix.
It turns out the open gpu driver, checks this register, but only for display.
Match that behaviour and only disable displays on turings.
--- drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gm107.c | 12 ++++++++---- drivers/gpu/drm/nouveau/nvkm/subdev/devinit/r535.c | 1 + 2 files changed, 9 insertions(+), 4 deletions(-)
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gm107.c +8 -4
@@ -25,6 +25,7 @@#include <subdev/bios.h> #include <subdev/bios/init.h> +#include <subdev/gsp.h> void gm107_devinit_disable (struct nvkm_devinit *init)
@@ -33,10 +34,13 @@ gm107_devinit_disable(struct nvkm_devinit *init)u32 r021c00 =nvkm_rd32 (device,0x021c00 );u32 r021c04 =nvkm_rd32 (device,0x021c04 ); -if (r021c00 &0x00000001 ) -nvkm_subdev_disable (device,NVKM_ENGINE_CE ,0 ); -if (r021c00 &0x00000004 ) -nvkm_subdev_disable (device,NVKM_ENGINE_CE ,2 ); +/* gsp only wants to enable/disable display */ +if (!nvkm_gsp_rm (device->gsp)) { +if (r021c00 &0x00000001 ) +nvkm_subdev_disable (device,NVKM_ENGINE_CE ,0 ); +if (r021c00 &0x00000004 ) +nvkm_subdev_disable (device,NVKM_ENGINE_CE ,2 ); + }if (r021c04 &0x00000001 )nvkm_subdev_disable (device,NVKM_ENGINE_DISP ,0 ); }
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/r535.c +1 -0
@@ -41,6 +41,7 @@ r535_devinit_new(const struct nvkm_devinit_func *hw, rm->dtor = r535_devinit_dtor; rm->post = hw->post; + rm->disable = hw->disable; ret =nv50_devinit_new_ (rm, device, type, inst, pdevinit);if (ret)
Signature · 1 line
2.44.0
Quoted 10 lines · Dave Airlie
This reverts:
nouveau/gsp: don't check devinit disable on GSP.
and applies a further fix.It turns out the open gpu driver, checks this register, but only for display.
Match that behaviour and only disable displays on turings.
Fixes 5d4e8ae6e57b ("nouveau/gsp: don't check devinit disable on GSP.")Signed-off-by Dave Airlie <[email protected]>
Quoted 47 lines
--- drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gm107.c | 12 ++++++++---- drivers/gpu/drm/nouveau/nvkm/subdev/devinit/r535.c | 1 + 2 files changed, 9 insertions(+), 4 deletions(-)drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gm107.c +8
-4@@ -25,6 +25,7 @@#include <subdev/bios.h> #include <subdev/bios/init.h> +#include <subdev/gsp.h> void gm107_devinit_disable (struct nvkm_devinit *init)@@ -33,10 +34,13 @@ gm107_devinit_disable(struct nvkm_devinit *init)u32 r021c00 =nvkm_rd32 (device,0x021c00 );u32 r021c04 =nvkm_rd32 (device,0x021c04 ); -if (r021c00 &0x00000001 ) -nvkm_subdev_disable (device,NVKM_ENGINE_CE ,0 ); -if (r021c00 &0x00000004 ) -nvkm_subdev_disable (device,NVKM_ENGINE_CE ,2 ); +/* gsp only wants to enable/disable display */ +if (!nvkm_gsp_rm (device->gsp)) { +if (r021c00 &0x00000001 ) +nvkm_subdev_disable (device,NVKM_ENGINE_CE ,0 ); +if (r021c00 &0x00000004 ) +nvkm_subdev_disable (device,NVKM_ENGINE_CE ,2 ); + }if (r021c04 &0x00000001 )nvkm_subdev_disable (device,NVKM_ENGINE_DISP ,0 ); }drivers/gpu/drm/nouveau/nvkm/subdev/devinit/r535.c +1
-0@@ -41,6 +41,7 @@ r535_devinit_new(const struct nvkm_devinit_func *hw, rm->dtor = r535_devinit_dtor; rm->post = hw->post; + rm->disable = hw->disable; ret =nv50_devinit_new_ (rm, device, type, inst, pdevinit);if (ret)
Quoted 8 lines · Dave Airlie
This reverts:
nouveau/gsp: don't check devinit disable on GSP.
and applies a further fix.It turns out the open gpu driver, checks this register, but only for display.
Match that behaviour and only disable displays on turings.
Why only on Turings?
Dave Airlie
maintainerQuoted 6 lines · Timur Tabi
Quoted 4 lines · Dave Airlie
This reverts:
nouveau/gsp: don't check devinit disable on GSP.
and applies a further fix.
Quoted 6 lines
Quoted 4 lines
It turns out the open gpu driver, checks this register, but only for display.
Match that behaviour and only disable displays on turings.
Why only on Turings?
The only is for disabling displays, not for the turings. The ampere devinit path only handle displays, it never tries to disable other engines so should be fine.
Dave.