Commit a7ece18c authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'linux-5.10' of git://github.com/skeggsb/linux into drm-fixes 



Fixes an endian regression on older GPUs, a refcount overflow,
a migration fix and 3 display fixes.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Ben Skeggs <skeggsb@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/CACAvsv6MOjtgzKchpis1XrZYmu7-6CaxnHVzJKOXPH62_em7tw@mail.gmail.com
parents 671d2799 d7787cc0

drivers/gpu/drm/nouveau/dispnv50/core.h

+2 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ int core507d_new_(const struct nv50_core_func *, struct nouveau_drm *, s32, 
		  struct nv50_core **);

int core507d_init(struct nv50_core *);

void core507d_ntfy_init(struct nouveau_bo *, u32);

int core507d_read_caps(struct nv50_disp *disp);

int core507d_caps_init(struct nouveau_drm *, struct nv50_disp *);

int core507d_ntfy_wait_done(struct nouveau_bo *, u32, struct nvif_device *);

int core507d_update(struct nv50_core *, u32 *, bool);
@@ -55,6 +56,7 @@ extern const struct nv50_outp_func pior507d; 
int core827d_new(struct nouveau_drm *, s32, struct nv50_core **);



int core907d_new(struct nouveau_drm *, s32, struct nv50_core **);

int core907d_caps_init(struct nouveau_drm *drm, struct nv50_disp *disp);

extern const struct nv50_outp_func dac907d;

extern const struct nv50_outp_func sor907d;

drivers/gpu/drm/nouveau/dispnv50/core507d.c

+39 −2
Original line number Diff line number Diff line
@@ -78,18 +78,55 @@ core507d_ntfy_init(struct nouveau_bo *bo, u32 offset) 
}



int

core507d_caps_init(struct nouveau_drm *drm, struct nv50_disp *disp)

core507d_read_caps(struct nv50_disp *disp)

{

	struct nvif_push *push = disp->core->chan.push;

	int ret;



	if ((ret = PUSH_WAIT(push, 2)))

	ret = PUSH_WAIT(push, 6);

	if (ret)

		return ret;



	PUSH_MTHD(push, NV507D, SET_NOTIFIER_CONTROL,

		  NVDEF(NV507D, SET_NOTIFIER_CONTROL, MODE, WRITE) |

		  NVVAL(NV507D, SET_NOTIFIER_CONTROL, OFFSET, NV50_DISP_CORE_NTFY >> 2) |

		  NVDEF(NV507D, SET_NOTIFIER_CONTROL, NOTIFY, ENABLE));



	PUSH_MTHD(push, NV507D, GET_CAPABILITIES, 0x00000000);



	PUSH_MTHD(push, NV507D, SET_NOTIFIER_CONTROL,

		  NVDEF(NV507D, SET_NOTIFIER_CONTROL, NOTIFY, DISABLE));



	return PUSH_KICK(push);

}



int

core507d_caps_init(struct nouveau_drm *drm, struct nv50_disp *disp)

{

	struct nv50_core *core = disp->core;

	struct nouveau_bo *bo = disp->sync;

	s64 time;

	int ret;



	NVBO_WR32(bo, NV50_DISP_CORE_NTFY, NV_DISP_CORE_NOTIFIER_1, CAPABILITIES_1,

				     NVDEF(NV_DISP_CORE_NOTIFIER_1, CAPABILITIES_1, DONE, FALSE));



	ret = core507d_read_caps(disp);

	if (ret < 0)

		return ret;



	time = nvif_msec(core->chan.base.device, 2000ULL,

			 if (NVBO_TD32(bo, NV50_DISP_CORE_NTFY,

				       NV_DISP_CORE_NOTIFIER_1, CAPABILITIES_1, DONE, ==, TRUE))

				 break;

			 usleep_range(1, 2);

			 );

	if (time < 0)

		NV_ERROR(drm, "core caps notifier timeout\n");



	return 0;

}



int

core507d_init(struct nv50_core *core)

{

drivers/gpu/drm/nouveau/dispnv50/core907d.c

+35 −1
Original line number Diff line number Diff line
@@ -22,11 +22,45 @@ 
#include "core.h"

#include "head.h"



#include <nvif/push507c.h>

#include <nvif/timer.h>



#include <nvhw/class/cl907d.h>



#include "nouveau_bo.h"



int

core907d_caps_init(struct nouveau_drm *drm, struct nv50_disp *disp)

{

	struct nv50_core *core = disp->core;

	struct nouveau_bo *bo = disp->sync;

	s64 time;

	int ret;



	NVBO_WR32(bo, NV50_DISP_CORE_NTFY, NV907D_CORE_NOTIFIER_3, CAPABILITIES_4,

				     NVDEF(NV907D_CORE_NOTIFIER_3, CAPABILITIES_4, DONE, FALSE));



	ret = core507d_read_caps(disp);

	if (ret < 0)

		return ret;



	time = nvif_msec(core->chan.base.device, 2000ULL,

			 if (NVBO_TD32(bo, NV50_DISP_CORE_NTFY,

				       NV907D_CORE_NOTIFIER_3, CAPABILITIES_4, DONE, ==, TRUE))

				 break;

			 usleep_range(1, 2);

			 );

	if (time < 0)

		NV_ERROR(drm, "core caps notifier timeout\n");



	return 0;

}



static const struct nv50_core_func

core907d = {

	.init = core507d_init,

	.ntfy_init = core507d_ntfy_init,

	.caps_init = core507d_caps_init,

	.caps_init = core907d_caps_init,

	.ntfy_wait_done = core507d_ntfy_wait_done,

	.update = core507d_update,

	.head = &head907d,

drivers/gpu/drm/nouveau/dispnv50/core917d.c

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ static const struct nv50_core_func 
core917d = {

	.init = core507d_init,

	.ntfy_init = core507d_ntfy_init,

	.caps_init = core507d_caps_init,

	.caps_init = core907d_caps_init,

	.ntfy_wait_done = core507d_ntfy_wait_done,

	.update = core507d_update,

	.head = &head917d,

drivers/gpu/drm/nouveau/include/nvhw/class/cl507d.h

+4 −1
Original line number Diff line number Diff line
@@ -32,7 +32,10 @@ 
#define NV_DISP_CORE_NOTIFIER_1_COMPLETION_0_DONE_TRUE                               0x00000001

#define NV_DISP_CORE_NOTIFIER_1_COMPLETION_0_R0                                      15:1

#define NV_DISP_CORE_NOTIFIER_1_COMPLETION_0_TIMESTAMP                               29:16



#define NV_DISP_CORE_NOTIFIER_1_CAPABILITIES_1                                       0x00000001

#define NV_DISP_CORE_NOTIFIER_1_CAPABILITIES_1_DONE                                  0:0

#define NV_DISP_CORE_NOTIFIER_1_CAPABILITIES_1_DONE_FALSE                            0x00000000

#define NV_DISP_CORE_NOTIFIER_1_CAPABILITIES_1_DONE_TRUE                             0x00000001



// class methods

#define NV507D_UPDATE                                                           (0x00000080)

CRA Git | Maintained and supported by SUSTech CRA and CCSE