evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

drm/nouveau/mxm: cosmetic changes

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

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs 2015-08-20 14:54:07 +10:00
parent 1f5bffca22
commit 2d9d5889e8
2 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/gpu/drm/nouveau/include/nvkm/subdev/mxm.h
View file

@ -5,7 +5,7 @@
#define MXM_SANITISE_DCB 0x00000001 #define MXM_SANITISE_DCB 0x00000001
struct nvkm_mxm { struct nvkm_mxm {
struct nvkm_subdev base; struct nvkm_subdev subdev;
u32 action; u32 action;
u8 *mxms; u8 *mxms;
}; };
@ -19,9 +19,9 @@ nvkm_mxm(void *obj)
#define nvkm_mxm_create(p,e,o,d) \ #define nvkm_mxm_create(p,e,o,d) \
nvkm_mxm_create_((p), (e), (o), sizeof(**d), (void **)d) nvkm_mxm_create_((p), (e), (o), sizeof(**d), (void **)d)
#define nvkm_mxm_init(p) \ #define nvkm_mxm_init(p) \
nvkm_subdev_init(&(p)->base) nvkm_subdev_init(&(p)->subdev)
#define nvkm_mxm_fini(p,s) \ #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 *, int nvkm_mxm_create_(struct nvkm_object *, struct nvkm_object *,
struct nvkm_oclass *, int, void **); struct nvkm_oclass *, int, void **);
void nvkm_mxm_destroy(struct nvkm_mxm *); void nvkm_mxm_destroy(struct nvkm_mxm *);

14
drivers/gpu/drm/nouveau/nvkm/subdev/mxm/nv50.c
View file

@ -28,10 +28,6 @@
#include <subdev/bios/dcb.h> #include <subdev/bios/dcb.h>
#include <subdev/bios/mxm.h> #include <subdev/bios/mxm.h>
struct nv50_mxm_priv {
struct nvkm_mxm base;
};
struct context { struct context {
u32 *outp; u32 *outp;
struct mxms_odev desc; 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_oclass *oclass, void *data, u32 size,
struct nvkm_object **pobject) struct nvkm_object **pobject)
{ {
struct nv50_mxm_priv *priv; struct nvkm_mxm *mxm;
int ret; int ret;
ret = nvkm_mxm_create(parent, engine, oclass, &priv); ret = nvkm_mxm_create(parent, engine, oclass, &mxm);
*pobject = nv_object(priv); *pobject = nv_object(mxm);
if (ret) if (ret)
return ret; return ret;
if (priv->base.action & MXM_SANITISE_DCB) if (mxm->action & MXM_SANITISE_DCB)
mxm_dcb_sanitise(&priv->base); mxm_dcb_sanitise(mxm);
return 0; return 0;
} }