diff options
author | Rob Clark <robdclark@gmail.com> | 2014-07-17 23:30:04 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2014-07-18 14:25:15 +1000 |
commit | 7707e6535f43328e05e4729ac96eee864b90e8a4 (patch) | |
tree | f4b5ef3ab0b67b86b2a75a8f3c5a7e7f0086848c /drivers/gpu/drm/i915/intel_overlay.c | |
parent | 6d385c0aa31de99da391fda0fc43462e2df20863 (diff) | |
download | op-kernel-dev-7707e6535f43328e05e4729ac96eee864b90e8a4.zip op-kernel-dev-7707e6535f43328e05e4729ac96eee864b90e8a4.tar.gz |
drm/i915: use helpers
Signed-off-by: Rob Clark <robdclark@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_overlay.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_overlay.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/gpu/drm/i915/intel_overlay.c b/drivers/gpu/drm/i915/intel_overlay.c index 307c2f1..dc2f4f26 100644 --- a/drivers/gpu/drm/i915/intel_overlay.c +++ b/drivers/gpu/drm/i915/intel_overlay.c @@ -1039,7 +1039,7 @@ int intel_overlay_put_image(struct drm_device *dev, void *data, struct drm_intel_overlay_put_image *put_image_rec = data; struct drm_i915_private *dev_priv = dev->dev_private; struct intel_overlay *overlay; - struct drm_mode_object *drmmode_obj; + struct drm_crtc *drmmode_crtc; struct intel_crtc *crtc; struct drm_i915_gem_object *new_bo; struct put_image_params *params; @@ -1068,13 +1068,12 @@ int intel_overlay_put_image(struct drm_device *dev, void *data, if (!params) return -ENOMEM; - drmmode_obj = drm_mode_object_find(dev, put_image_rec->crtc_id, - DRM_MODE_OBJECT_CRTC); - if (!drmmode_obj) { + drmmode_crtc = drm_crtc_find(dev, put_image_rec->crtc_id); + if (!drmmode_crtc) { ret = -ENOENT; goto out_free; } - crtc = to_intel_crtc(obj_to_crtc(drmmode_obj)); + crtc = to_intel_crtc(drmmode_crtc); new_bo = to_intel_bo(drm_gem_object_lookup(dev, file_priv, put_image_rec->bo_handle)); |