Commit 06ab282f authored by Ben Skeggs's avatar Ben Skeggs

drm/nouveau/kms/nv50: separate out vblank dmi commit

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 7e08d67c
...@@ -1094,13 +1094,14 @@ nv50_head_mode(struct nv50_head *head, struct nv50_head_atom *asyh) ...@@ -1094,13 +1094,14 @@ nv50_head_mode(struct nv50_head *head, struct nv50_head_atom *asyh)
evo_mthd(push, 0x0804 + (head->base.index * 0x400), 2); evo_mthd(push, 0x0804 + (head->base.index * 0x400), 2);
evo_data(push, 0x00800000 | m->clock); evo_data(push, 0x00800000 | m->clock);
evo_data(push, m->interlace ? 0x00000002 : 0x00000000); evo_data(push, m->interlace ? 0x00000002 : 0x00000000);
evo_mthd(push, 0x0810 + (head->base.index * 0x400), 6); evo_mthd(push, 0x0810 + (head->base.index * 0x400), 7);
evo_data(push, 0x00000000); evo_data(push, 0x00000000);
evo_data(push, (m->v.active << 16) | m->h.active ); evo_data(push, (m->v.active << 16) | m->h.active );
evo_data(push, (m->v.synce << 16) | m->h.synce ); evo_data(push, (m->v.synce << 16) | m->h.synce );
evo_data(push, (m->v.blanke << 16) | m->h.blanke ); evo_data(push, (m->v.blanke << 16) | m->h.blanke );
evo_data(push, (m->v.blanks << 16) | m->h.blanks ); evo_data(push, (m->v.blanks << 16) | m->h.blanks );
evo_data(push, (m->v.blank2e << 16) | m->v.blank2s); evo_data(push, (m->v.blank2e << 16) | m->v.blank2s);
evo_data(push, asyh->mode.v.blankus);
evo_mthd(push, 0x082c + (head->base.index * 0x400), 1); evo_mthd(push, 0x082c + (head->base.index * 0x400), 1);
evo_data(push, 0x00000000); evo_data(push, 0x00000000);
} else { } else {
...@@ -1480,22 +1481,6 @@ nv50_crtc_set_scale(struct nouveau_crtc *nv_crtc, bool update) ...@@ -1480,22 +1481,6 @@ nv50_crtc_set_scale(struct nouveau_crtc *nv_crtc, bool update)
return 0; return 0;
} }
static int
nv50_crtc_set_raster_vblank_dmi(struct nouveau_crtc *nv_crtc, u32 usec)
{
struct nv50_mast *mast = nv50_mast(nv_crtc->base.dev);
u32 *push;
push = evo_wait(mast, 8);
if (!push)
return -ENOMEM;
evo_mthd(push, 0x0828 + (nv_crtc->index * 0x400), 1);
evo_data(push, usec);
evo_kick(push, mast);
return 0;
}
static int static int
nv50_crtc_set_color_vibrance(struct nouveau_crtc *nv_crtc, bool update) nv50_crtc_set_color_vibrance(struct nouveau_crtc *nv_crtc, bool update)
{ {
...@@ -1666,7 +1651,6 @@ nv50_crtc_mode_set(struct drm_crtc *crtc, struct drm_display_mode *umode, ...@@ -1666,7 +1651,6 @@ nv50_crtc_mode_set(struct drm_crtc *crtc, struct drm_display_mode *umode,
struct drm_display_mode *mode, int x, int y, struct drm_display_mode *mode, int x, int y,
struct drm_framebuffer *old_fb) struct drm_framebuffer *old_fb)
{ {
struct nv50_mast *mast = nv50_mast(crtc->dev);
struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc); struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);
struct nouveau_connector *nv_connector; struct nouveau_connector *nv_connector;
int ret; int ret;
...@@ -1689,10 +1673,6 @@ nv50_crtc_mode_set(struct drm_crtc *crtc, struct drm_display_mode *umode, ...@@ -1689,10 +1673,6 @@ nv50_crtc_mode_set(struct drm_crtc *crtc, struct drm_display_mode *umode,
nv50_crtc_set_dither(nv_crtc, false); nv50_crtc_set_dither(nv_crtc, false);
nv50_crtc_set_scale(nv_crtc, false); nv50_crtc_set_scale(nv_crtc, false);
/* G94 only accepts this after setting scale */
if (nv50_vers(mast) < GF110_DISP_CORE_CHANNEL_DMA)
nv50_crtc_set_raster_vblank_dmi(nv_crtc, asyh->mode.v.blankus);
nv50_crtc_set_color_vibrance(nv_crtc, false); nv50_crtc_set_color_vibrance(nv_crtc, false);
nv50_crtc_set_image(nv_crtc, crtc->primary->fb, x, y, false); nv50_crtc_set_image(nv_crtc, crtc->primary->fb, x, y, false);
return 0; return 0;
......
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