@@ -40,7 +40,7 @@ static inline bool is_dsb_busy(struct intel_dsb *dsb)
struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
enum pipe pipe = crtc->pipe;
- return DSB_STATUS & intel_de_read(dev_priv, DSB_CTRL(pipe, dsb->id));
+ return intel_de_read(dev_priv, DSB_CTRL(pipe, dsb->id)) & DSB_STATUS;
}
static inline bool intel_dsb_enable_engine(struct intel_dsb *dsb)
@@ -48,18 +48,15 @@ static inline bool intel_dsb_enable_engine(struct intel_dsb *dsb)
struct intel_crtc *crtc = container_of(dsb, typeof(*crtc), dsb);
struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
enum pipe pipe = crtc->pipe;
- u32 dsb_ctrl;
- dsb_ctrl = intel_de_read(dev_priv, DSB_CTRL(pipe, dsb->id));
- if (DSB_STATUS & dsb_ctrl) {
+ if (is_dsb_busy(dsb)) {
DRM_ERROR("DSB engine is busy.\n");
return false;
}
- dsb_ctrl |= DSB_ENABLE;
- intel_de_write(dev_priv, DSB_CTRL(pipe, dsb->id), dsb_ctrl);
-
+ intel_de_write(dev_priv, DSB_CTRL(pipe, dsb->id), DSB_ENABLE);
intel_de_posting_read(dev_priv, DSB_CTRL(pipe, dsb->id));
+
return true;
}
@@ -68,18 +65,15 @@ static inline bool intel_dsb_disable_engine(struct intel_dsb *dsb)
struct intel_crtc *crtc = container_of(dsb, typeof(*crtc), dsb);
struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
enum pipe pipe = crtc->pipe;
- u32 dsb_ctrl;
- dsb_ctrl = intel_de_read(dev_priv, DSB_CTRL(pipe, dsb->id));
- if (DSB_STATUS & dsb_ctrl) {
+ if (is_dsb_busy(dsb)) {
DRM_DEBUG_KMS("DSB engine is busy.\n");
return false;
}
- dsb_ctrl &= ~DSB_ENABLE;
- intel_de_write(dev_priv, DSB_CTRL(pipe, dsb->id), dsb_ctrl);
-
+ intel_de_write(dev_priv, DSB_CTRL(pipe, dsb->id), 0);
intel_de_posting_read(dev_priv, DSB_CTRL(pipe, dsb->id));
+
return true;
}