Skip to content

Commit

Permalink
drm/i915: add some barriers when changing DIPs
Browse files Browse the repository at this point in the history 
On IVB and older, we basically have two registers: the control and the
data register. We write a few consecutitve times to the control
register, and we need these writes to arrive exactly in the specified
order.

Also, when we're changing the data register, we need to guarantee that
anything written to the control register already arrived (since
changing the control register can change where the data register
points to). Also, we need to make sure all the writes to the data
register happen exactly in the specified order, and we also *can't*
read the data register during this process, since reading and/or
writing it will change the place it points to.

So invoke the "better safe than sorry" rule and just be careful and
put barriers everywhere :)

On HSW we still have a control register that we write many times, but
we have many data registers.

Demanded-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
  • Loading branch information
Paulo Zanoni authored and Daniel Vetter committed May 30, 2012
1 parent c30b611 commit 9d9740f
Showing 1 changed file with 27 additions and 0 deletions.
27 changes: 27 additions & 0 deletions drivers/gpu/drm/i915/intel_hdmi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,16 +133,19 @@ static void g4x_write_infoframe(struct drm_encoder *encoder,

I915_WRITE(VIDEO_DIP_CTL, val);

mmiowb();
for (i = 0; i < len; i += 4) {
I915_WRITE(VIDEO_DIP_DATA, *data);
data++;
}
mmiowb();

val |= g4x_infoframe_enable(frame);
val &= ~VIDEO_DIP_FREQ_MASK;
val |= VIDEO_DIP_FREQ_VSYNC;

I915_WRITE(VIDEO_DIP_CTL, val);
POSTING_READ(VIDEO_DIP_CTL);
}

