Commit 4a2cb418 authored by Lyude Paul's avatar Lyude Paul Committed by Ben Skeggs
Browse files

drm/nouveau/kms/nv50-: Probe SOR and PIOR caps for DP interlacing support 



Right now, we make the mistake of allowing interlacing on all
connectors. Nvidia hardware does not always support interlacing with DP
though, so we need to make sure that we don't allow interlaced modes to
be set in such situations as otherwise we'll end up accidentally hanging
the display HW.

This fixes some hangs with Turing, which would be caused by attempting
to set an interlaced mode on hardware that doesn't support it. This
patch likely fixes other hardware hanging in the same way as well.

Note that we say we probe PIOR caps, but they don't actually have any
interlacing caps. So, the get_caps() function for PIORs just sets
interlacing support to true.

Changes since v1:
* Actually probe caps correctly this time, both on EVO and NVDisplay.
Changes since v2:
* Fix probing for < GF119
* Use vfunc table, in prep for adding more caps in the future.

Signed-off-by: default avatarLyude Paul <lyude@redhat.com>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent fa1232ea

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

+7 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
#define __NV50_KMS_CORE_H__

#include "disp.h"

#include "atom.h"

#include <nouveau_encoder.h>



struct nv50_core {

	const struct nv50_core_func *func;
@@ -15,6 +16,7 @@ void nv50_core_del(struct nv50_core **); 
struct nv50_core_func {

	void (*init)(struct nv50_core *);

	void (*ntfy_init)(struct nouveau_bo *, u32 offset);

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

	int (*ntfy_wait_done)(struct nouveau_bo *, u32 offset,

			      struct nvif_device *);

	void (*update)(struct nv50_core *, u32 *interlock, bool ntfy);
@@ -27,6 +29,9 @@ struct nv50_core_func { 
	const struct nv50_outp_func {

		void (*ctrl)(struct nv50_core *, int or, u32 ctrl,

			     struct nv50_head_atom *);

		/* XXX: Only used by SORs and PIORs for now */

		void (*get_caps)(struct nv50_disp *,

				 struct nouveau_encoder *, int or);

	} *dac, *pior, *sor;

};
@@ -35,6 +40,7 @@ int core507d_new_(const struct nv50_core_func *, struct nouveau_drm *, s32, 
		  struct nv50_core **);

void core507d_init(struct nv50_core *);

void core507d_ntfy_init(struct nouveau_bo *, u32);

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

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

void core507d_update(struct nv50_core *, u32 *, bool);
@@ -51,6 +57,7 @@ extern const struct nv50_outp_func sor907d; 
int core917d_new(struct nouveau_drm *, s32, struct nv50_core **);



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

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

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

void corec37d_update(struct nv50_core *, u32 *, bool);

void corec37d_wndw_owner(struct nv50_core *);

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

+15 −0
Original line number Diff line number Diff line
@@ -62,6 +62,20 @@ core507d_ntfy_init(struct nouveau_bo *bo, u32 offset) 
	nouveau_bo_wr32(bo, offset / 4, 0x00000000);

}



int

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

{

	u32 *push = evo_wait(&disp->core->chan, 2);



	if (push) {

		evo_mthd(push, 0x008c, 1);

		evo_data(push, 0x0);

		evo_kick(push, &disp->core->chan);

	}



	return 0;

}



void

core507d_init(struct nv50_core *core)

{
@@ -77,6 +91,7 @@ static const struct nv50_core_func 
core507d = {

	.init = core507d_init,

	.ntfy_init = core507d_ntfy_init,

	.caps_init = core507d_caps_init,

	.ntfy_wait_done = core507d_ntfy_wait_done,

	.update = core507d_update,

	.head = &head507d,

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

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

	.init = core507d_init,

	.ntfy_init = core507d_ntfy_init,

	.caps_init = core507d_caps_init,

	.ntfy_wait_done = core507d_ntfy_wait_done,

	.update = core507d_update,

	.head = &head827d,

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

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

	.init = core507d_init,

	.ntfy_init = core507d_ntfy_init,

	.caps_init = core507d_caps_init,

	.ntfy_wait_done = core507d_ntfy_wait_done,

	.update = core507d_update,

	.head = &head907d,

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

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

	.init = core507d_init,

	.ntfy_init = core507d_ntfy_init,

	.caps_init = core507d_caps_init,

	.ntfy_wait_done = core507d_ntfy_wait_done,

	.update = core507d_update,

	.head = &head917d,

CRA Git | Maintained and supported by SUSTech CRA and CCSE