diff options
| author |   Chris Wilson <chris@chris-wilson.co.uk> | 2009-02-11 13:25:09 +0000 |
|---|---|---|
| committer |   Dave Airlie <airlied@redhat.com> | 2009-02-20 12:21:12 +1000 |
| commit | 5c3b82e2b229e78eb32f4ea12d16f3ebeeab3fc7 (patch) | |
| tree | 1717b0b529629df1287e5a4ce08501fd92415a56 /include | |
| parent | drm: Check for a NULL encoder when reverting on error path (diff) | |
| download | linux-dev-5c3b82e2b229e78eb32f4ea12d16f3ebeeab3fc7.tar.xz linux-dev-5c3b82e2b229e78eb32f4ea12d16f3ebeeab3fc7.zip | |
drm: Propagate failure from setting crtc base.
Check the error paths within intel_pipe_set_base() to first cleanup and
then report back the error.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'include')
| -rw-r--r-- | include/drm/drm_crtc_helper.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h index 0c6f0e11b41b..0b0d236c2154 100644 --- a/include/drm/drm_crtc_helper.h +++ b/include/drm/drm_crtc_helper.h @@ -54,13 +54,13 @@ struct drm_crtc_helper_funcs { struct drm_display_mode *mode, struct drm_display_mode *adjusted_mode); /* Actually set the mode */ - void (*mode_set)(struct drm_crtc *crtc, struct drm_display_mode *mode, - struct drm_display_mode *adjusted_mode, int x, int y, - struct drm_framebuffer *old_fb); + int (*mode_set)(struct drm_crtc *crtc, struct drm_display_mode *mode, + struct drm_display_mode *adjusted_mode, int x, int y, + struct drm_framebuffer *old_fb); /* Move the crtc on the current fb to the given position *optional* */ - void (*mode_set_base)(struct drm_crtc *crtc, int x, int y, - struct drm_framebuffer *old_fb); + int (*mode_set_base)(struct drm_crtc *crtc, int x, int y, + struct drm_framebuffer *old_fb); }; struct drm_encoder_helper_funcs { |