From 24ab1df3665e52eda64508a2bf7c2cc688285ccc Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Sat, 5 Aug 2017 01:43:59 +0300 Subject: drm: omapdrm: dss: Use supported outputs instead of display types The dss driver uses the supported display types to check whether the DSS has SDI, VENC or HDMI outputs. We can instead use the supported outputs the provide the same information. This removes the last use of the supported display types, that we can then remove as well. Signed-off-by: Laurent Pinchart Signed-off-by: Tomi Valkeinen --- drivers/gpu/drm/omapdrm/dss/dss_features.h | 1 - 1 file changed, 1 deletion(-) (limited to 'drivers/gpu/drm/omapdrm/dss/dss_features.h') diff --git a/drivers/gpu/drm/omapdrm/dss/dss_features.h b/drivers/gpu/drm/omapdrm/dss/dss_features.h index c36436d27ff5..56936d972cd3 100644 --- a/drivers/gpu/drm/omapdrm/dss/dss_features.h +++ b/drivers/gpu/drm/omapdrm/dss/dss_features.h @@ -99,7 +99,6 @@ bool dss_has_feature(enum dss_feat_id id); void dss_feat_get_reg_field(enum dss_feat_reg_field id, u8 *start, u8 *end); void dss_features_init(enum omapdss_version version); -enum omap_display_type dss_feat_get_supported_displays(enum omap_channel channel); enum omap_dss_output_id dss_feat_get_supported_outputs(enum omap_channel channel); int dss_feat_get_num_mgrs(void); -- cgit v1.2.1 From 28550474747853d701173ead5722c2215112a84e Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Sat, 5 Aug 2017 01:44:03 +0300 Subject: drm: omapdrm: Move size unit features to dispc_features structure The buffer_size_unit and burst_size_unit are dispc features. Move them from the omap_dss_features structure to the dispc_features structure. Signed-off-by: Laurent Pinchart Signed-off-by: Tomi Valkeinen --- drivers/gpu/drm/omapdrm/dss/dss_features.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'drivers/gpu/drm/omapdrm/dss/dss_features.h') diff --git a/drivers/gpu/drm/omapdrm/dss/dss_features.h b/drivers/gpu/drm/omapdrm/dss/dss_features.h index 56936d972cd3..3fb56d68962b 100644 --- a/drivers/gpu/drm/omapdrm/dss/dss_features.h +++ b/drivers/gpu/drm/omapdrm/dss/dss_features.h @@ -92,9 +92,6 @@ enum omap_overlay_caps dss_feat_get_overlay_caps(enum omap_plane_id plane); bool dss_feat_color_mode_supported(enum omap_plane_id plane, u32 fourcc); -u32 dss_feat_get_buffer_size_unit(void); /* in bytes */ -u32 dss_feat_get_burst_size_unit(void); /* in bytes */ - bool dss_has_feature(enum dss_feat_id id); void dss_feat_get_reg_field(enum dss_feat_reg_field id, u8 *start, u8 *end); void dss_features_init(enum omapdss_version version); -- cgit v1.2.1 From 94f96ad7c7372dcba74d296de7251f8c6079a2e0 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Sat, 5 Aug 2017 01:44:04 +0300 Subject: drm: omapdrm: Move color modes feature to dispc_features structure The supported_color_modes is a dispc feature. Move it from the omap_dss_features structure to the dispc_features structure. Signed-off-by: Laurent Pinchart Signed-off-by: Tomi Valkeinen --- drivers/gpu/drm/omapdrm/dss/dss_features.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'drivers/gpu/drm/omapdrm/dss/dss_features.h') diff --git a/drivers/gpu/drm/omapdrm/dss/dss_features.h b/drivers/gpu/drm/omapdrm/dss/dss_features.h index 3fb56d68962b..06ddfc406b13 100644 --- a/drivers/gpu/drm/omapdrm/dss/dss_features.h +++ b/drivers/gpu/drm/omapdrm/dss/dss_features.h @@ -89,8 +89,6 @@ enum dss_range_param { unsigned long dss_feat_get_param_min(enum dss_range_param param); unsigned long dss_feat_get_param_max(enum dss_range_param param); enum omap_overlay_caps dss_feat_get_overlay_caps(enum omap_plane_id plane); -bool dss_feat_color_mode_supported(enum omap_plane_id plane, - u32 fourcc); bool dss_has_feature(enum dss_feat_id id); void dss_feat_get_reg_field(enum dss_feat_reg_field id, u8 *start, u8 *end); @@ -100,6 +98,5 @@ enum omap_dss_output_id dss_feat_get_supported_outputs(enum omap_channel channel int dss_feat_get_num_mgrs(void); int dss_feat_get_num_ovls(void); -const u32 *dss_feat_get_supported_color_modes(enum omap_plane_id plane); #endif -- cgit v1.2.1 From fcd4188894dab2f08d74174edd214d7a82521167 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Sat, 5 Aug 2017 01:44:05 +0300 Subject: drm: omapdrm: Move overlay caps features to dispc_features structure The overlay_caps is a dispc feature. Move it from the omap_dss_features structure to the dispc_features structure. Signed-off-by: Laurent Pinchart Signed-off-by: Tomi Valkeinen --- drivers/gpu/drm/omapdrm/dss/dss_features.h | 1 - 1 file changed, 1 deletion(-) (limited to 'drivers/gpu/drm/omapdrm/dss/dss_features.h') diff --git a/drivers/gpu/drm/omapdrm/dss/dss_features.h b/drivers/gpu/drm/omapdrm/dss/dss_features.h index 06ddfc406b13..8c2275d8f047 100644 --- a/drivers/gpu/drm/omapdrm/dss/dss_features.h +++ b/drivers/gpu/drm/omapdrm/dss/dss_features.h @@ -88,7 +88,6 @@ enum dss_range_param { /* DSS Feature Functions */ unsigned long dss_feat_get_param_min(enum dss_range_param param); unsigned long dss_feat_get_param_max(enum dss_range_param param); -enum omap_overlay_caps dss_feat_get_overlay_caps(enum omap_plane_id plane); bool dss_has_feature(enum dss_feat_id id); void dss_feat_get_reg_field(enum dss_feat_reg_field id, u8 *start, u8 *end); -- cgit v1.2.1 From acf591c6aa1ef27b80da36e9f707b0efe003a03f Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Sat, 5 Aug 2017 01:44:06 +0300 Subject: drm: omapdrm: Move num_ovls and num_mgrs to dispc_features structure The num_ovls and num_mgrs are dispc features. Move them from the omap_dss_features structure to the dispc_features structure. Signed-off-by: Laurent Pinchart Signed-off-by: Tomi Valkeinen --- drivers/gpu/drm/omapdrm/dss/dss_features.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'drivers/gpu/drm/omapdrm/dss/dss_features.h') diff --git a/drivers/gpu/drm/omapdrm/dss/dss_features.h b/drivers/gpu/drm/omapdrm/dss/dss_features.h index 8c2275d8f047..89a36d2b57a7 100644 --- a/drivers/gpu/drm/omapdrm/dss/dss_features.h +++ b/drivers/gpu/drm/omapdrm/dss/dss_features.h @@ -95,7 +95,4 @@ void dss_features_init(enum omapdss_version version); enum omap_dss_output_id dss_feat_get_supported_outputs(enum omap_channel channel); -int dss_feat_get_num_mgrs(void); -int dss_feat_get_num_ovls(void); - #endif -- cgit v1.2.1 From 6d85d4adb645e5474594c0dc5fafa36c173ecec1 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Sat, 5 Aug 2017 01:44:07 +0300 Subject: drm: omapdrm: Move DISPC_CLK_SWITCH reg feature to struct dss_features The register belongs to the DSS, move the feature to the dss_features structure. Signed-off-by: Laurent Pinchart Signed-off-by: Tomi Valkeinen --- drivers/gpu/drm/omapdrm/dss/dss_features.h | 1 - 1 file changed, 1 deletion(-) (limited to 'drivers/gpu/drm/omapdrm/dss/dss_features.h') diff --git a/drivers/gpu/drm/omapdrm/dss/dss_features.h b/drivers/gpu/drm/omapdrm/dss/dss_features.h index 89a36d2b57a7..e0e825db4b0a 100644 --- a/drivers/gpu/drm/omapdrm/dss/dss_features.h +++ b/drivers/gpu/drm/omapdrm/dss/dss_features.h @@ -73,7 +73,6 @@ enum dss_feat_reg_field { FEAT_REG_FIFOSIZE, FEAT_REG_HORIZONTALACCU, FEAT_REG_VERTICALACCU, - FEAT_REG_DISPC_CLK_SWITCH, }; enum dss_range_param { -- cgit v1.2.1 From 38dc07039c8bc4bf5f61a127143c2cfec2d7c36a Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Sat, 5 Aug 2017 01:44:08 +0300 Subject: drm: omapdrm: Move reg_fields to dispc_features structure The reg_fields feature describes DISPC registers only. Move it from the omap_dss_features structure to the dispc_features structure. Signed-off-by: Laurent Pinchart Signed-off-by: Tomi Valkeinen --- drivers/gpu/drm/omapdrm/dss/dss_features.h | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'drivers/gpu/drm/omapdrm/dss/dss_features.h') diff --git a/drivers/gpu/drm/omapdrm/dss/dss_features.h b/drivers/gpu/drm/omapdrm/dss/dss_features.h index e0e825db4b0a..24c57c55e785 100644 --- a/drivers/gpu/drm/omapdrm/dss/dss_features.h +++ b/drivers/gpu/drm/omapdrm/dss/dss_features.h @@ -64,17 +64,6 @@ enum dss_feat_id { FEAT_MFLAG, }; -/* DSS register field id */ -enum dss_feat_reg_field { - FEAT_REG_FIRHINC, - FEAT_REG_FIRVINC, - FEAT_REG_FIFOHIGHTHRESHOLD, - FEAT_REG_FIFOLOWTHRESHOLD, - FEAT_REG_FIFOSIZE, - FEAT_REG_HORIZONTALACCU, - FEAT_REG_VERTICALACCU, -}; - enum dss_range_param { FEAT_PARAM_DSS_FCK, FEAT_PARAM_DSS_PCD, @@ -89,7 +78,6 @@ unsigned long dss_feat_get_param_min(enum dss_range_param param); unsigned long dss_feat_get_param_max(enum dss_range_param param); bool dss_has_feature(enum dss_feat_id id); -void dss_feat_get_reg_field(enum dss_feat_reg_field id, u8 *start, u8 *end); void dss_features_init(enum omapdss_version version); enum omap_dss_output_id dss_feat_get_supported_outputs(enum omap_channel channel); -- cgit v1.2.1 From 34dfb85f03957f5f396058e2f3c15686e77c28ba Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Sat, 5 Aug 2017 01:44:09 +0300 Subject: drm: omapdrm: Move FEAT_VENC_REQUIRES_TV_DAC_CLK to venc driver The FEAT_VENC_REQUIRES_TV_DAC_CLK is specific to the VENC, move it from the omap_dss_features structure to the venc driver. Signed-off-by: Laurent Pinchart Signed-off-by: Tomi Valkeinen --- drivers/gpu/drm/omapdrm/dss/dss_features.h | 1 - 1 file changed, 1 deletion(-) (limited to 'drivers/gpu/drm/omapdrm/dss/dss_features.h') diff --git a/drivers/gpu/drm/omapdrm/dss/dss_features.h b/drivers/gpu/drm/omapdrm/dss/dss_features.h index 24c57c55e785..f296bc77f220 100644 --- a/drivers/gpu/drm/omapdrm/dss/dss_features.h +++ b/drivers/gpu/drm/omapdrm/dss/dss_features.h @@ -50,7 +50,6 @@ enum dss_feat_id { FEAT_HDMI_AUDIO_USE_MCLK, FEAT_HANDLE_UV_SEPARATE, FEAT_ATTR2, - FEAT_VENC_REQUIRES_TV_DAC_CLK, FEAT_CPR, FEAT_PRELOAD, FEAT_FIR_COEF_V, -- cgit v1.2.1 From 44d8ca10789759f73bee50e7bb1695e7b8b8d22f Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Sat, 5 Aug 2017 01:44:10 +0300 Subject: drm: omapdrm: Move FEAT_DSI_* features to dsi driver The FEAT_DSI_* features are specific to the DSI, move them from the omap_dss_features structure to the dsi driver. Signed-off-by: Laurent Pinchart Signed-off-by: Tomi Valkeinen --- drivers/gpu/drm/omapdrm/dss/dss_features.h | 7 ------- 1 file changed, 7 deletions(-) (limited to 'drivers/gpu/drm/omapdrm/dss/dss_features.h') diff --git a/drivers/gpu/drm/omapdrm/dss/dss_features.h b/drivers/gpu/drm/omapdrm/dss/dss_features.h index f296bc77f220..61c419ac0517 100644 --- a/drivers/gpu/drm/omapdrm/dss/dss_features.h +++ b/drivers/gpu/drm/omapdrm/dss/dss_features.h @@ -39,12 +39,6 @@ enum dss_feat_id { /* Independent core clk divider */ FEAT_CORE_CLK_DIV, FEAT_LCD_CLK_SRC, - /* DSI-PLL power command 0x3 is not working */ - FEAT_DSI_PLL_PWR_BUG, - FEAT_DSI_DCS_CMD_CONFIG_VC, - FEAT_DSI_VC_OCP_WIDTH, - FEAT_DSI_REVERSE_TXCLKESC, - FEAT_DSI_GNQ, FEAT_DPI_USES_VDDS_DSI, FEAT_HDMI_CTS_SWMODE, FEAT_HDMI_AUDIO_USE_MCLK, @@ -59,7 +53,6 @@ enum dss_feat_id { /* An unknown HW bug causing the normal FIFO thresholds not to work */ FEAT_OMAP3_DSI_FIFO_BUG, FEAT_BURST_2D, - FEAT_DSI_PHY_DCC, FEAT_MFLAG, }; -- cgit v1.2.1 From 2c9fc9bf45f854c3bad88ffaf9c1d0fc75d02440 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Sat, 5 Aug 2017 01:44:11 +0300 Subject: drm: omapdrm: Move FEAT_HDMI_* features to hdmi4 driver The FEAT_HDMI_* features are specific to the HDMI4, move them from the omap_dss_features structure to the hdmi4 driver. Signed-off-by: Laurent Pinchart Signed-off-by: Tomi Valkeinen --- drivers/gpu/drm/omapdrm/dss/dss_features.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'drivers/gpu/drm/omapdrm/dss/dss_features.h') diff --git a/drivers/gpu/drm/omapdrm/dss/dss_features.h b/drivers/gpu/drm/omapdrm/dss/dss_features.h index 61c419ac0517..f5320c392077 100644 --- a/drivers/gpu/drm/omapdrm/dss/dss_features.h +++ b/drivers/gpu/drm/omapdrm/dss/dss_features.h @@ -40,8 +40,6 @@ enum dss_feat_id { FEAT_CORE_CLK_DIV, FEAT_LCD_CLK_SRC, FEAT_DPI_USES_VDDS_DSI, - FEAT_HDMI_CTS_SWMODE, - FEAT_HDMI_AUDIO_USE_MCLK, FEAT_HANDLE_UV_SEPARATE, FEAT_ATTR2, FEAT_CPR, -- cgit v1.2.1 From d178e034d5653edfbd16d0c71eeeed467e33c96f Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Sat, 5 Aug 2017 01:44:12 +0300 Subject: drm: omapdrm: Move FEAT_DPI_USES_VDDS_DSI feature to dpi code The FEAT_DPI_USES_VDDS_DSI feature is specific to the DPI, move it from the omap_dss_features structure to the dpi code. Signed-off-by: Laurent Pinchart Signed-off-by: Tomi Valkeinen --- drivers/gpu/drm/omapdrm/dss/dss_features.h | 1 - 1 file changed, 1 deletion(-) (limited to 'drivers/gpu/drm/omapdrm/dss/dss_features.h') diff --git a/drivers/gpu/drm/omapdrm/dss/dss_features.h b/drivers/gpu/drm/omapdrm/dss/dss_features.h index f5320c392077..5c6658782dda 100644 --- a/drivers/gpu/drm/omapdrm/dss/dss_features.h +++ b/drivers/gpu/drm/omapdrm/dss/dss_features.h @@ -39,7 +39,6 @@ enum dss_feat_id { /* Independent core clk divider */ FEAT_CORE_CLK_DIV, FEAT_LCD_CLK_SRC, - FEAT_DPI_USES_VDDS_DSI, FEAT_HANDLE_UV_SEPARATE, FEAT_ATTR2, FEAT_CPR, -- cgit v1.2.1 From 4569ab757f09b9b6a3dd4eda2b0b37c7f5535e6d Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Sat, 5 Aug 2017 01:44:13 +0300 Subject: drm: omapdrm: Move FEAT_LCD_CLK_SRC feature to dss_features structure The FEAT_LCD_CLK_SRC feature is specific to the DSS, move it from the omap_dss_features structure to the dss_features structure. Signed-off-by: Laurent Pinchart Signed-off-by: Tomi Valkeinen --- drivers/gpu/drm/omapdrm/dss/dss_features.h | 1 - 1 file changed, 1 deletion(-) (limited to 'drivers/gpu/drm/omapdrm/dss/dss_features.h') diff --git a/drivers/gpu/drm/omapdrm/dss/dss_features.h b/drivers/gpu/drm/omapdrm/dss/dss_features.h index 5c6658782dda..0f0bd092e80a 100644 --- a/drivers/gpu/drm/omapdrm/dss/dss_features.h +++ b/drivers/gpu/drm/omapdrm/dss/dss_features.h @@ -38,7 +38,6 @@ enum dss_feat_id { FEAT_RESIZECONF, /* Independent core clk divider */ FEAT_CORE_CLK_DIV, - FEAT_LCD_CLK_SRC, FEAT_HANDLE_UV_SEPARATE, FEAT_ATTR2, FEAT_CPR, -- cgit v1.2.1 From 1ac0c894032692d3cb25583e33ceaea78cc8ab4b Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Sat, 5 Aug 2017 01:44:14 +0300 Subject: drm: omapdrm: Move FEAT_* features to dispc driver All the remaining FEAT_* features are specific to the DISPC, move them from the omap_dss_features structure to the dispc driver. Signed-off-by: Laurent Pinchart Signed-off-by: Tomi Valkeinen --- drivers/gpu/drm/omapdrm/dss/dss_features.h | 28 ---------------------------- 1 file changed, 28 deletions(-) (limited to 'drivers/gpu/drm/omapdrm/dss/dss_features.h') diff --git a/drivers/gpu/drm/omapdrm/dss/dss_features.h b/drivers/gpu/drm/omapdrm/dss/dss_features.h index 0f0bd092e80a..6725735789d2 100644 --- a/drivers/gpu/drm/omapdrm/dss/dss_features.h +++ b/drivers/gpu/drm/omapdrm/dss/dss_features.h @@ -25,33 +25,6 @@ #define MAX_DSS_LCD_MANAGERS 3 #define MAX_NUM_DSI 2 -/* DSS has feature id */ -enum dss_feat_id { - FEAT_LCDENABLEPOL, - FEAT_LCDENABLESIGNAL, - FEAT_PCKFREEENABLE, - FEAT_FUNCGATED, - FEAT_MGR_LCD2, - FEAT_MGR_LCD3, - FEAT_LINEBUFFERSPLIT, - FEAT_ROWREPEATENABLE, - FEAT_RESIZECONF, - /* Independent core clk divider */ - FEAT_CORE_CLK_DIV, - FEAT_HANDLE_UV_SEPARATE, - FEAT_ATTR2, - FEAT_CPR, - FEAT_PRELOAD, - FEAT_FIR_COEF_V, - FEAT_ALPHA_FIXED_ZORDER, - FEAT_ALPHA_FREE_ZORDER, - FEAT_FIFO_MERGE, - /* An unknown HW bug causing the normal FIFO thresholds not to work */ - FEAT_OMAP3_DSI_FIFO_BUG, - FEAT_BURST_2D, - FEAT_MFLAG, -}; - enum dss_range_param { FEAT_PARAM_DSS_FCK, FEAT_PARAM_DSS_PCD, @@ -65,7 +38,6 @@ enum dss_range_param { unsigned long dss_feat_get_param_min(enum dss_range_param param); unsigned long dss_feat_get_param_max(enum dss_range_param param); -bool dss_has_feature(enum dss_feat_id id); void dss_features_init(enum omapdss_version version); enum omap_dss_output_id dss_feat_get_supported_outputs(enum omap_channel channel); -- cgit v1.2.1 From fe9964cb1ed04195cecf5c11fa44f484a7f00fc9 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Sat, 5 Aug 2017 01:44:15 +0300 Subject: drm: omapdrm: Move FEAT_PARAM_DSI* features to dsi driver The FEAT_PARAM_DSI* features are specific to the DSI, move them from the omap_dss_features structure to the dsi driver. Signed-off-by: Laurent Pinchart Signed-off-by: Tomi Valkeinen --- drivers/gpu/drm/omapdrm/dss/dss_features.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'drivers/gpu/drm/omapdrm/dss/dss_features.h') diff --git a/drivers/gpu/drm/omapdrm/dss/dss_features.h b/drivers/gpu/drm/omapdrm/dss/dss_features.h index 6725735789d2..289c5dc1ef09 100644 --- a/drivers/gpu/drm/omapdrm/dss/dss_features.h +++ b/drivers/gpu/drm/omapdrm/dss/dss_features.h @@ -28,8 +28,6 @@ enum dss_range_param { FEAT_PARAM_DSS_FCK, FEAT_PARAM_DSS_PCD, - FEAT_PARAM_DSIPLL_LPDIV, - FEAT_PARAM_DSI_FCK, FEAT_PARAM_DOWNSCALE, FEAT_PARAM_LINEWIDTH, }; -- cgit v1.2.1 From c4ff6ea60eb13953df58d786ffadce47e0c90ceb Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Sat, 5 Aug 2017 01:44:16 +0300 Subject: drm: omapdrm: Move PCD, LINEWIDTH and DOWNSCALE features to dispc driver The FEAT_PARAM_DSS_PCD, FEAT_PARAM_LINEWIDTH and FEAT_PARAM_DOWNSCALE features are specific to the DISPC, move them from the omap_dss_features structure to the dispc driver. Signed-off-by: Laurent Pinchart Signed-off-by: Tomi Valkeinen --- drivers/gpu/drm/omapdrm/dss/dss_features.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'drivers/gpu/drm/omapdrm/dss/dss_features.h') diff --git a/drivers/gpu/drm/omapdrm/dss/dss_features.h b/drivers/gpu/drm/omapdrm/dss/dss_features.h index 289c5dc1ef09..b1179fb25866 100644 --- a/drivers/gpu/drm/omapdrm/dss/dss_features.h +++ b/drivers/gpu/drm/omapdrm/dss/dss_features.h @@ -27,9 +27,6 @@ enum dss_range_param { FEAT_PARAM_DSS_FCK, - FEAT_PARAM_DSS_PCD, - FEAT_PARAM_DOWNSCALE, - FEAT_PARAM_LINEWIDTH, }; /* DSS Feature Functions */ -- cgit v1.2.1 From 9f0fbaea5cd6b6a0a75a53f99e5c6b3049dd0ce1 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Sat, 5 Aug 2017 01:44:17 +0300 Subject: drm: omapdrm: Move DSS_FCK feature to dss driver The FEAT_PARAM_DSS_FCK feature is specific to the DSS, move it from the omap_dss_features structure to the dss driver. Signed-off-by: Laurent Pinchart Signed-off-by: Tomi Valkeinen --- drivers/gpu/drm/omapdrm/dss/dss_features.h | 8 -------- 1 file changed, 8 deletions(-) (limited to 'drivers/gpu/drm/omapdrm/dss/dss_features.h') diff --git a/drivers/gpu/drm/omapdrm/dss/dss_features.h b/drivers/gpu/drm/omapdrm/dss/dss_features.h index b1179fb25866..c43d49d00c3f 100644 --- a/drivers/gpu/drm/omapdrm/dss/dss_features.h +++ b/drivers/gpu/drm/omapdrm/dss/dss_features.h @@ -25,14 +25,6 @@ #define MAX_DSS_LCD_MANAGERS 3 #define MAX_NUM_DSI 2 -enum dss_range_param { - FEAT_PARAM_DSS_FCK, -}; - -/* DSS Feature Functions */ -unsigned long dss_feat_get_param_min(enum dss_range_param param); -unsigned long dss_feat_get_param_max(enum dss_range_param param); - void dss_features_init(enum omapdss_version version); enum omap_dss_output_id dss_feat_get_supported_outputs(enum omap_channel channel); -- cgit v1.2.1 From 51919572c89a0c5dcf0cfff4ba4b36e175f091c7 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Sat, 5 Aug 2017 01:44:18 +0300 Subject: drm: omapdrm: Move supported outputs feature to dss driver The supported outputs feature is specific to the DSS, move it from the omap_dss_features structure to the dss driver. The omap_dss_features structure is now empty and can be removed. Signed-off-by: Laurent Pinchart Signed-off-by: Tomi Valkeinen --- drivers/gpu/drm/omapdrm/dss/dss_features.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'drivers/gpu/drm/omapdrm/dss/dss_features.h') diff --git a/drivers/gpu/drm/omapdrm/dss/dss_features.h b/drivers/gpu/drm/omapdrm/dss/dss_features.h index c43d49d00c3f..058c30269764 100644 --- a/drivers/gpu/drm/omapdrm/dss/dss_features.h +++ b/drivers/gpu/drm/omapdrm/dss/dss_features.h @@ -25,8 +25,4 @@ #define MAX_DSS_LCD_MANAGERS 3 #define MAX_NUM_DSI 2 -void dss_features_init(enum omapdss_version version); - -enum omap_dss_output_id dss_feat_get_supported_outputs(enum omap_channel channel); - #endif -- cgit v1.2.1 From d874b3a7c44ca48c0e57b8744c1eed2a6d299ba1 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Sat, 5 Aug 2017 01:44:19 +0300 Subject: drm: omapdrm: Remove dss_features.h The header file only contains four macros, two of which are never used. Move the other two to dss.h and remove dss_features.h. Signed-off-by: Laurent Pinchart Signed-off-by: Tomi Valkeinen --- drivers/gpu/drm/omapdrm/dss/dss_features.h | 28 ---------------------------- 1 file changed, 28 deletions(-) delete mode 100644 drivers/gpu/drm/omapdrm/dss/dss_features.h (limited to 'drivers/gpu/drm/omapdrm/dss/dss_features.h') diff --git a/drivers/gpu/drm/omapdrm/dss/dss_features.h b/drivers/gpu/drm/omapdrm/dss/dss_features.h deleted file mode 100644 index 058c30269764..000000000000 --- a/drivers/gpu/drm/omapdrm/dss/dss_features.h +++ /dev/null @@ -1,28 +0,0 @@ -/* - * linux/drivers/video/omap2/dss/dss_features.h - * - * Copyright (C) 2010 Texas Instruments - * Author: Archit Taneja - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 as published by - * the Free Software Foundation. - * - * 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. - * - * You should have received a copy of the GNU General Public License along with - * this program. If not, see . - */ - -#ifndef __OMAP2_DSS_FEATURES_H -#define __OMAP2_DSS_FEATURES_H - -#define MAX_DSS_MANAGERS 4 -#define MAX_DSS_OVERLAYS 4 -#define MAX_DSS_LCD_MANAGERS 3 -#define MAX_NUM_DSI 2 - -#endif -- cgit v1.2.1