static void ibx_write_infoframe(struct drm_encoder *encoder,
Expand All @@ -165,16 +168,19 @@ static void ibx_write_infoframe(struct drm_encoder *encoder,

I915_WRITE(reg, val);

mmiowb();
for (i = 0; i < len; i += 4) {
I915_WRITE(TVIDEO_DIP_DATA(intel_crtc->pipe), *data);
data++;
}
mmiowb();

val |= g4x_infoframe_enable(frame);
val &= ~VIDEO_DIP_FREQ_MASK;
val |= VIDEO_DIP_FREQ_VSYNC;

I915_WRITE(reg, val);
POSTING_READ(reg);
}

static void cpt_write_infoframe(struct drm_encoder *encoder,
Expand All @@ -200,16 +206,19 @@ static void cpt_write_infoframe(struct drm_encoder *encoder,

I915_WRITE(reg, val);

mmiowb();
for (i = 0; i < len; i += 4) {
I915_WRITE(TVIDEO_DIP_DATA(intel_crtc->pipe), *data);
data++;
}
mmiowb();

val |= g4x_infoframe_enable(frame);
val &= ~VIDEO_DIP_FREQ_MASK;
val |= VIDEO_DIP_FREQ_VSYNC;

I915_WRITE(reg, val);
POSTING_READ(reg);
}

static void vlv_write_infoframe(struct drm_encoder *encoder,
Expand All @@ -232,16 +241,19 @@ static void vlv_write_infoframe(struct drm_encoder *encoder,

I915_WRITE(reg, val);

mmiowb();
for (i = 0; i < len; i += 4) {
I915_WRITE(VLV_TVIDEO_DIP_DATA(intel_crtc->pipe), *data);
data++;
}
mmiowb();

val |= g4x_infoframe_enable(frame);
val &= ~VIDEO_DIP_FREQ_MASK;
val |= VIDEO_DIP_FREQ_VSYNC;

I915_WRITE(reg, val);
POSTING_READ(reg);
}

static void hsw_write_infoframe(struct drm_encoder *encoder,
Expand All @@ -262,13 +274,16 @@ static void hsw_write_infoframe(struct drm_encoder *encoder,
val &= ~hsw_infoframe_enable(frame);
I915_WRITE(ctl_reg, val);

mmiowb();
for (i = 0; i < len; i += 4) {
I915_WRITE(data_reg + i, *data);
data++;
}
mmiowb();

val |= hsw_infoframe_enable(frame);
I915_WRITE(ctl_reg, val);
POSTING_READ(ctl_reg);
}

static void intel_set_infoframe(struct drm_encoder *encoder,
Expand Down Expand Up @@ -335,6 +350,7 @@ static void g4x_set_infoframes(struct drm_encoder *encoder,
return;
val &= ~VIDEO_DIP_ENABLE;
I915_WRITE(reg, val);
POSTING_READ(reg);
return;
}

Expand All @@ -353,6 +369,7 @@ static void g4x_set_infoframes(struct drm_encoder *encoder,
if (val & VIDEO_DIP_ENABLE) {
val &= ~VIDEO_DIP_ENABLE;
I915_WRITE(reg, val);
POSTING_READ(reg);
}
val &= ~VIDEO_DIP_PORT_MASK;
val |= port;
Expand All @@ -362,6 +379,7 @@ static void g4x_set_infoframes(struct drm_encoder *encoder,
val &= ~VIDEO_DIP_ENABLE_VENDOR;

I915_WRITE(reg, val);
POSTING_READ(reg);

intel_hdmi_set_avi_infoframe(encoder, adjusted_mode);
intel_hdmi_set_spd_infoframe(encoder);
Expand All @@ -385,6 +403,7 @@ static void ibx_set_infoframes(struct drm_encoder *encoder,
return;
val &= ~VIDEO_DIP_ENABLE;
I915_WRITE(reg, val);
POSTING_READ(reg);
return;
}

Expand All @@ -406,6 +425,7 @@ static void ibx_set_infoframes(struct drm_encoder *encoder,
if (val & VIDEO_DIP_ENABLE) {
val &= ~VIDEO_DIP_ENABLE;
I915_WRITE(reg, val);
POSTING_READ(reg);
}
val &= ~VIDEO_DIP_PORT_MASK;
val |= port;
Expand All @@ -416,6 +436,7 @@ static void ibx_set_infoframes(struct drm_encoder *encoder,
VIDEO_DIP_ENABLE_GCP);

I915_WRITE(reg, val);
POSTING_READ(reg);

intel_hdmi_set_avi_infoframe(encoder, adjusted_mode);
intel_hdmi_set_spd_infoframe(encoder);
Expand All @@ -438,6 +459,7 @@ static void cpt_set_infoframes(struct drm_encoder *encoder,
return;
val &= ~(VIDEO_DIP_ENABLE | VIDEO_DIP_ENABLE_AVI);
I915_WRITE(reg, val);
POSTING_READ(reg);
return;
}

Expand All @@ -447,6 +469,7 @@ static void cpt_set_infoframes(struct drm_encoder *encoder,
VIDEO_DIP_ENABLE_GCP);

I915_WRITE(reg, val);
POSTING_READ(reg);

intel_hdmi_set_avi_infoframe(encoder, adjusted_mode);
intel_hdmi_set_spd_infoframe(encoder);
Expand All @@ -469,6 +492,7 @@ static void vlv_set_infoframes(struct drm_encoder *encoder,
return;
val &= ~VIDEO_DIP_ENABLE;
I915_WRITE(reg, val);
POSTING_READ(reg);
return;
}

Expand All @@ -477,6 +501,7 @@ static void vlv_set_infoframes(struct drm_encoder *encoder,
VIDEO_DIP_ENABLE_GCP);

I915_WRITE(reg, val);
POSTING_READ(reg);

intel_hdmi_set_avi_infoframe(encoder, adjusted_mode);
intel_hdmi_set_spd_infoframe(encoder);
Expand All @@ -493,13 +518,15 @@ static void hsw_set_infoframes(struct drm_encoder *encoder,

if (!intel_hdmi->has_hdmi_sink) {
I915_WRITE(reg, 0);
POSTING_READ(reg);
return;
}

val &= ~(VIDEO_DIP_ENABLE_VSC_HSW | VIDEO_DIP_ENABLE_GCP_HSW |
VIDEO_DIP_ENABLE_VS_HSW | VIDEO_DIP_ENABLE_GMP_HSW);

I915_WRITE(reg, val);
POSTING_READ(reg);

intel_hdmi_set_avi_infoframe(encoder, adjusted_mode);
intel_hdmi_set_spd_infoframe(encoder);
Expand Down

0 comments on commit 9d9740f

Please sign in to comment.