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

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

drm/nv50-/disp: audit and version LVDS_SCRIPT 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 e00f2235

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

+15 −1
Original line number Diff line number Diff line
@@ -913,6 +913,21 @@ nv50_disp_base_mthd(struct nouveau_object *object, u32 mthd, 
		if (!priv->sor.hdmi)

			return -ENODEV;

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

	case NV50_DISP_MTHD_V1_SOR_LVDS_SCRIPT: {

		union {

			struct nv50_disp_sor_lvds_script_v0 v0;

		} *args = data;

		nv_ioctl(object, "disp sor lvds script size %d\n", size);

		if (nvif_unpack(args->v0, 0, 0, false)) {

			nv_ioctl(object, "disp sor lvds script "

					 "vers %d name %04x\n",

				 args->v0.version, args->v0.script);

			priv->sor.lvdsconf = args->v0.script;

			return 0;

		} else

			return ret;

	}

		break;

	default:

		break;

	}
@@ -1041,7 +1056,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_LVDS_SCRIPT) , nv50_sor_mthd },

	{ PIOR_MTHD(NV50_DISP_PIOR_PWR)       , nv50_pior_mthd },

	{ PIOR_MTHD(NV50_DISP_PIOR_TMDS_PWR)  , nv50_pior_mthd },

	{ PIOR_MTHD(NV50_DISP_PIOR_DP_PWR)    , nv50_pior_mthd },

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_LVDS_SCRIPT) , nv50_sor_mthd },

	{ PIOR_MTHD(NV50_DISP_PIOR_PWR)       , nv50_pior_mthd },

	{ PIOR_MTHD(NV50_DISP_PIOR_TMDS_PWR)  , nv50_pior_mthd },

	{ PIOR_MTHD(NV50_DISP_PIOR_DP_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_LVDS_SCRIPT) , nv50_sor_mthd },

	{ SOR_MTHD(NV94_DISP_SOR_DP_PWR)      , 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/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_LVDS_SCRIPT) , nv50_sor_mthd },

	{ SOR_MTHD(NV94_DISP_SOR_DP_PWR)      , 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/nvd0.c

+0 −1
Original line number Diff line number Diff line
@@ -712,7 +712,6 @@ nvd0_disp_base_ofuncs = { 
struct nouveau_omthds

nvd0_disp_base_omthds[] = {

	{ HEAD_MTHD(NV50_DISP_SCANOUTPOS)     , nvd0_disp_base_scanoutpos },

	{ SOR_MTHD(NV50_DISP_SOR_LVDS_SCRIPT) , nv50_sor_mthd },

	{ SOR_MTHD(NV94_DISP_SOR_DP_PWR)      , nv50_sor_mthd },

	{ PIOR_MTHD(NV50_DISP_PIOR_PWR)       , nv50_pior_mthd },

	{ PIOR_MTHD(NV50_DISP_PIOR_TMDS_PWR)  , nv50_pior_mthd },