staging: msvdx: remove unused support for rar offset

Restricted access region is not supported in general. This is
part of latest UMG video hw driver update.

Signed-off-by: Topi Pohjolainen <topi.pohjolainen@intel.com>

diff --git a/drivers/staging/mrst/imgv/psb_msvdx.c b/drivers/staging/mrst/imgv/psb_msvdx.c
index afe2785..240d73e 100644 (file)
--- a/drivers/staging/mrst/imgv/psb_msvdx.c
+++ b/drivers/staging/mrst/imgv/psb_msvdx.c
@@ -1251,12 +1251,6 @@ int lnc_video_getparam(struct drm_device *dev, void *data,
        drm_psb_msvdx_frame_info_t *current_frame = NULL;
        uint32_t handle, i;
 
-#if defined(CONFIG_MRST_RAR_HANDLER)
-       struct RAR_buffer rar_buf;
-       size_t rar_status;
-#endif
-       void *rar_handler;
-       uint32_t offset = 0;
        uint32_t device_info = 0;
        uint32_t ctx_type = 0;
        struct psb_video_ctx *video_ctx = NULL;
@@ -1278,39 +1272,6 @@ int lnc_video_getparam(struct drm_device *dev, void *data,
                                   &rar_ci_info[0],
                                   sizeof(rar_ci_info));
                break;
-       case LNC_VIDEO_GETPARAM_RAR_HANDLER_OFFSET:
-               ret = copy_from_user(&rar_handler,
-                                    (void __user *)((unsigned long)arg->arg),
-                                    sizeof(rar_handler));
-               if (ret)
-                       break;
-
-#if defined(CONFIG_MRST_RAR_HANDLER)
-               rar_buf.info.handle = (__u32)rar_handler;
-               rar_buf.bus_address = (dma_addr_t)dev_priv->rar_region_start;
-               rar_status = 1;
-
-               rar_status = rar_handle_to_bus(&rar_buf, 1);
-               if (rar_status != 1) {
-                       DRM_ERROR("MSVDX:rar_handle_to_bus failed\n");
-                       ret = -1;
-                       break;
-               }
-               rar_status = rar_release(&rar_buf, 1);
-               if (rar_status != 1)
-                       DRM_ERROR("MSVDX:rar_release failed\n");
-
-               offset = (uint32_t) rar_buf.bus_address - dev_priv->rar_region_start;
-               PSB_DEBUG_GENERAL("MSVDX:RAR handler %p, bus address=0x%08x,"
-                                 "RAR region=0x%08x\n",
-                                 rar_handler,
-                                 (uint32_t)rar_buf.bus_address,
-                                 dev_priv->rar_region_start);
-#endif
-               ret = copy_to_user((void __user *)((unsigned long)arg->value),
-                                  &offset,
-                                  sizeof(offset));
-               break;
        case LNC_VIDEO_FRAME_SKIP:
                ret = -EFAULT;
                break;

diff --git a/drivers/staging/mrst/imgv/psb_msvdx.h b/drivers/staging/mrst/imgv/psb_msvdx.h
index b7c1002..dae5618 100644 (file)
--- a/drivers/staging/mrst/imgv/psb_msvdx.h
+++ b/drivers/staging/mrst/imgv/psb_msvdx.h
@@ -24,10 +24,6 @@
 #include "psb_drv.h"
 #include "img_types.h"
 
-#if defined(CONFIG_MRST_RAR_HANDLER)
-#include "../../memrar/memrar.h"
-#endif
-
 extern int drm_msvdx_pmpolicy;
 extern int drm_msvdx_delay;