search for: nvkm_disp

...ers/gpu/drm/nouveau/include/nvkm/engine/disp.h > > @@ -1,22 +1,57 @@ > > /* SPDX-License-Identifier: MIT */ > > + > > +/** > > + * DOC: Overview > > + * > > + * Interfaces for working with the display engine. > > + */ > > + > > #ifndef __NVKM_DISP_H__ > > #define __NVKM_DISP_H__ > > + > > +/** > > + * nvkm_disp() - Get a &struct nvkm_disp from a &struct nvkm_engine. > > + * > > + * @p: A &struct nvkm_engine reference. > > + * > > + * Return: The &struct nvkm_disp that contains...

...; > > @@ -1,22 +1,57 @@ > > > /* SPDX-License-Identifier: MIT */ > > > + > > > +/** > > > + * DOC: Overview > > > + * > > > + * Interfaces for working with the display engine. > > > + */ > > > + > > > #ifndef __NVKM_DISP_H__ > > > #define __NVKM_DISP_H__ > > > + > > > +/** > > > + * nvkm_disp() - Get a &struct nvkm_disp from a &struct nvkm_engine. > > > + * > > > + * @p: A &struct nvkm_engine reference. > > > + * > > > + * Return:...

...ense-Identifier: MIT */ > >>>> + > >>>> +/** > >>>> + * DOC: Overview > >>>> + * > >>>> + * Interfaces for working with the display engine. > >>>> + */ > >>>> + > >>>> #ifndef __NVKM_DISP_H__ > >>>> #define __NVKM_DISP_H__ > >>>> + > >>>> +/** > >>>> + * nvkm_disp() - Get a &struct nvkm_disp from a &struct nvkm_engine. > >>>> + * > >>>> + * @p: A &struct nvkm_engine reference. &gt...

...+1,57 @@ >>>> /* SPDX-License-Identifier: MIT */ >>>> + >>>> +/** >>>> + * DOC: Overview >>>> + * >>>> + * Interfaces for working with the display engine. >>>> + */ >>>> + >>>> #ifndef __NVKM_DISP_H__ >>>> #define __NVKM_DISP_H__ >>>> + >>>> +/** >>>> + * nvkm_disp() - Get a &struct nvkm_disp from a &struct nvkm_engine. >>>> + * >>>> + * @p: A &struct nvkm_engine reference. >>>> + * >>>...

...gine/disp/gf119.c b/drm/nouveau/nvkm/engine/disp/gf119.c index d8765b57..415987e9 100644 --- a/drm/nouveau/nvkm/engine/disp/gf119.c +++ b/drm/nouveau/nvkm/engine/disp/gf119.c @@ -168,7 +168,7 @@ int gf119_disp_new_(const struct nv50_disp_func *func, struct nvkm_device *device, int index, struct nvkm_disp **pdisp) { - u32 heads = nvkm_rd32(device, 0x022448); + u32 heads = fls(nvkm_rd32(device, 0x612004) & 0xf); return nv50_disp_new_(func, device, index, heads, pdisp); } diff --git a/drm/nouveau/nvkm/engine/disp/headgf119.c b/drm/nouveau/nvkm/engine/disp/headgf119.c index b3355275..8d44bdf6...

...a96c942d912..76b90d7ddfc6 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/engine/disp.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/engine/disp.h @@ -1,22 +1,57 @@ /* SPDX-License-Identifier: MIT */ + +/** + * DOC: Overview + * + * Interfaces for working with the display engine. + */ + #ifndef __NVKM_DISP_H__ #define __NVKM_DISP_H__ + +/** + * nvkm_disp() - Get a &struct nvkm_disp from a &struct nvkm_engine. + * + * @p: A &struct nvkm_engine reference. + * + * Return: The &struct nvkm_disp that contains the given engine. + */ #define nvkm_disp(p) container_of((p), struct nvkm_disp,...

...nouveau/include/nvkm/engine/disp.h > +++ b/drivers/gpu/drm/nouveau/include/nvkm/engine/disp.h > @@ -1,22 +1,57 @@ > /* SPDX-License-Identifier: MIT */ > + > +/** > + * DOC: Overview > + * > + * Interfaces for working with the display engine. > + */ > + > #ifndef __NVKM_DISP_H__ > #define __NVKM_DISP_H__ > + > +/** > + * nvkm_disp() - Get a &struct nvkm_disp from a &struct nvkm_engine. > + * > + * @p: A &struct nvkm_engine reference. > + * > + * Return: The &struct nvkm_disp that contains the given engine. > + */ > #defin...

