drm/i915: add some more "i" in platform names for consistency

[mirror_ubuntu-artful-kernel.git] / drivers / gpu / drm / i915 / intel_overlay.c

diff --git a/drivers/gpu/drm/i915/intel_overlay.c b/drivers/gpu/drm/i915/intel_overlay.c
index a24bc8c7889f04ce3f3d7e2351404e43f777ceef..354f8cec96bba321ee1d24b76c83467224fc34c9 100644 (file)
--- a/drivers/gpu/drm/i915/intel_overlay.c
+++ b/drivers/gpu/drm/i915/intel_overlay.c
@@ -233,7 +233,7 @@ static int intel_overlay_do_wait_request(struct intel_overlay *overlay,
 static struct drm_i915_gem_request *alloc_request(struct intel_overlay *overlay)
 {
        struct drm_i915_private *dev_priv = overlay->i915;
-       struct intel_engine_cs *engine = &dev_priv->engine[RCS];
+       struct intel_engine_cs *engine = dev_priv->engine[RCS];
 
        return i915_gem_request_alloc(engine, dev_priv->kernel_context);
 }
@@ -957,7 +957,7 @@ static int check_overlay_src(struct drm_i915_private *dev_priv,
        u32 tmp;
 
        /* check src dimensions */
-       if (IS_845G(dev_priv) || IS_I830(dev_priv)) {
+       if (IS_I845G(dev_priv) || IS_I830(dev_priv)) {
                if (rec->src_height > IMAGE_MAX_HEIGHT_LEGACY ||
                    rec->src_width  > IMAGE_MAX_WIDTH_LEGACY)
                        return -EINVAL;
@@ -1009,7 +1009,7 @@ static int check_overlay_src(struct drm_i915_private *dev_priv,
                return -EINVAL;
 
        /* stride checking */
-       if (IS_I830(dev_priv) || IS_845G(dev_priv))
+       if (IS_I830(dev_priv) || IS_I845G(dev_priv))
                stride_mask = 255;
        else
                stride_mask = 63;
@@ -1222,7 +1222,7 @@ int intel_overlay_put_image_ioctl(struct drm_device *dev, void *data,
 out_unlock:
        mutex_unlock(&dev->struct_mutex);
        drm_modeset_unlock_all(dev);
-       i915_gem_object_put_unlocked(new_bo);
+       i915_gem_object_put(new_bo);
 out_free:
        kfree(params);
 
@@ -1391,10 +1391,9 @@ void intel_setup_overlay(struct drm_i915_private *dev_priv)
 
        reg_bo = NULL;
        if (!OVERLAY_NEEDS_PHYSICAL(dev_priv))
-               reg_bo = i915_gem_object_create_stolen(&dev_priv->drm,
-                                                      PAGE_SIZE);
+               reg_bo = i915_gem_object_create_stolen(dev_priv, PAGE_SIZE);
        if (reg_bo == NULL)
-               reg_bo = i915_gem_object_create(&dev_priv->drm, PAGE_SIZE);
+               reg_bo = i915_gem_object_create(dev_priv, PAGE_SIZE);
        if (IS_ERR(reg_bo))
                goto out_free;
        overlay->reg_bo = reg_bo;
@@ -1466,10 +1465,12 @@ void intel_cleanup_overlay(struct drm_i915_private *dev_priv)
         * hardware should be off already */
        WARN_ON(dev_priv->overlay->active);
 
-       i915_gem_object_put_unlocked(dev_priv->overlay->reg_bo);
+       i915_gem_object_put(dev_priv->overlay->reg_bo);
        kfree(dev_priv->overlay);
 }
 
+#if IS_ENABLED(CONFIG_DRM_I915_CAPTURE_ERROR)
+
 struct intel_overlay_error_state {
        struct overlay_registers regs;
        unsigned long base;
@@ -1587,3 +1588,5 @@ intel_overlay_print_error_state(struct drm_i915_error_state_buf *m,
        P(UVSCALEV);
 #undef P
 }
+
+#endif