Skip to content

Commit

Permalink
drm/nv50-/kms: remove unnecessary wait-for-completion points
Browse files Browse the repository at this point in the history
DP link training is now handled as part of the supervisor processing,
and can no longer race with it.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
  • Loading branch information
Ben Skeggs committed Feb 20, 2013
1 parent 0a0afd2 commit 5a885f0
Showing 1 changed file with 2 additions and 10 deletions.
12 changes: 2 additions & 10 deletions drivers/gpu/drm/nouveau/nv50_display.c
Original file line number Diff line number Diff line change
Expand Up @@ -1738,14 +1738,6 @@ nv50_sor_disconnect(struct drm_encoder *encoder)
nv_encoder->crtc = NULL;
}

static void
nv50_sor_prepare(struct drm_encoder *encoder)
{
nv50_sor_disconnect(encoder);
if (nouveau_encoder(encoder)->dcb->type == DCB_OUTPUT_DP)
evo_sync(encoder->dev);
}

static void
nv50_sor_commit(struct drm_encoder *encoder)
{
Expand Down Expand Up @@ -1883,7 +1875,7 @@ nv50_sor_destroy(struct drm_encoder *encoder)
static const struct drm_encoder_helper_funcs nv50_sor_hfunc = {
.dpms = nv50_sor_dpms,
.mode_fixup = nv50_sor_mode_fixup,
.prepare = nv50_sor_prepare,
.prepare = nv50_sor_disconnect,
.commit = nv50_sor_commit,
.mode_set = nv50_sor_mode_set,
.disable = nv50_sor_disconnect,
Expand Down Expand Up @@ -1946,7 +1938,7 @@ nv50_display_init(struct drm_device *dev)
evo_mthd(push, 0x0088, 1);
evo_data(push, NvEvoSync);
evo_kick(push, nv50_mast(dev));
return evo_sync(dev);
return 0;
}

return -EBUSY;
Expand Down

0 comments on commit 5a885f0

Please sign in to comment.