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

Commit 2d9d5889 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/mxm: cosmetic changes 



This is purely preparation for upcoming commits, there should be no
code changes here.

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

drivers/gpu/drm/nouveau/include/nvkm/subdev/mxm.h

+3 −3
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
#define MXM_SANITISE_DCB 0x00000001



struct nvkm_mxm {

	struct nvkm_subdev base;

	struct nvkm_subdev subdev;

	u32 action;

	u8 *mxms;

};
@@ -19,9 +19,9 @@ nvkm_mxm(void *obj) 
#define nvkm_mxm_create(p,e,o,d)                                            \

	nvkm_mxm_create_((p), (e), (o), sizeof(**d), (void **)d)

#define nvkm_mxm_init(p)                                                    \

	nvkm_subdev_init(&(p)->base)

	nvkm_subdev_init(&(p)->subdev)

#define nvkm_mxm_fini(p,s)                                                  \

	nvkm_subdev_fini(&(p)->base, (s))

	nvkm_subdev_fini(&(p)->subdev, (s))

int  nvkm_mxm_create_(struct nvkm_object *, struct nvkm_object *,

			 struct nvkm_oclass *, int, void **);

void nvkm_mxm_destroy(struct nvkm_mxm *);

drivers/gpu/drm/nouveau/nvkm/subdev/mxm/nv50.c

+5 −9
Original line number Diff line number Diff line
@@ -28,10 +28,6 @@ 
#include <subdev/bios/dcb.h>

#include <subdev/bios/mxm.h>



struct nv50_mxm_priv {

	struct nvkm_mxm base;

};



struct context {

	u32 *outp;

	struct mxms_odev desc;
@@ -206,16 +202,16 @@ nv50_mxm_ctor(struct nvkm_object *parent, struct nvkm_object *engine, 
	      struct nvkm_oclass *oclass, void *data, u32 size,

	      struct nvkm_object **pobject)

{

	struct nv50_mxm_priv *priv;

	struct nvkm_mxm *mxm;

	int ret;



	ret = nvkm_mxm_create(parent, engine, oclass, &priv);

	*pobject = nv_object(priv);

	ret = nvkm_mxm_create(parent, engine, oclass, &mxm);

	*pobject = nv_object(mxm);

	if (ret)

		return ret;



	if (priv->base.action & MXM_SANITISE_DCB)

		mxm_dcb_sanitise(&priv->base);

	if (mxm->action & MXM_SANITISE_DCB)

		mxm_dcb_sanitise(mxm);

	return 0;

}