diff options
| author |   Ben Skeggs <bskeggs@redhat.com> | 2011-10-05 14:52:02 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2011-12-21 19:01:14 +1000 |
| commit | 52c7bcdb6749a3920739640ca791e1f741f139d0 (patch) | |
| tree | a86769a98760727d7356f083872fcba2ad2440b2 /drivers/gpu/drm/nouveau | |
| parent | drm/nouveau/hdmi: build ELD from EDID, notify audio driver of its presence (diff) | |
| download | linux-dev-52c7bcdb6749a3920739640ca791e1f741f139d0.tar.xz linux-dev-52c7bcdb6749a3920739640ca791e1f741f139d0.zip | |
drm/nouveau/hdmi: add hdmi register accessors to handle hdmi block move
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_hdmi.c | 33 | ||||
| -rw-r--r-- | drivers/gpu/drm/nouveau/nv50_sor.c | 6 |
2 files changed, 35 insertions, 4 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_hdmi.c b/drivers/gpu/drm/nouveau/nouveau_hdmi.c index 489a2418a227..d8540a64a8d3 100644 --- a/drivers/gpu/drm/nouveau/nouveau_hdmi.c +++ b/drivers/gpu/drm/nouveau/nouveau_hdmi.c @@ -26,6 +26,7 @@ #include "nouveau_drv.h" #include "nouveau_connector.h" #include "nouveau_encoder.h" +#include "nouveau_crtc.h" static bool hdmi_sor(struct drm_encoder *encoder) @@ -36,12 +37,42 @@ hdmi_sor(struct drm_encoder *encoder) return true; } +static inline u32 +hdmi_base(struct drm_encoder *encoder) +{ + struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder); + struct nouveau_crtc *nv_crtc = nouveau_crtc(nv_encoder->crtc); + if (!hdmi_sor(encoder)) + return 0x616500 + (nv_crtc->index * 0x800); + return 0x61c500 + (nv_encoder->or * 0x800); +} + +static void +hdmi_wr32(struct drm_encoder *encoder, u32 reg, u32 val) +{ + nv_wr32(encoder->dev, hdmi_base(encoder) + reg, val); +} + +static u32 +hdmi_rd32(struct drm_encoder *encoder, u32 reg) +{ + return nv_rd32(encoder->dev, hdmi_base(encoder) + reg); +} + +static u32 +hdmi_mask(struct drm_encoder *encoder, u32 reg, u32 mask, u32 val) +{ + u32 tmp = hdmi_rd32(encoder, reg); + hdmi_wr32(encoder, reg, (tmp & ~mask) | val); + return tmp; +} + static void nouveau_audio_disconnect(struct drm_encoder *encoder) { struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder); struct drm_device *dev = encoder->dev; - int or = nv_encoder->or * 0x800; + u32 or = nv_encoder->or * 0x800; if (hdmi_sor(encoder)) { nv_mask(dev, 0x61c448 + or, 0x00000003, 0x00000000); diff --git a/drivers/gpu/drm/nouveau/nv50_sor.c b/drivers/gpu/drm/nouveau/nv50_sor.c index 2a638aeb5061..da603b1d8e3f 100644 --- a/drivers/gpu/drm/nouveau/nv50_sor.c +++ b/drivers/gpu/drm/nouveau/nv50_sor.c @@ -195,6 +195,7 @@ nv50_sor_mode_set(struct drm_encoder *encoder, struct drm_display_mode *mode, NV_DEBUG_KMS(dev, "or %d type %d -> crtc %d\n", nv_encoder->or, nv_encoder->dcb->type, crtc->index); + nv_encoder->crtc = encoder->crtc; switch (nv_encoder->dcb->type) { case OUTPUT_TMDS: @@ -206,7 +207,7 @@ nv50_sor_mode_set(struct drm_encoder *encoder, struct drm_display_mode *mode, } else mode_ctl = 0x0200; - nouveau_hdmi_mode_set(encoder, mode); + nouveau_hdmi_mode_set(encoder, adjusted_mode); break; case OUTPUT_DP: nv_connector = nouveau_encoder_connector_get(nv_encoder); @@ -243,12 +244,11 @@ nv50_sor_mode_set(struct drm_encoder *encoder, struct drm_display_mode *mode, ret = RING_SPACE(evo, 2); if (ret) { NV_ERROR(dev, "no space while connecting SOR\n"); + nv_encoder->crtc = NULL; return; } BEGIN_RING(evo, 0, NV50_EVO_SOR(nv_encoder->or, MODE_CTRL), 1); OUT_RING(evo, mode_ctl); - - nv_encoder->crtc = encoder->crtc; } static struct drm_crtc * |