diff options
Diffstat (limited to 'drivers/video/omap2/dss/dss_features.c')
-rw-r--r-- | drivers/video/omap2/dss/dss_features.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/drivers/video/omap2/dss/dss_features.c b/drivers/video/omap2/dss/dss_features.c index 3e8287c8709d..18688c12e30d 100644 --- a/drivers/video/omap2/dss/dss_features.c +++ b/drivers/video/omap2/dss/dss_features.c | |||
@@ -18,6 +18,7 @@ | |||
18 | */ | 18 | */ |
19 | 19 | ||
20 | #include <linux/kernel.h> | 20 | #include <linux/kernel.h> |
21 | #include <linux/module.h> | ||
21 | #include <linux/types.h> | 22 | #include <linux/types.h> |
22 | #include <linux/err.h> | 23 | #include <linux/err.h> |
23 | #include <linux/slab.h> | 24 | #include <linux/slab.h> |
@@ -429,8 +430,6 @@ static const struct dss_param_range omap2_dss_param_range[] = { | |||
429 | * scaler cannot scale a image with width more than 768. | 430 | * scaler cannot scale a image with width more than 768. |
430 | */ | 431 | */ |
431 | [FEAT_PARAM_LINEWIDTH] = { 1, 768 }, | 432 | [FEAT_PARAM_LINEWIDTH] = { 1, 768 }, |
432 | [FEAT_PARAM_MGR_WIDTH] = { 1, 2048 }, | ||
433 | [FEAT_PARAM_MGR_HEIGHT] = { 1, 2048 }, | ||
434 | }; | 433 | }; |
435 | 434 | ||
436 | static const struct dss_param_range omap3_dss_param_range[] = { | 435 | static const struct dss_param_range omap3_dss_param_range[] = { |
@@ -445,8 +444,6 @@ static const struct dss_param_range omap3_dss_param_range[] = { | |||
445 | [FEAT_PARAM_DSI_FCK] = { 0, 173000000 }, | 444 | [FEAT_PARAM_DSI_FCK] = { 0, 173000000 }, |
446 | [FEAT_PARAM_DOWNSCALE] = { 1, 4 }, | 445 | [FEAT_PARAM_DOWNSCALE] = { 1, 4 }, |
447 | [FEAT_PARAM_LINEWIDTH] = { 1, 1024 }, | 446 | [FEAT_PARAM_LINEWIDTH] = { 1, 1024 }, |
448 | [FEAT_PARAM_MGR_WIDTH] = { 1, 2048 }, | ||
449 | [FEAT_PARAM_MGR_HEIGHT] = { 1, 2048 }, | ||
450 | }; | 447 | }; |
451 | 448 | ||
452 | static const struct dss_param_range omap4_dss_param_range[] = { | 449 | static const struct dss_param_range omap4_dss_param_range[] = { |
@@ -461,8 +458,6 @@ static const struct dss_param_range omap4_dss_param_range[] = { | |||
461 | [FEAT_PARAM_DSI_FCK] = { 0, 170000000 }, | 458 | [FEAT_PARAM_DSI_FCK] = { 0, 170000000 }, |
462 | [FEAT_PARAM_DOWNSCALE] = { 1, 4 }, | 459 | [FEAT_PARAM_DOWNSCALE] = { 1, 4 }, |
463 | [FEAT_PARAM_LINEWIDTH] = { 1, 2048 }, | 460 | [FEAT_PARAM_LINEWIDTH] = { 1, 2048 }, |
464 | [FEAT_PARAM_MGR_WIDTH] = { 1, 2048 }, | ||
465 | [FEAT_PARAM_MGR_HEIGHT] = { 1, 2048 }, | ||
466 | }; | 461 | }; |
467 | 462 | ||
468 | static const struct dss_param_range omap5_dss_param_range[] = { | 463 | static const struct dss_param_range omap5_dss_param_range[] = { |
@@ -477,8 +472,6 @@ static const struct dss_param_range omap5_dss_param_range[] = { | |||
477 | [FEAT_PARAM_DSI_FCK] = { 0, 170000000 }, | 472 | [FEAT_PARAM_DSI_FCK] = { 0, 170000000 }, |
478 | [FEAT_PARAM_DOWNSCALE] = { 1, 4 }, | 473 | [FEAT_PARAM_DOWNSCALE] = { 1, 4 }, |
479 | [FEAT_PARAM_LINEWIDTH] = { 1, 2048 }, | 474 | [FEAT_PARAM_LINEWIDTH] = { 1, 2048 }, |
480 | [FEAT_PARAM_MGR_WIDTH] = { 1, 2048 }, | ||
481 | [FEAT_PARAM_MGR_HEIGHT] = { 1, 2048 }, | ||
482 | }; | 475 | }; |
483 | 476 | ||
484 | static const enum dss_feat_id omap2_dss_feat_list[] = { | 477 | static const enum dss_feat_id omap2_dss_feat_list[] = { |
@@ -820,6 +813,7 @@ static const struct ti_hdmi_ip_ops omap4_hdmi_functions = { | |||
820 | .audio_start = ti_hdmi_4xxx_audio_start, | 813 | .audio_start = ti_hdmi_4xxx_audio_start, |
821 | .audio_stop = ti_hdmi_4xxx_audio_stop, | 814 | .audio_stop = ti_hdmi_4xxx_audio_stop, |
822 | .audio_config = ti_hdmi_4xxx_audio_config, | 815 | .audio_config = ti_hdmi_4xxx_audio_config, |
816 | .audio_get_dma_port = ti_hdmi_4xxx_audio_get_dma_port, | ||
823 | #endif | 817 | #endif |
824 | 818 | ||
825 | }; | 819 | }; |
@@ -846,11 +840,13 @@ int dss_feat_get_num_mgrs(void) | |||
846 | { | 840 | { |
847 | return omap_current_dss_features->num_mgrs; | 841 | return omap_current_dss_features->num_mgrs; |
848 | } | 842 | } |
843 | EXPORT_SYMBOL(dss_feat_get_num_mgrs); | ||
849 | 844 | ||
850 | int dss_feat_get_num_ovls(void) | 845 | int dss_feat_get_num_ovls(void) |
851 | { | 846 | { |
852 | return omap_current_dss_features->num_ovls; | 847 | return omap_current_dss_features->num_ovls; |
853 | } | 848 | } |
849 | EXPORT_SYMBOL(dss_feat_get_num_ovls); | ||
854 | 850 | ||
855 | int dss_feat_get_num_wbs(void) | 851 | int dss_feat_get_num_wbs(void) |
856 | { | 852 | { |
@@ -871,16 +867,19 @@ enum omap_display_type dss_feat_get_supported_displays(enum omap_channel channel | |||
871 | { | 867 | { |
872 | return omap_current_dss_features->supported_displays[channel]; | 868 | return omap_current_dss_features->supported_displays[channel]; |
873 | } | 869 | } |
870 | EXPORT_SYMBOL(dss_feat_get_supported_displays); | ||
874 | 871 | ||
875 | enum omap_dss_output_id dss_feat_get_supported_outputs(enum omap_channel channel) | 872 | enum omap_dss_output_id dss_feat_get_supported_outputs(enum omap_channel channel) |
876 | { | 873 | { |
877 | return omap_current_dss_features->supported_outputs[channel]; | 874 | return omap_current_dss_features->supported_outputs[channel]; |
878 | } | 875 | } |
876 | EXPORT_SYMBOL(dss_feat_get_supported_outputs); | ||
879 | 877 | ||
880 | enum omap_color_mode dss_feat_get_supported_color_modes(enum omap_plane plane) | 878 | enum omap_color_mode dss_feat_get_supported_color_modes(enum omap_plane plane) |
881 | { | 879 | { |
882 | return omap_current_dss_features->supported_color_modes[plane]; | 880 | return omap_current_dss_features->supported_color_modes[plane]; |
883 | } | 881 | } |
882 | EXPORT_SYMBOL(dss_feat_get_supported_color_modes); | ||
884 | 883 | ||
885 | enum omap_overlay_caps dss_feat_get_overlay_caps(enum omap_plane plane) | 884 | enum omap_overlay_caps dss_feat_get_overlay_caps(enum omap_plane plane) |
886 | { | 885 | { |