Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cc90badd authored by Karol Herbst's avatar Karol Herbst Committed by Ben Skeggs
Browse files

drm/nouveau/clk: Fix potential NULL pointer access when there is no fb subdev 



Signed-off-by: default avatarKarol Herbst <karolherbst@gmail.com>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent a8c119a4

drivers/gpu/drm/nouveau/nvkm/subdev/clk/base.c

+3 −2
Original line number Diff line number Diff line
@@ -175,7 +175,7 @@ static int 
nvkm_pstate_prog(struct nvkm_clk *clk, int pstatei)

{

	struct nvkm_subdev *subdev = &clk->subdev;

	struct nvkm_ram *ram = subdev->device->fb->ram;

	struct nvkm_fb *fb = subdev->device->fb;

	struct nvkm_pci *pci = subdev->device->pci;

	struct nvkm_pstate *pstate;

	int ret, idx = 0;
@@ -190,7 +190,8 @@ nvkm_pstate_prog(struct nvkm_clk *clk, int pstatei) 


	nvkm_pcie_set_link(pci, pstate->pcie_speed, pstate->pcie_width);



	if (ram && ram->func->calc) {

	if (fb && fb->ram && fb->ram->func->calc) {

		struct nvkm_ram *ram = fb->ram;

		int khz = pstate->base.domain[nv_clk_src_mem];

		do {

			ret = ram->func->calc(ram, khz);