diff options
author | Kristian H�gsberg <krh@redhat.com> | 2008-12-17 22:14:37 -0500 |
---|---|---|
committer | Dave Airlie <airlied@linux.ie> | 2008-12-29 02:47:25 -0500 |
commit | 0c7c26647579e9e647e8b969bb0e7b3f5f1a1492 (patch) | |
tree | 741cd9680ce6a98def2e64f923efb713dae8908b /drivers/gpu/drm/i915/intel_display.c | |
parent | e0c8463a8b00b467611607df0ff369d062528875 (diff) |
drm: drop DRM_IOCTL_MODE_REPLACEFB, add+remove works just as well.
The replace fb ioctl replaces the backing buffer object for a modesetting
framebuffer object. This can be acheived by just creating a new
framebuffer backed by the new buffer object, setting that for the crtcs
in question and then removing the old framebuffer object.
Signed-off-by: Kristian Hogsberg <krh@redhat.com>
Acked-by: Jakob Bornecrantz <jakob@vmware.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 96c2da5b74e3..5689e44d30b3 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c | |||
@@ -1528,38 +1528,7 @@ intel_user_framebuffer_create(struct drm_device *dev, | |||
1528 | return fb; | 1528 | return fb; |
1529 | } | 1529 | } |
1530 | 1530 | ||
1531 | static int intel_insert_new_fb(struct drm_device *dev, | ||
1532 | struct drm_file *file_priv, | ||
1533 | struct drm_framebuffer *fb, | ||
1534 | struct drm_mode_fb_cmd *mode_cmd) | ||
1535 | { | ||
1536 | struct intel_framebuffer *intel_fb; | ||
1537 | struct drm_gem_object *obj; | ||
1538 | struct drm_crtc *crtc; | ||
1539 | |||
1540 | intel_fb = to_intel_framebuffer(fb); | ||
1541 | |||
1542 | obj = drm_gem_object_lookup(dev, file_priv, mode_cmd->handle); | ||
1543 | |||
1544 | if (!obj) | ||
1545 | return -EINVAL; | ||
1546 | |||
1547 | intel_fb->obj = obj; | ||
1548 | drm_gem_object_unreference(intel_fb->obj); | ||
1549 | drm_helper_mode_fill_fb_struct(fb, mode_cmd); | ||
1550 | mutex_unlock(&dev->struct_mutex); | ||
1551 | |||
1552 | list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) { | ||
1553 | if (crtc->fb == fb) { | ||
1554 | struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private; | ||
1555 | crtc_funcs->mode_set_base(crtc, crtc->x, crtc->y); | ||
1556 | } | ||
1557 | } | ||
1558 | return 0; | ||
1559 | } | ||
1560 | |||
1561 | static const struct drm_mode_config_funcs intel_mode_funcs = { | 1531 | static const struct drm_mode_config_funcs intel_mode_funcs = { |
1562 | .resize_fb = intel_insert_new_fb, | ||
1563 | .fb_create = intel_user_framebuffer_create, | 1532 | .fb_create = intel_user_framebuffer_create, |
1564 | .fb_changed = intelfb_probe, | 1533 | .fb_changed = intelfb_probe, |
1565 | }; | 1534 | }; |