Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 262544
b: refs/heads/master
c: 013a41e
h: refs/heads/master
v: v3
  • Loading branch information
Jesse Barnes authored and Keith Packard committed Jul 29, 2011
1 parent 47c1707 commit a825a0f
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 358733e9047cafcc185ca19b8c369c659ac0c4cf
refs/heads/master: 013a41ec541d5daa0c9f2b5126d2e820902c052d
5 changes: 4 additions & 1 deletion trunk/drivers/gpu/drm/i915/intel_display.c
Original file line number Diff line number Diff line change
Expand Up @@ -1958,7 +1958,7 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,

/* no fb bound */
if (!crtc->fb) {
DRM_DEBUG_KMS("No FB bound\n");
DRM_ERROR("No FB bound\n");
return 0;
}

Expand All @@ -1967,6 +1967,7 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
case 1:
break;
default:
DRM_ERROR("no plane for crtc\n");
return -EINVAL;
}

Expand All @@ -1976,6 +1977,7 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
NULL);
if (ret != 0) {
mutex_unlock(&dev->struct_mutex);
DRM_ERROR("pin & fence failed\n");
return ret;
}

Expand Down Expand Up @@ -2004,6 +2006,7 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
if (ret) {
i915_gem_object_unpin(to_intel_framebuffer(crtc->fb)->obj);
mutex_unlock(&dev->struct_mutex);
DRM_ERROR("failed to update base address\n");
return ret;
}

Expand Down

0 comments on commit a825a0f

Please sign in to comment.