Merge tag 'exynos-drm-next-for-v4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-next
Remove lagacy IPP driver - This driver isn't used anymore so remove it. Marek is preparing new one which includes completely rewritten API so this driver will be replaced with the new version[1] later. And cleanups. [1] https://patches.linaro.org/cover/118386/ * tag 'exynos-drm-next-for-v4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos: drm/exynos: ipp: Remove Exynos DRM IPP subsystem drm/exynos/decon: Add include guard to the Exynos7 header drm/exynos/decon: Move headers from global to local place drm/exynos: decon5433: Remove unnecessary platform_get_resource() error check
This commit is contained in:
Dave Airlie
@@ -135,172 +135,6 @@ struct drm_exynos_g2d_exec {
|
||||
__u64 async;
|
||||
};
|
||||
|
||||
enum drm_exynos_ops_id {
|
||||
EXYNOS_DRM_OPS_SRC,
|
||||
EXYNOS_DRM_OPS_DST,
|
||||
EXYNOS_DRM_OPS_MAX,
|
||||
};
|
||||
|
||||
struct drm_exynos_sz {
|
||||
__u32 hsize;
|
||||
__u32 vsize;
|
||||
};
|
||||
|
||||
struct drm_exynos_pos {
|
||||
__u32 x;
|
||||
__u32 y;
|
||||
__u32 w;
|
||||
__u32 h;
|
||||
};
|
||||
|
||||
enum drm_exynos_flip {
|
||||
EXYNOS_DRM_FLIP_NONE = (0 << 0),
|
||||
EXYNOS_DRM_FLIP_VERTICAL = (1 << 0),
|
||||
EXYNOS_DRM_FLIP_HORIZONTAL = (1 << 1),
|
||||
EXYNOS_DRM_FLIP_BOTH = EXYNOS_DRM_FLIP_VERTICAL |
|
||||
EXYNOS_DRM_FLIP_HORIZONTAL,
|
||||
};
|
||||
|
||||
enum drm_exynos_degree {
|
||||
EXYNOS_DRM_DEGREE_0,
|
||||
EXYNOS_DRM_DEGREE_90,
|
||||
EXYNOS_DRM_DEGREE_180,
|
||||
EXYNOS_DRM_DEGREE_270,
|
||||
};
|
||||
|
||||
enum drm_exynos_planer {
|
||||
EXYNOS_DRM_PLANAR_Y,
|
||||
EXYNOS_DRM_PLANAR_CB,
|
||||
EXYNOS_DRM_PLANAR_CR,
|
||||
EXYNOS_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_exynos_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_exynos_sz crop_min;
|
||||
struct drm_exynos_sz crop_max;
|
||||
struct drm_exynos_sz scale_min;
|
||||
struct drm_exynos_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_exynos_ipp_config {
|
||||
__u32 ops_id;
|
||||
__u32 flip;
|
||||
__u32 degree;
|
||||
__u32 fmt;
|
||||
struct drm_exynos_sz sz;
|
||||
struct drm_exynos_pos pos;
|
||||
};
|
||||
|
||||
enum drm_exynos_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_exynos_ipp_property {
|
||||
struct drm_exynos_ipp_config config[EXYNOS_DRM_OPS_MAX];
|
||||
__u32 cmd;
|
||||
__u32 ipp_id;
|
||||
__u32 prop_id;
|
||||
__u32 refresh_rate;
|
||||
};
|
||||
|
||||
enum drm_exynos_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_exynos_ipp_queue_buf {
|
||||
__u32 ops_id;
|
||||
__u32 buf_type;
|
||||
__u32 prop_id;
|
||||
__u32 buf_id;
|
||||
__u32 handle[EXYNOS_DRM_PLANAR_MAX];
|
||||
__u32 reserved;
|
||||
__u64 user_data;
|
||||
};
|
||||
|
||||
enum drm_exynos_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_exynos_ipp_cmd_ctrl {
|
||||
__u32 prop_id;
|
||||
__u32 ctrl;
|
||||
};
|
||||
|
||||
#define DRM_EXYNOS_GEM_CREATE 0x00
|
||||
#define DRM_EXYNOS_GEM_MAP 0x01
|
||||
/* Reserved 0x03 ~ 0x05 for exynos specific gem ioctl */
|
||||
@@ -312,11 +146,7 @@ struct drm_exynos_ipp_cmd_ctrl {
|
||||
#define DRM_EXYNOS_G2D_SET_CMDLIST 0x21
|
||||
#define DRM_EXYNOS_G2D_EXEC 0x22
|
||||
|
||||
/* IPP - Image Post Processing */
|
||||
#define DRM_EXYNOS_IPP_GET_PROPERTY 0x30
|
||||
#define DRM_EXYNOS_IPP_SET_PROPERTY 0x31
|
||||
#define DRM_EXYNOS_IPP_QUEUE_BUF 0x32
|
||||
#define DRM_EXYNOS_IPP_CMD_CTRL 0x33
|
||||
/* Reserved 0x30 ~ 0x33 for obsolete Exynos IPP ioctls */
|
||||
|
||||
#define DRM_IOCTL_EXYNOS_GEM_CREATE DRM_IOWR(DRM_COMMAND_BASE + \
|
||||
DRM_EXYNOS_GEM_CREATE, struct drm_exynos_gem_create)
|
||||
@@ -335,18 +165,8 @@ struct drm_exynos_ipp_cmd_ctrl {
|
||||
#define DRM_IOCTL_EXYNOS_G2D_EXEC DRM_IOWR(DRM_COMMAND_BASE + \
|
||||
DRM_EXYNOS_G2D_EXEC, struct drm_exynos_g2d_exec)
|
||||
|
||||
#define DRM_IOCTL_EXYNOS_IPP_GET_PROPERTY DRM_IOWR(DRM_COMMAND_BASE + \
|
||||
DRM_EXYNOS_IPP_GET_PROPERTY, struct drm_exynos_ipp_prop_list)
|
||||
#define DRM_IOCTL_EXYNOS_IPP_SET_PROPERTY DRM_IOWR(DRM_COMMAND_BASE + \
|
||||
DRM_EXYNOS_IPP_SET_PROPERTY, struct drm_exynos_ipp_property)
|
||||
#define DRM_IOCTL_EXYNOS_IPP_QUEUE_BUF DRM_IOWR(DRM_COMMAND_BASE + \
|
||||
DRM_EXYNOS_IPP_QUEUE_BUF, struct drm_exynos_ipp_queue_buf)
|
||||
#define DRM_IOCTL_EXYNOS_IPP_CMD_CTRL DRM_IOWR(DRM_COMMAND_BASE + \
|
||||
DRM_EXYNOS_IPP_CMD_CTRL, struct drm_exynos_ipp_cmd_ctrl)
|
||||
|
||||
/* EXYNOS specific events */
|
||||
#define DRM_EXYNOS_G2D_EVENT 0x80000000
|
||||
#define DRM_EXYNOS_IPP_EVENT 0x80000001
|
||||
|
||||
struct drm_exynos_g2d_event {
|
||||
struct drm_event base;
|
||||
@@ -357,16 +177,6 @@ struct drm_exynos_g2d_event {
|
||||
__u32 reserved;
|
||||
};
|
||||
|
||||
struct drm_exynos_ipp_event {
|
||||
struct drm_event base;
|
||||
__u64 user_data;
|
||||
__u32 tv_sec;
|
||||
__u32 tv_usec;
|
||||
__u32 prop_id;
|
||||
__u32 reserved;
|
||||
__u32 buf_id[EXYNOS_DRM_OPS_MAX];
|
||||
};
|
||||
|
||||
#if defined(__cplusplus)
|
||||
}
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user