From 32a1a6180d73c3ed044a176c72e55fe2e003b86c Mon Sep 17 00:00:00 2001 From: Yakir Yang Date: Fri, 18 Mar 2016 17:00:52 +0800 Subject: [PATCH] include: drm: rockchip_drm.h: remove those old unsued file Thoes file were introduced by Commit bdafdac384d56555736584775236dbd817a1cdda (rk3288 chromium: drm grafic fb support for x11 mali gpu), for now we have the mainline rockchip drm code, no need those old head files, let's removed them. Change-Id: I325a5b7981ac5478349f276f8811b1b51e40c564 Signed-off-by: Yakir Yang --- include/drm/rockchip_drm.h | 100 -------- include/uapi/drm/rockchip_drm.h | 390 -------------------------------- 2 files changed, 490 deletions(-) delete mode 100644 include/drm/rockchip_drm.h delete mode 100644 include/uapi/drm/rockchip_drm.h diff --git a/include/drm/rockchip_drm.h b/include/drm/rockchip_drm.h deleted file mode 100644 index 9339c44c179a..000000000000 --- a/include/drm/rockchip_drm.h +++ /dev/null @@ -1,100 +0,0 @@ -/* rockchip_drm.h - * - * Copyright (c) 2011 Samsung Electronics Co., Ltd. - * Authors: - * Inki Dae - * Joonyoung Shim - * Seung-Woo Kim - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - */ -#ifndef _rockchip_DRM_H_ -#define _rockchip_DRM_H_ - -#include - -/** - * A structure for lcd panel information. - * - * @timing: default video mode for initializing - * @width_mm: physical size of lcd width. - * @height_mm: physical size of lcd height. - */ -struct rockchip_drm_panel_info { - struct fb_videomode timing; - u32 width_mm; - u32 height_mm; -}; - -/** - * Platform Specific Structure for DRM based FIMD. - * - * @panel: default panel info for initializing - * @default_win: default window layer number to be used for UI. - * @bpp: default bit per pixel. - */ -struct rockchip_drm_fimd_pdata { - struct rockchip_drm_panel_info panel; - u32 vidcon0; - u32 vidcon1; - unsigned int default_win; - unsigned int bpp; -}; - -/** - * Platform Specific Structure for DRM based HDMI. - * - * @hdmi_dev: device point to specific hdmi driver. - * @mixer_dev: device point to specific mixer driver. - * - * this structure is used for common hdmi driver and each device object - * would be used to access specific device driver(hdmi or mixer driver) - */ -struct rockchip_drm_common_hdmi_pd { - struct device *hdmi_dev; - struct device *mixer_dev; -}; - -/** - * Platform Specific Structure for DRM based HDMI core. - * - * @is_v13: set if hdmi version 13 is. - * @cfg_hpd: function pointer to configure hdmi hotplug detection pin - * @get_hpd: function pointer to get value of hdmi hotplug detection pin - */ -struct rockchip_drm_hdmi_pdata { - bool is_v13; - void (*cfg_hpd)(bool external); - int (*get_hpd)(void); -}; - -/** - * Platform Specific Structure for DRM based IPP. - * - * @inv_pclk: if set 1. invert pixel clock - * @inv_vsync: if set 1. invert vsync signal for wb - * @inv_href: if set 1. invert href signal - * @inv_hsync: if set 1. invert hsync signal for wb - */ -struct rockchip_drm_ipp_pol { - unsigned int inv_pclk; - unsigned int inv_vsync; - unsigned int inv_href; - unsigned int inv_hsync; -}; - -/** - * Platform Specific Structure for DRM based FIMC. - * - * @pol: current hardware block polarity settings. - * @clk_rate: current hardware clock rate. - */ -struct rockchip_drm_fimc_pdata { - struct rockchip_drm_ipp_pol pol; - int clk_rate; -}; - -#endif /* _rockchip_DRM_H_ */ diff --git a/include/uapi/drm/rockchip_drm.h b/include/uapi/drm/rockchip_drm.h deleted file mode 100644 index 8edac44fb885..000000000000 --- a/include/uapi/drm/rockchip_drm.h +++ /dev/null @@ -1,390 +0,0 @@ -/* - * - * Copyright (C) ROCKCHIP, Inc. - *Author:yzq - * This software is licensed under the terms of the GNU General Public - * License version 2, as published by the Free Software Foundation, and - * may be copied, distributed, and modified under those terms. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#ifndef _UAPI_ROCKCHIP_DRM_H_ -#define _UAPI_ROCKCHIP_DRM_H_ - -#include - -/** - * User-desired buffer creation information structure. - * - * @size: user-desired memory allocation size. - * - this size value would be page-aligned internally. - * @flags: user request for setting memory type or cache attributes. - * @handle: returned a handle to created gem object. - * - this handle will be set by gem module of kernel side. - */ -struct drm_rockchip_gem_create { - uint64_t size; - unsigned int flags; - unsigned int handle; -}; - -/** - * A structure for getting buffer offset. - * - * @handle: a pointer to gem object created. - * @pad: just padding to be 64-bit aligned. - * @offset: relatived offset value of the memory region allocated. - * - this value should be set by user. - */ -struct drm_rockchip_gem_map_off { - unsigned int handle; - unsigned int pad; - uint64_t offset; -}; - -/** - * A structure for mapping buffer. - * - * @handle: a handle to gem object created. - * @pad: just padding to be 64-bit aligned. - * @size: memory size to be mapped. - * @mapped: having user virtual address mmaped. - * - this variable would be filled by exynos gem module - * of kernel side with user virtual address which is allocated - * by do_mmap(). - */ -struct drm_rockchip_gem_mmap { - unsigned int handle; - unsigned int pad; - uint64_t size; - uint64_t mapped; -}; - -/** - * A structure to gem information. - * - * @handle: a handle to gem object created. - * @flags: flag value including memory type and cache attribute and - * this value would be set by driver. - * @size: size to memory region allocated by gem and this size would - * be set by driver. - */ -struct drm_rockchip_gem_info { - unsigned int handle; - unsigned int flags; - uint64_t size; -}; - -/** - * A structure for user connection request of virtual display. - * - * @connection: indicate whether doing connetion or not by user. - * @extensions: if this value is 1 then the vidi driver would need additional - * 128bytes edid data. - * @edid: the edid data pointer from user side. - */ -struct drm_rockchip_vidi_connection { - unsigned int connection; - unsigned int extensions; - uint64_t edid; -}; - -/* memory type definitions. */ -enum e_drm_rockchip_gem_mem_type { - /* Physically Continuous memory and used as default. */ - ROCKCHIP_BO_CONTIG = 0 << 0, - /* Physically Non-Continuous memory. */ - ROCKCHIP_BO_NONCONTIG = 1 << 0, - /* non-cachable mapping and used as default. */ - ROCKCHIP_BO_NONCACHABLE = 0 << 1, - /* cachable mapping. */ - ROCKCHIP_BO_CACHABLE = 1 << 1, - /* write-combine mapping. */ - ROCKCHIP_BO_WC = 1 << 2, - ROCKCHIP_BO_MASK = ROCKCHIP_BO_NONCONTIG | ROCKCHIP_BO_CACHABLE | - ROCKCHIP_BO_WC -}; - -struct drm_rockchip_g2d_get_ver { - __u32 major; - __u32 minor; -}; - -struct drm_rockchip_g2d_cmd { - __u32 offset; - __u32 data; -}; - -enum drm_rockchip_g2d_buf_type { - G2D_BUF_USERPTR = 1 << 31, -}; - -enum drm_rockchip_g2d_event_type { - G2D_EVENT_NOT, - G2D_EVENT_NONSTOP, - G2D_EVENT_STOP, /* not yet */ -}; - -struct drm_rockchip_g2d_userptr { - unsigned long userptr; - unsigned long size; -}; - -struct drm_rockchip_g2d_set_cmdlist { - __u64 cmd; - __u64 cmd_buf; - __u32 cmd_nr; - __u32 cmd_buf_nr; - - /* for g2d event */ - __u64 event_type; - __u64 user_data; -}; - -struct drm_rockchip_g2d_exec { - __u64 async; -}; - -enum drm_rockchip_ops_id { - ROCKCHIP_DRM_OPS_SRC, - ROCKCHIP_DRM_OPS_DST, - ROCKCHIP_DRM_OPS_MAX, -}; - -struct drm_rockchip_sz { - __u32 hsize; - __u32 vsize; -}; - -struct drm_rockchip_pos { - __u32 x; - __u32 y; - __u32 w; - __u32 h; -}; - -enum drm_rockchip_flip { - ROCKCHIP_DRM_FLIP_NONE = (0 << 0), - ROCKCHIP_DRM_FLIP_VERTICAL = (1 << 0), - ROCKCHIP_DRM_FLIP_HORIZONTAL = (1 << 1), - ROCKCHIP_DRM_FLIP_BOTH = ROCKCHIP_DRM_FLIP_VERTICAL | - ROCKCHIP_DRM_FLIP_HORIZONTAL, -}; - -enum drm_rockchip_degree { - ROCKCHIP_DRM_DEGREE_0, - ROCKCHIP_DRM_DEGREE_90, - ROCKCHIP_DRM_DEGREE_180, - ROCKCHIP_DRM_DEGREE_270, -}; - -enum drm_rockchip_planer { - ROCKCHIP_DRM_PLANAR_Y, - ROCKCHIP_DRM_PLANAR_CB, - ROCKCHIP_DRM_PLANAR_CR, - ROCKCHIP_DRM_PLANAR_MAX, -}; - -/** - * A structure for ipp supported property list. - * - * @version: version of this structure. - * @ipp_id: id of ipp driver. - * @count: count of ipp driver. - * @writeback: flag of writeback supporting. - * @flip: flag of flip supporting. - * @degree: flag of degree information. - * @csc: flag of csc supporting. - * @crop: flag of crop supporting. - * @scale: flag of scale supporting. - * @refresh_min: min hz of refresh. - * @refresh_max: max hz of refresh. - * @crop_min: crop min resolution. - * @crop_max: crop max resolution. - * @scale_min: scale min resolution. - * @scale_max: scale max resolution. - */ -struct drm_rockchip_ipp_prop_list { - __u32 version; - __u32 ipp_id; - __u32 count; - __u32 writeback; - __u32 flip; - __u32 degree; - __u32 csc; - __u32 crop; - __u32 scale; - __u32 refresh_min; - __u32 refresh_max; - __u32 reserved; - struct drm_rockchip_sz crop_min; - struct drm_rockchip_sz crop_max; - struct drm_rockchip_sz scale_min; - struct drm_rockchip_sz scale_max; -}; - -/** - * A structure for ipp config. - * - * @ops_id: property of operation directions. - * @flip: property of mirror, flip. - * @degree: property of rotation degree. - * @fmt: property of image format. - * @sz: property of image size. - * @pos: property of image position(src-cropped,dst-scaler). - */ -struct drm_rockchip_ipp_config { - enum drm_rockchip_ops_id ops_id; - enum drm_rockchip_flip flip; - enum drm_rockchip_degree degree; - __u32 fmt; - struct drm_rockchip_sz sz; - struct drm_rockchip_pos pos; -}; - -enum drm_rockchip_ipp_cmd { - IPP_CMD_NONE, - IPP_CMD_M2M, - IPP_CMD_WB, - IPP_CMD_OUTPUT, - IPP_CMD_MAX, -}; - -/** - * A structure for ipp property. - * - * @config: source, destination config. - * @cmd: definition of command. - * @ipp_id: id of ipp driver. - * @prop_id: id of property. - * @refresh_rate: refresh rate. - */ -struct drm_rockchip_ipp_property { - struct drm_rockchip_ipp_config config[ROCKCHIP_DRM_OPS_MAX]; - enum drm_rockchip_ipp_cmd cmd; - __u32 ipp_id; - __u32 prop_id; - __u32 refresh_rate; -}; - -enum drm_rockchip_ipp_buf_type { - IPP_BUF_ENQUEUE, - IPP_BUF_DEQUEUE, -}; - -/** - * A structure for ipp buffer operations. - * - * @ops_id: operation directions. - * @buf_type: definition of buffer. - * @prop_id: id of property. - * @buf_id: id of buffer. - * @handle: Y, Cb, Cr each planar handle. - * @user_data: user data. - */ -struct drm_rockchip_ipp_queue_buf { - enum drm_rockchip_ops_id ops_id; - enum drm_rockchip_ipp_buf_type buf_type; - __u32 prop_id; - __u32 buf_id; - __u32 handle[ROCKCHIP_DRM_PLANAR_MAX]; - __u32 reserved; - __u64 user_data; -}; - -enum drm_rockchip_ipp_ctrl { - IPP_CTRL_PLAY, - IPP_CTRL_STOP, - IPP_CTRL_PAUSE, - IPP_CTRL_RESUME, - IPP_CTRL_MAX, -}; - -/** - * A structure for ipp start/stop operations. - * - * @prop_id: id of property. - * @ctrl: definition of control. - */ -struct drm_rockchip_ipp_cmd_ctrl { - __u32 prop_id; - enum drm_rockchip_ipp_ctrl ctrl; -}; - -#define DRM_ROCKCHIP_GEM_CREATE 0x00 -#define DRM_ROCKCHIP_GEM_MAP_OFFSET 0x01 -#define DRM_ROCKCHIP_GEM_MMAP 0x02 -/* Reserved 0x03 ~ 0x05 for exynos specific gem ioctl */ -#define DRM_ROCKCHIP_GEM_GET 0x04 -#define DRM_ROCKCHIP_VIDI_CONNECTION 0x07 - -/* G2D */ -#define DRM_ROCKCHIP_G2D_GET_VER 0x20 -#define DRM_ROCKCHIP_G2D_SET_CMDLIST 0x21 -#define DRM_ROCKCHIP_G2D_EXEC 0x22 - -/* IPP - Image Post Processing */ -#define DRM_ROCKCHIP_IPP_GET_PROPERTY 0x30 -#define DRM_ROCKCHIP_IPP_SET_PROPERTY 0x31 -#define DRM_ROCKCHIP_IPP_QUEUE_BUF 0x32 -#define DRM_ROCKCHIP_IPP_CMD_CTRL 0x33 - -#define DRM_IOCTL_ROCKCHIP_GEM_CREATE DRM_IOWR(DRM_COMMAND_BASE + \ - DRM_ROCKCHIP_GEM_CREATE, struct drm_rockchip_gem_create) - -#define DRM_IOCTL_ROCKCHIP_GEM_MAP_OFFSET DRM_IOWR(DRM_COMMAND_BASE + \ - DRM_ROCKCHIP_GEM_MAP_OFFSET, struct drm_rockchip_gem_map_off) - -#define DRM_IOCTL_ROCKCHIP_GEM_MMAP DRM_IOWR(DRM_COMMAND_BASE + \ - DRM_ROCKCHIP_GEM_MMAP, struct drm_rockchip_gem_mmap) - -#define DRM_IOCTL_ROCKCHIP_GEM_GET DRM_IOWR(DRM_COMMAND_BASE + \ - DRM_ROCKCHIP_GEM_GET, struct drm_rockchip_gem_info) - -#define DRM_IOCTL_ROCKCHIP_VIDI_CONNECTION DRM_IOWR(DRM_COMMAND_BASE + \ - DRM_ROCKCHIP_VIDI_CONNECTION, struct drm_rockchip_vidi_connection) - -#define DRM_IOCTL_ROCKCHIP_G2D_GET_VER DRM_IOWR(DRM_COMMAND_BASE + \ - DRM_ROCKCHIP_G2D_GET_VER, struct drm_rockchip_g2d_get_ver) -#define DRM_IOCTL_ROCKCHIP_G2D_SET_CMDLIST DRM_IOWR(DRM_COMMAND_BASE + \ - DRM_ROCKCHIP_G2D_SET_CMDLIST, struct drm_rockchip_g2d_set_cmdlist) -#define DRM_IOCTL_ROCKCHIP_G2D_EXEC DRM_IOWR(DRM_COMMAND_BASE + \ - DRM_ROCKCHIP_G2D_EXEC, struct drm_rockchip_g2d_exec) - -#define DRM_IOCTL_ROCKCHIP_IPP_GET_PROPERTY DRM_IOWR(DRM_COMMAND_BASE + \ - DRM_ROCKCHIP_IPP_GET_PROPERTY, struct drm_rockchip_ipp_prop_list) -#define DRM_IOCTL_ROCKCHIP_IPP_SET_PROPERTY DRM_IOWR(DRM_COMMAND_BASE + \ - DRM_ROCKCHIP_IPP_SET_PROPERTY, struct drm_rockchip_ipp_property) -#define DRM_IOCTL_ROCKCHIP_IPP_QUEUE_BUF DRM_IOWR(DRM_COMMAND_BASE + \ - DRM_ROCKCHIP_IPP_QUEUE_BUF, struct drm_rockchip_ipp_queue_buf) -#define DRM_IOCTL_ROCKCHIP_IPP_CMD_CTRL DRM_IOWR(DRM_COMMAND_BASE + \ - DRM_ROCKCHIP_IPP_CMD_CTRL, struct drm_rockchip_ipp_cmd_ctrl) - -/* ROCKCHIP specific events */ -#define DRM_ROCKCHIP_G2D_EVENT 0x80000000 -#define DRM_ROCKCHIP_IPP_EVENT 0x80000001 - -struct drm_rockchip_g2d_event { - struct drm_event base; - __u64 user_data; - __u32 tv_sec; - __u32 tv_usec; - __u32 cmdlist_no; - __u32 reserved; -}; - -struct drm_rockchip_ipp_event { - struct drm_event base; - __u64 user_data; - __u32 tv_sec; - __u32 tv_usec; - __u32 prop_id; - __u32 reserved; - __u32 buf_id[ROCKCHIP_DRM_OPS_MAX]; -}; - -#endif /* _UAPI_ROCKCHIP_DRM_H_ */ -- 2.34.1