1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index bbcd35abf247..f36126383d26 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -1544,7 +1544,7 @@ int i915_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
 
         /* Access to snoopable pages through the GTT is incoherent. */
         if (obj->cache_level != I915_CACHE_NONE && !HAS_LLC(dev)) {
-                ret = -EINVAL;
+                ret = -EFAULT;
                 goto unlock;
         }
 
@@ -4894,7 +4894,7 @@ i915_gem_load(struct drm_device *dev)
         init_waitqueue_head(&dev_priv->gpu_error.reset_queue);
 
         /* On GEN3 we really need to make sure the ARB C3 LP bit is set */
-        if (IS_GEN3(dev)) {
+        if (!drm_core_check_feature(dev, DRIVER_MODESET) && IS_GEN3(dev)) {
                 I915_WRITE(MI_ARB_STATE,
                            _MASKED_BIT_ENABLE(MI_ARB_C3_LP_WRITE_ENABLE));
         }