modesetting: pass file priv to cursor

diff --git a/linux-core/drm_crtc.c b/linux-core/drm_crtc.c
index 91bff1f6e74fc30f404e86deb0e841021e3a56a5..7ee332198cdb5fe6e0adf2df81bf70fc5ddda5d1 100644 (file)
--- a/linux-core/drm_crtc.c
+++ b/linux-core/drm_crtc.c
@@ -1445,7 +1445,7 @@ int drm_mode_cursor_ioctl(struct drm_device *dev,
        if (req->flags & DRM_MODE_CURSOR_BO) {
                /* Turn of the cursor if handle is 0 */
                if (crtc->funcs->cursor_set) {
-                       ret = crtc->funcs->cursor_set(crtc, req->handle, req->width, req->height);
+                       ret = crtc->funcs->cursor_set(crtc, file_priv, req->handle, req->width, req->height);
                } else {
                        DRM_ERROR("crtc does not support cursor\n");
                        ret = -EFAULT;

diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index 117b7213eddef9ca465ff249af05ac74468b1174..bfccdeb5a1da4cfcb522ccbb53ad3adc9c249cab 100644 (file)
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -299,8 +299,8 @@ struct drm_crtc_funcs {
        void (*restore)(struct drm_crtc *crtc); /* resume? */
 
        /* cursor controls */
-       int (*cursor_set)(struct drm_crtc *crtc, uint32_t buffer_handle,
-                         uint32_t width, uint32_t height);
+       int (*cursor_set)(struct drm_crtc *crtc, struct drm_file *file_priv,
+                         uint32_t handle, uint32_t width, uint32_t height);
        int (*cursor_move)(struct drm_crtc *crtc, int x, int y);
 
        /* Set gamma on the CRTC */

diff --git a/linux-core/intel_display.c b/linux-core/intel_display.c
index 29aae1693d8957e887f333fecc2ade47c4194cf6..b8077bd2818cf55a9c794f78d6ff43fcd89cb2d2 100644 (file)
--- a/linux-core/intel_display.c
+++ b/linux-core/intel_display.c
@@ -972,6 +972,7 @@ void intel_crtc_load_lut(struct drm_crtc *crtc)
 }
 
 static int intel_crtc_cursor_set(struct drm_crtc *crtc,
+                                struct drm_file *file_priv,
                                 uint32_t handle,
                                 uint32_t width, uint32_t height)
 {

diff --git a/linux-core/nv50_kms_wrapper.c b/linux-core/nv50_kms_wrapper.c
index 1c4b52d79c68cf2d63b68d3845c51c4ce4356d2e..77271c1babc2b3773cf32c90dd997ee55ad42fab 100644 (file)
--- a/linux-core/nv50_kms_wrapper.c
+++ b/linux-core/nv50_kms_wrapper.c
@@ -236,8 +236,10 @@ static const struct drm_mode_config_funcs nv50_kms_mode_funcs = {
  * CRTC functions.
  */
 
-static int nv50_kms_crtc_cursor_set(struct drm_crtc *drm_crtc, uint32_t buffer_handle,
-                         uint32_t width, uint32_t height)
+static int nv50_kms_crtc_cursor_set(struct drm_crtc *drm_crtc, 
+                                   struct drm_file *file_priv,
+                                   uint32_t buffer_handle,
+                                   uint32_t width, uint32_t height)
 {
        struct nv50_crtc *crtc = to_nv50_crtc(drm_crtc);
        struct nv50_display *display = nv50_get_display(crtc->dev);