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

Commit d55b4af9 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nv50-/disp: audit and version SOR_PWR method 



The full object interfaces are about to be exposed to userspace, so we
need to check for any security-related issues and version the structs
to make it easier to handle any changes we may need in the future.

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent c4abd317

drivers/gpu/drm/nouveau/core/engine/disp/nv50.c

+2 −1
Original line number Diff line number Diff line
@@ -903,6 +903,8 @@ nv50_disp_base_mthd(struct nouveau_object *object, u32 mthd, 
		return priv->dac.power(object, priv, data, size, head, outp);

	case NV50_DISP_MTHD_V1_DAC_LOAD:

		return priv->dac.sense(object, priv, data, size, head, outp);

	case NV50_DISP_MTHD_V1_SOR_PWR:

		return priv->sor.power(object, priv, data, size, head, outp);

	default:

		break;

	}
@@ -1031,7 +1033,6 @@ nv50_disp_base_ofuncs = { 
static struct nouveau_omthds

nv50_disp_base_omthds[] = {

	{ HEAD_MTHD(NV50_DISP_SCANOUTPOS)     , nv50_disp_base_scanoutpos },

	{ SOR_MTHD(NV50_DISP_SOR_PWR)         , nv50_sor_mthd },

	{ SOR_MTHD(NV50_DISP_SOR_LVDS_SCRIPT) , nv50_sor_mthd },

	{ PIOR_MTHD(NV50_DISP_PIOR_PWR)       , nv50_pior_mthd },

	{ PIOR_MTHD(NV50_DISP_PIOR_TMDS_PWR)  , nv50_pior_mthd },

drivers/gpu/drm/nouveau/core/engine/disp/nv50.h

+2 −2
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ struct nv50_disp_priv { 
	} dac;

	struct {

		int nr;

		int (*power)(struct nv50_disp_priv *, int sor, u32 data);

		int (*power)(NV50_DISP_MTHD_V1);

		int (*hda_eld)(struct nv50_disp_priv *, int sor, u8 *, u32);

		int (*hdmi)(struct nv50_disp_priv *, int head, int sor, u32);

		u32 lvdsconf;
@@ -78,7 +78,7 @@ int nva3_hdmi_ctrl(struct nv50_disp_priv *, int, int, u32); 
int nvd0_hdmi_ctrl(struct nv50_disp_priv *, int, int, u32);



int nv50_sor_mthd(struct nouveau_object *, u32, void *, u32);

int nv50_sor_power(struct nv50_disp_priv *, int, u32);

int nv50_sor_power(NV50_DISP_MTHD_V1);



int nv94_sor_dp_train_init(struct nv50_disp_priv *, int, int, int, u16, u16,

		           u32, struct dcb_output *);

drivers/gpu/drm/nouveau/core/engine/disp/nv84.c

+0 −1
Original line number Diff line number Diff line
@@ -215,7 +215,6 @@ nv84_disp_sclass[] = { 
struct nouveau_omthds

nv84_disp_base_omthds[] = {

	{ HEAD_MTHD(NV50_DISP_SCANOUTPOS)     , nv50_disp_base_scanoutpos },

	{ SOR_MTHD(NV50_DISP_SOR_PWR)         , nv50_sor_mthd },

	{ SOR_MTHD(NV84_DISP_SOR_HDMI_PWR)    , nv50_sor_mthd },

	{ SOR_MTHD(NV50_DISP_SOR_LVDS_SCRIPT) , nv50_sor_mthd },

	{ PIOR_MTHD(NV50_DISP_PIOR_PWR)       , nv50_pior_mthd },

drivers/gpu/drm/nouveau/core/engine/disp/nv94.c

+0 −1
Original line number Diff line number Diff line
@@ -74,7 +74,6 @@ nv94_disp_sclass[] = { 
static struct nouveau_omthds

nv94_disp_base_omthds[] = {

	{ HEAD_MTHD(NV50_DISP_SCANOUTPOS)     , nv50_disp_base_scanoutpos },

	{ SOR_MTHD(NV50_DISP_SOR_PWR)         , nv50_sor_mthd },

	{ SOR_MTHD(NV84_DISP_SOR_HDMI_PWR)    , nv50_sor_mthd },

	{ SOR_MTHD(NV50_DISP_SOR_LVDS_SCRIPT) , nv50_sor_mthd },

	{ SOR_MTHD(NV94_DISP_SOR_DP_PWR)      , nv50_sor_mthd },

drivers/gpu/drm/nouveau/core/engine/disp/nva3.c

+0 −1
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ nva3_disp_sclass[] = { 
static struct nouveau_omthds

nva3_disp_base_omthds[] = {

	{ HEAD_MTHD(NV50_DISP_SCANOUTPOS)     , nv50_disp_base_scanoutpos },

	{ SOR_MTHD(NV50_DISP_SOR_PWR)         , nv50_sor_mthd },

	{ SOR_MTHD(NVA3_DISP_SOR_HDA_ELD)     , nv50_sor_mthd },

	{ SOR_MTHD(NV84_DISP_SOR_HDMI_PWR)    , nv50_sor_mthd },

	{ SOR_MTHD(NV50_DISP_SOR_LVDS_SCRIPT) , nv50_sor_mthd },