mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-08-05 16:54:27 +00:00
6db9df4f70
init() was removed from ramgp102 when reworking the memory detection, as
it was thought that the code was only necessary when the driver performs
mclk changes, which nouveau doesn't support on pascal.
However, it turns out that we still need to execute this on some GPUs to
restore settings after DEVINIT, so revert to the original behaviour.
v2: fix tags in commit message, cc stable
Closes: https://gitlab.freedesktop.org/drm/nouveau/-/issues/319
Fixes: 2c0c15a22f ("drm/nouveau/fb/gp102-ga100: switch to simpler vram size detection method")
Cc: stable@vger.kernel.org # 6.6+
Signed-off-by: Ben Skeggs <bskeggs@nvidia.com>
Signed-off-by: Danilo Krummrich <dakr@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20240904232418.8590-1-bskeggs@nvidia.com
76 lines
3.1 KiB
C
76 lines
3.1 KiB
C
/* SPDX-License-Identifier: MIT */
|
|
#ifndef __NVKM_FB_RAM_PRIV_H__
|
|
#define __NVKM_FB_RAM_PRIV_H__
|
|
#include "priv.h"
|
|
|
|
int nvkm_ram_ctor(const struct nvkm_ram_func *, struct nvkm_fb *,
|
|
enum nvkm_ram_type, u64 size, struct nvkm_ram *);
|
|
int nvkm_ram_new_(const struct nvkm_ram_func *, struct nvkm_fb *,
|
|
enum nvkm_ram_type, u64 size, struct nvkm_ram **);
|
|
void nvkm_ram_del(struct nvkm_ram **);
|
|
int nvkm_ram_init(struct nvkm_ram *);
|
|
|
|
extern const struct nvkm_ram_func nv04_ram_func;
|
|
|
|
int nv50_ram_ctor(const struct nvkm_ram_func *, struct nvkm_fb *,
|
|
struct nvkm_ram *);
|
|
|
|
int gf100_ram_new_(const struct nvkm_ram_func *, struct nvkm_fb *,
|
|
struct nvkm_ram **);
|
|
int gf100_ram_ctor(const struct nvkm_ram_func *, struct nvkm_fb *,
|
|
struct nvkm_ram *);
|
|
u32 gf100_ram_probe_fbp(const struct nvkm_ram_func *,
|
|
struct nvkm_device *, int, int *);
|
|
u32 gf100_ram_probe_fbp_amount(const struct nvkm_ram_func *, u32,
|
|
struct nvkm_device *, int, int *);
|
|
u32 gf100_ram_probe_fbpa_amount(struct nvkm_device *, int);
|
|
int gf100_ram_init(struct nvkm_ram *);
|
|
int gf100_ram_calc(struct nvkm_ram *, u32);
|
|
int gf100_ram_prog(struct nvkm_ram *);
|
|
void gf100_ram_tidy(struct nvkm_ram *);
|
|
|
|
u32 gf108_ram_probe_fbp_amount(const struct nvkm_ram_func *, u32,
|
|
struct nvkm_device *, int, int *);
|
|
|
|
int gk104_ram_new_(const struct nvkm_ram_func *, struct nvkm_fb *,
|
|
struct nvkm_ram **);
|
|
void *gk104_ram_dtor(struct nvkm_ram *);
|
|
int gk104_ram_init(struct nvkm_ram *);
|
|
int gk104_ram_calc(struct nvkm_ram *, u32);
|
|
int gk104_ram_prog(struct nvkm_ram *);
|
|
void gk104_ram_tidy(struct nvkm_ram *);
|
|
|
|
u32 gm107_ram_probe_fbp(const struct nvkm_ram_func *,
|
|
struct nvkm_device *, int, int *);
|
|
|
|
u32 gm200_ram_probe_fbp_amount(const struct nvkm_ram_func *, u32,
|
|
struct nvkm_device *, int, int *);
|
|
|
|
int gp100_ram_init(struct nvkm_ram *);
|
|
|
|
/* RAM type-specific MR calculation routines */
|
|
int nvkm_sddr2_calc(struct nvkm_ram *);
|
|
int nvkm_sddr3_calc(struct nvkm_ram *);
|
|
int nvkm_gddr3_calc(struct nvkm_ram *);
|
|
int nvkm_gddr5_calc(struct nvkm_ram *, bool nuts);
|
|
|
|
int nv04_ram_new(struct nvkm_fb *, struct nvkm_ram **);
|
|
int nv10_ram_new(struct nvkm_fb *, struct nvkm_ram **);
|
|
int nv1a_ram_new(struct nvkm_fb *, struct nvkm_ram **);
|
|
int nv20_ram_new(struct nvkm_fb *, struct nvkm_ram **);
|
|
int nv40_ram_new(struct nvkm_fb *, struct nvkm_ram **);
|
|
int nv41_ram_new(struct nvkm_fb *, struct nvkm_ram **);
|
|
int nv44_ram_new(struct nvkm_fb *, struct nvkm_ram **);
|
|
int nv49_ram_new(struct nvkm_fb *, struct nvkm_ram **);
|
|
int nv4e_ram_new(struct nvkm_fb *, struct nvkm_ram **);
|
|
int nv50_ram_new(struct nvkm_fb *, struct nvkm_ram **);
|
|
int gt215_ram_new(struct nvkm_fb *, struct nvkm_ram **);
|
|
int mcp77_ram_new(struct nvkm_fb *, struct nvkm_ram **);
|
|
int gf100_ram_new(struct nvkm_fb *, struct nvkm_ram **);
|
|
int gf108_ram_new(struct nvkm_fb *, struct nvkm_ram **);
|
|
int gk104_ram_new(struct nvkm_fb *, struct nvkm_ram **);
|
|
int gm107_ram_new(struct nvkm_fb *, struct nvkm_ram **);
|
|
int gm200_ram_new(struct nvkm_fb *, struct nvkm_ram **);
|
|
int gp100_ram_new(struct nvkm_fb *, struct nvkm_ram **);
|
|
int gp102_ram_new(struct nvkm_fb *, struct nvkm_ram **);
|
|
#endif
|