Merge tag 'drm-misc-next-2019-01-07-1' of git://anongit.freedesktop.org/drm/drm-misc...

[linux-2.6-block.git] / drivers / gpu / drm / drm_lease.c

diff --git a/drivers/gpu/drm/drm_lease.c b/drivers/gpu/drm/drm_lease.c
index 99cba8ea5d825596d7d86120f2ad6346926c64ba..b735704653cbb7b52761a32427bc5aebd24ae420 100644 (file)
--- a/drivers/gpu/drm/drm_lease.c
+++ b/drivers/gpu/drm/drm_lease.c
@@ -218,7 +218,7 @@ static struct drm_master *drm_lease_create(struct drm_master *lessor, struct idr
 
        idr_for_each_entry(leases, entry, object) {
                error = 0;
-               if (!idr_find(&dev->mode_config.crtc_idr, object))
+               if (!idr_find(&dev->mode_config.object_idr, object))
                        error = -ENOENT;
                else if (!_drm_lease_held_master(lessor, object))
                        error = -EACCES;
@@ -439,7 +439,7 @@ static int fill_object_idr(struct drm_device *dev,
                /*
                 * We're using an IDR to hold the set of leased
                 * objects, but we don't need to point at the object's
-                * data structure from the lease as the main crtc_idr
+                * data structure from the lease as the main object_idr
                 * will be used to actually find that. Instead, all we
                 * really want is a 'leased/not-leased' result, for
                 * which any non-NULL pointer will work fine.
@@ -687,7 +687,7 @@ int drm_mode_get_lease_ioctl(struct drm_device *dev,
 
        if (lessee->lessor == NULL)
                /* owner can use all objects */
-               object_idr = &lessee->dev->mode_config.crtc_idr;
+               object_idr = &lessee->dev->mode_config.object_idr;
        else
                /* lessee can only use allowed object */
                object_idr = &lessee->leases;