...u/nvkm/engine/disp/gf119.c > index d8765b57..415987e9 100644 > --- a/drm/nouveau/nvkm/engine/disp/gf119.c > +++ b/drm/nouveau/nvkm/engine/disp/gf119.c > @@ -168,7 +168,7 @@ int > gf119_disp_new_(const struct nv50_disp_func *func, struct nvkm_device *device, > int index, struct nvkm_disp **pdisp) > { > - u32 heads = nvkm_rd32(device, 0x022448); > + u32 heads = fls(nvkm_rd32(device, 0x612004) & 0xf); > return nv50_disp_new_(func, device, index, heads, pdisp); I'd drop this change. I suspect 0x022448 is still the "maximum head count" register, and th...

...), 2 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/base.c index 65c99d948b686..ae47eabd5d0bd 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/base.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/base.c @@ -359,7 +359,7 @@ nvkm_disp_oneinit(struct nvkm_engine *engine) if (ret) return ret; - if (disp->func->oneinit) { + if (disp->func && disp->func->oneinit) { ret = disp->func->oneinit(disp); if (ret) return ret; @@ -461,8 +461,10 @@ nvkm_disp_new_(const struct nvkm_disp_func *func,...

.../drm/nouveau/nvkm/engine/disp/sorg94.c index 1bb9d66..4510cb6 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorg94.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorg94.c @@ -45,14 +45,6 @@ static const struct nvkm_output_func g94_sor_output_func = { }; -int -g94_sor_output_new(struct nvkm_disp *disp, int index, - struct dcb_output *dcbE, struct nvkm_output **poutp) -{ - return nvkm_output_new_(&g94_sor_output_func, disp, - index, dcbE, poutp); -} - /******************************************************************************* * DisplayPort ******************************...

...utput_dp *outp) } /******************************************************************************* - * TMDS/LVDS - ******************************************************************************/ -static const struct nvkm_output_func -g94_sor_output_func = { -}; - -int -g94_sor_output_new(struct nvkm_disp *disp, int index, - struct dcb_output *dcbE, struct nvkm_output **poutp) -{ - return nvkm_output_new_(&g94_sor_output_func, disp, - index, dcbE, poutp); -} - -/******************************************************************************* * DisplayPort ******************************...

...iff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/base.c > index 65c99d948b686..ae47eabd5d0bd 100644 > --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/base.c > +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/base.c > @@ -359,7 +359,7 @@ nvkm_disp_oneinit(struct nvkm_engine *engine) > if (ret) > return ret; > > - if (disp->func->oneinit) { > + if (disp->func && disp->func->oneinit) { > ret = disp->func->oneinit(disp); > if (r...

Signed-off-by: Lyude Paul <lyude at redhat.com> --- drivers/gpu/drm/nouveau/nvkm/engine/disp/outp.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/outp.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/outp.c index 6094805fbd63..06b19883a06b 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/outp.c +++

...idx, struct nvkm_volt **); - - int (*bsp )(struct nvkm_device *, int idx, struct nvkm_engine **); - int (*ce[3] )(struct nvkm_device *, int idx, struct nvkm_engine **); - int (*cipher )(struct nvkm_device *, int idx, struct nvkm_engine **); - int (*disp )(struct nvkm_device *, int idx, struct nvkm_disp **); - int (*dma )(struct nvkm_device *, int idx, struct nvkm_dma **); - int (*fifo )(struct nvkm_device *, int idx, struct nvkm_fifo **); - int (*gr )(struct nvkm_device *, int idx, struct nvkm_gr **); - int (*ifb )(struct nvkm_device *, int idx, struct nvkm_engine **); - int (*me...

...idx, struct nvkm_volt **); - - int (*bsp )(struct nvkm_device *, int idx, struct nvkm_engine **); - int (*ce[3] )(struct nvkm_device *, int idx, struct nvkm_engine **); - int (*cipher )(struct nvkm_device *, int idx, struct nvkm_engine **); - int (*disp )(struct nvkm_device *, int idx, struct nvkm_disp **); - int (*dma )(struct nvkm_device *, int idx, struct nvkm_dma **); - int (*fifo )(struct nvkm_device *, int idx, struct nvkm_fifo **); - int (*gr )(struct nvkm_device *, int idx, struct nvkm_gr **); - int (*ifb )(struct nvkm_device *, int idx, struct nvkm_engine **); - int (*me...

...return _nvkm_outp_acquire_ior(outp, user, ior); } } @@ -214,30 +214,30 @@ nvkm_outp_fini(struct nvkm_outp *outp) outp->func->fini(outp); } -static void -nvkm_outp_init_route(struct nvkm_outp *outp) +struct nvkm_ior * +nvkm_outp_get_current_ior(struct nvkm_outp *outp) { struct nvkm_disp *disp = outp->disp; + struct nvkm_ior *ior; enum nvkm_ior_proto proto; enum nvkm_ior_type type; - struct nvkm_ior *ior; int id, link; /* Find any OR from the class that is able to support this device. */ proto = nvkm_outp_xlat(outp, &type); if (proto == UNKNOWN) - return; + r...

...idx, struct nvkm_volt **); - - int (*bsp )(struct nvkm_device *, int idx, struct nvkm_engine **); - int (*ce[3] )(struct nvkm_device *, int idx, struct nvkm_engine **); - int (*cipher )(struct nvkm_device *, int idx, struct nvkm_engine **); - int (*disp )(struct nvkm_device *, int idx, struct nvkm_disp **); - int (*dma )(struct nvkm_device *, int idx, struct nvkm_dma **); - int (*fifo )(struct nvkm_device *, int idx, struct nvkm_fifo **); - int (*gr )(struct nvkm_device *, int idx, struct nvkm_gr **); - int (*ifb )(struct nvkm_device *, int idx, struct nvkm_engine **); - int (*me...

The INA3221 is usually found on mid and high end kepler+ gpus Marins Patch implements the new iccsense subdev and all needed bits for the INA3221 power sensor. My Patch implements the hwmon power1 interface to expose the current power consumption through hwmon (and can be read out via sysfs or the sensors tool) Please test these patches for Fermi+ GPUs, that nothing gets messed up and works as

This is a complete rework from the first version I sent out. Now the implementation is more centered around the power_rails we find in the SENSE table instead of extdev centered. This makes the implementation a lot easier and straightforward. I've added support for the INA219, INA209 and INA3221 sensors found on multiple Fermi and Kepler cards. The power consumption is also exported via

This is a complete rework from the last version I sent out. Now the implementation is more centered around the power_rails we find in the SENSE table instead of extdev centered. This makes the implementation a lot easier and straightforward. I've added support for the INA219, INA209 and INA3221 sensors found on multiple Fermi and Kepler cards, but only the INA3221 bits are tested so far.