Commit f20c665c authored by Ben Skeggs's avatar Ben Skeggs

drm/nouveau/kms/nv50: clean-up encoder functions

Just a shuffle of blocks into an order consistent with the rest of the
code, renaming hdmi/audio funtions for atomic, and removal of unused
code.
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 354d3508
...@@ -58,14 +58,14 @@ nouveau_dp_detect(struct nouveau_encoder *nv_encoder) ...@@ -58,14 +58,14 @@ nouveau_dp_detect(struct nouveau_encoder *nv_encoder)
struct drm_device *dev = nv_encoder->base.base.dev; struct drm_device *dev = nv_encoder->base.base.dev;
struct nouveau_drm *drm = nouveau_drm(dev); struct nouveau_drm *drm = nouveau_drm(dev);
struct nvkm_i2c_aux *aux; struct nvkm_i2c_aux *aux;
u8 *dpcd = nv_encoder->dp.dpcd; u8 dpcd[8];
int ret; int ret;
aux = nv_encoder->aux; aux = nv_encoder->aux;
if (!aux) if (!aux)
return -ENODEV; return -ENODEV;
ret = nvkm_rdaux(aux, DP_DPCD_REV, dpcd, 8); ret = nvkm_rdaux(aux, DP_DPCD_REV, dpcd, sizeof(dpcd));
if (ret) if (ret)
return ret; return ret;
......
...@@ -59,10 +59,8 @@ struct nouveau_encoder { ...@@ -59,10 +59,8 @@ struct nouveau_encoder {
union { union {
struct { struct {
struct nv50_mstm *mstm; struct nv50_mstm *mstm;
u8 dpcd[8];
int link_nr; int link_nr;
int link_bw; int link_bw;
u32 datarate;
} dp; } dp;
}; };
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment