Add HDMI infoframe helpers
Subsystems (8)
v5 cover Add HDMI infoframe helpers
The first three patches are of a janitorial nature. The first removes the duplicate implementation of drm_mode_cea_vic(). The second patch moves the various mode tables from drm_edid_modes.h to drm_edid.c in order to localize them in one source file instead of potentially including the header file in multiple locations and duplicating the tables. The third patch fixes build issues due to some missing forward declarations
Patch 4 adds generic helpers to pack a structures that describe HDMI AVI, audio, vendor-specific or SPD infoframes into the binary format specified in the HDMI specification. The resulting binary buffer should be easily programmable into the HDMI controller.
Patch 5 provides a helper to fill an HDMI AVI infoframe with data from a struct drm_display_mode.
Patch 6 adds the DRM EDID helpers (including the new DRM HDMI helper from patch 5) to the DRM DocBook documentation.
Patch 7, 8 and 9 move the Tegra, Intel and Radeon drivers over to the new helpers. Patch 8 was contributed by Intel's Paulo Zanoni. I think Paulo wanted to spin a new version, so maybe the version included in this series shouldn't be applied as-is.
Thierry
Paulo Zanoni (1):
drm/i915: Use generic HDMI infoframe helpers
Thierry Reding (8):
drm: Remove duplicate drm_mode_cea_vic()
drm: Move mode tables to drm_edid.c
drm: Add some missing forward declarations
video: Add generic HDMI infoframe helpers
drm: Add HDMI infoframe helpers
drm: Add EDID helper documentation
drm/tegra: Use generic HDMI infoframe helpers
drm/radeon: Use generic HDMI infoframe helpers
Documentation/DocBook/drm.tmpl | 4 + drivers/gpu/drm/Kconfig | 1 + drivers/gpu/drm/drm_edid.c | 798 +++++++++++++++++++++++++++++++- drivers/gpu/drm/drm_edid_modes.h | 774 ------------------------------- drivers/gpu/drm/i915/intel_dp.c | 2 +- drivers/gpu/drm/i915/intel_drv.h | 65 +-- drivers/gpu/drm/i915/intel_hdmi.c | 193 ++++---- drivers/gpu/drm/i915/intel_sdvo.c | 29 +- drivers/gpu/drm/radeon/evergreen_hdmi.c | 85 +--- drivers/gpu/drm/radeon/r600_hdmi.c | 134 ++---- drivers/gpu/drm/tegra/Kconfig | 1 + drivers/gpu/drm/tegra/hdmi.c | 226 +++++---- drivers/gpu/drm/tegra/hdmi.h | 189 -------- drivers/video/Kconfig | 3 + drivers/video/Makefile | 1 + drivers/video/hdmi.c | 308 ++++++++++++ include/drm/drm_crtc.h | 6 +- include/drm/drm_edid.h | 6 + include/linux/hdmi.h | 231 +++++++++ 19 files changed, 1622 insertions(+), 1434 deletions(-) delete mode 100644 drivers/gpu/drm/drm_edid_modes.h create mode 100644 drivers/video/hdmi.c create mode 100644 include/linux/hdmi.h
Signature · 1 line
1.8.1.2
PATCH v5 1/9 drm: Remove duplicate drm_mode_cea_vic()
The same function had already been merged with a different name. Remove the duplicate one but reuse some of its kerneldoc fragments for the existing implementation.
---
Changes in v4:
- replace drm_mode_cea_vic() usage in i915 HDMI code
Changes in v5:
- replace more drm_mode_cea_vic() uses in i915
drivers/gpu/drm/drm_edid.c | 30 +++++++----------------------- drivers/gpu/drm/i915/intel_dp.c | 2 +- drivers/gpu/drm/i915/intel_hdmi.c | 4 ++-- drivers/gpu/drm/i915/intel_sdvo.c | 2 +- include/drm/drm_crtc.h | 3 +-- 5 files changed, 12 insertions(+), 29 deletions(-)
drivers/gpu/drm/drm_edid.c +7 -23
@@ -1516,11 +1516,14 @@ u8 *drm_find_cea_extension(struct edid *edid) }EXPORT_SYMBOL (drm_find_cea_extension); -/* -* Looks for a CEA mode matching given drm_display_mode. -* Returns its CEA Video ID code, or 0 if not found. +/** +* drm_match_cea_mode - look for a CEA mode matching given mode +* @to_match: display mode +* +* Returns the CEA Video ID (VIC) of the mode or 0 if it isn't a CEA-861 +* mode. */ -u8 drm_match_cea_mode (struct drm_display_mode *to_match) +u8 drm_match_cea_mode (const struct drm_display_mode *to_match) {struct drm_display_mode *cea_mode;u8 mode;
@@ -2114,22 +2117,3 @@ int drm_add_modes_noedid(struct drm_connector *connector,return num_modes; }EXPORT_SYMBOL (drm_add_modes_noedid); - -/** -* drm_mode_cea_vic - return the CEA-861 VIC of a given mode -* @mode: mode -* -* RETURNS: -* The VIC number, 0 in case it's not a CEA-861 mode. -*/ -uint8_t drm_mode_cea_vic (const struct drm_display_mode *mode) -{ -uint8_t i; - -for (i =0 ; i < drm_num_cea_modes; i++) -if (drm_mode_equal (mode, &edid_cea_modes[i])) -return i +1 ; - -return 0 ; -} -EXPORT_SYMBOL (drm_mode_cea_vic);
drivers/gpu/drm/i915/intel_dp.c +1 -1
@@ -770,7 +770,7 @@ intel_dp_mode_fixup(struct drm_encoder *encoder,* CEA-861-E - 5.1 Default Encoding Parameters * VESA DisplayPort Ver.1.2a - 5.1.1.1 Video Colorimetry */ -if (bpp !=18 &&drm_mode_cea_vic (adjusted_mode) >1 ) +if (bpp !=18 &&drm_match_cea_mode (adjusted_mode) >1 ) intel_dp->color_range =DP_COLOR_RANGE_16_235 ;else intel_dp->color_range =0 ;
drivers/gpu/drm/i915/intel_hdmi.c +2 -2
@@ -348,7 +348,7 @@ static void intel_hdmi_set_avi_infoframe(struct drm_encoder *encoder, avi_if.body.avi.ITC_EC_Q_SC |=DIP_AVI_RGB_QUANT_RANGE_FULL ; } - avi_if.body.avi.VIC =drm_mode_cea_vic (adjusted_mode); + avi_if.body.avi.VIC =drm_match_cea_mode (adjusted_mode);intel_set_infoframe (encoder, &avi_if); }
@@ -781,7 +781,7 @@ bool intel_hdmi_mode_fixup(struct drm_encoder *encoder,if (intel_hdmi->color_range_auto) {/* See CEA-861-E - 5.1 Default Encoding Parameters */ if (intel_hdmi->has_hdmi_sink && -drm_mode_cea_vic (adjusted_mode) >1 ) +drm_match_cea_mode (adjusted_mode) >1 ) intel_hdmi->color_range =SDVO_COLOR_RANGE_16_235 ;else intel_hdmi->color_range =0 ;
drivers/gpu/drm/i915/intel_sdvo.c +1 -1
@@ -1077,7 +1077,7 @@ static bool intel_sdvo_mode_fixup(struct drm_encoder *encoder,if (intel_sdvo->color_range_auto) {/* See CEA-861-E - 5.1 Default Encoding Parameters */ if (intel_sdvo->has_hdmi_monitor && -drm_mode_cea_vic (adjusted_mode) >1 ) +drm_match_cea_mode (adjusted_mode) >1 ) intel_sdvo->color_range =SDVO_COLOR_RANGE_16_235 ;else intel_sdvo->color_range =0 ;
include/drm/drm_crtc.h +1 -2
@@ -1061,7 +1061,7 @@ extern int drm_mode_gamma_get_ioctl(struct drm_device *dev,extern int drm_mode_gamma_set_ioctl (struct drm_device *dev,void *data,struct drm_file *file_priv);extern u8 *drm_find_cea_extension (struct edid *edid); -extern u8 drm_match_cea_mode (struct drm_display_mode *to_match); +extern u8 drm_match_cea_mode (const struct drm_display_mode *to_match);extern bool drm_detect_hdmi_monitor (struct edid *edid);extern bool drm_detect_monitor_audio (struct edid *edid);extern bool drm_rgb_quant_range_selectable (struct edid *edid);
@@ -1079,7 +1079,6 @@ extern struct drm_display_mode *drm_gtf_mode_complex(struct drm_device *dev, int GTF_2C, int GTF_K, int GTF_2J);extern int drm_add_modes_noedid (struct drm_connector *connector,int hdisplay,int vdisplay); -extern uint8_t drm_mode_cea_vic (const struct drm_display_mode *mode);extern int drm_edid_header_is_valid (const u8 *raw_edid);extern bool drm_edid_block_valid (u8 *raw_edid,int block,bool print_bad_edid);
Signature · 1 line
1.8.1.2
PATCH v5 2/9 drm: Move mode tables to drm_edid.c
In reply to Thierry RedingThe modes are only used from within drm_edid.c so we move them there to avoid creating duplicates by multiple inclusion of drm_edid_modes.h. As a side-effect we can also get rid of a few variables that keep track of the number of entries in the tables and use ARRAY_SIZE() instead.
--- drivers/gpu/drm/drm_edid.c | 753 ++++++++++++++++++++++++++++++++++++- drivers/gpu/drm/drm_edid_modes.h | 774 --------------------------------------- 2 files changed, 746 insertions(+), 781 deletions(-) delete mode 100644 drivers/gpu/drm/drm_edid_modes.h
drivers/gpu/drm/drm_edid.c +746 -7
@@ -33,7 +33,6 @@#include <linux/module.h> #include <drm/drmP.h> #include <drm/drm_edid.h> -#include "drm_edid_modes.h" #define version_greater (edid, maj, min) \ (((edid)->version > (maj)) || \
@@ -127,6 +126,746 @@ static struct edid_quirk { { "VSC", 5020, EDID_QUIRK_FORCE_REDUCED_BLANKING }, }; +/* +* Autogenerated from the DMT spec. +* This table is copied from xfree86/modes/xf86EdidModes.c. +*/ +static const struct drm_display_mode drm_dmt_modes[] = { +/* 640x350@85Hz */ + {DRM_MODE ("640x350" ,DRM_MODE_TYPE_DRIVER ,31500 ,640 ,672 , +736 ,832 ,0 ,350 ,382 ,385 ,445 ,0 , +DRM_MODE_FLAG_PHSYNC |DRM_MODE_FLAG_NVSYNC ) }, +/* 640x400@85Hz */ + {DRM_MODE ("640x400" ,DRM_MODE_TYPE_DRIVER ,31500 ,640 ,672 , +736 ,832 ,0 ,400 ,401 ,404 ,445 ,0 , +DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_PVSYNC ) }, +/* 720x400@85Hz */ + {DRM_MODE ("720x400" ,DRM_MODE_TYPE_DRIVER ,35500 ,720 ,756 , +828 ,936 ,0 ,400 ,401 ,404 ,446 ,0 , +DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_PVSYNC ) }, +/* 640x480@60Hz */ + {DRM_MODE ("640x480" ,DRM_MODE_TYPE_DRIVER ,25175 ,640 ,656 , +752 ,800 ,0 ,480 ,489 ,492 ,525 ,0 , +DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_NVSYNC ) }, +/* 640x480@72Hz */ + {DRM_MODE ("640x480" ,DRM_MODE_TYPE_DRIVER ,31500 ,640 ,664 , +704 ,832 ,0 ,480 ,489 ,492 ,520 ,0 , +DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_NVSYNC ) }, +/* 640x480@75Hz */ + {DRM_MODE ("640x480" ,DRM_MODE_TYPE_DRIVER ,31500 ,640 ,656 , +720 ,840 ,0 ,480 ,481 ,484 ,500 ,0 , +DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_NVSYNC ) }, +/* 640x480@85Hz */ + {DRM_MODE ("640x480" ,DRM_MODE_TYPE_DRIVER ,36000 ,640 ,696 , +752 ,832 ,0 ,480 ,481 ,484 ,509 ,0 , +DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_NVSYNC ) }, +/* 800x600@56Hz */ + {DRM_MODE ("800x600" ,DRM_MODE_TYPE_DRIVER ,36000 ,800 ,824 , +896 ,1024 ,0 ,600 ,601 ,603 ,625 ,0 , +DRM_MODE_FLAG_PHSYNC |DRM_MODE_FLAG_PVSYNC ) }, +/* 800x600@60Hz */ + {DRM_MODE ("800x600" ,DRM_MODE_TYPE_DRIVER ,40000 ,800 ,840 , +968 ,1056 ,0 ,600 ,601 ,605 ,628 ,0 , +DRM_MODE_FLAG_PHSYNC |DRM_MODE_FLAG_PVSYNC ) }, +/* 800x600@72Hz */ + {DRM_MODE ("800x600" ,DRM_MODE_TYPE_DRIVER ,50000 ,800 ,856 , +976 ,1040 ,0 ,600 ,637 ,643 ,666 ,0 , +DRM_MODE_FLAG_PHSYNC |DRM_MODE_FLAG_PVSYNC ) }, +/* 800x600@75Hz */ + {DRM_MODE ("800x600" ,DRM_MODE_TYPE_DRIVER ,49500 ,800 ,816 , +896 ,1056 ,0 ,600 ,601 ,604 ,625 ,0 , +DRM_MODE_FLAG_PHSYNC |DRM_MODE_FLAG_PVSYNC ) }, +/* 800x600@85Hz */ + {DRM_MODE ("800x600" ,DRM_MODE_TYPE_DRIVER ,56250 ,800 ,832 , +896 ,1048 ,0 ,600 ,601 ,604 ,631 ,0 , +DRM_MODE_FLAG_PHSYNC |DRM_MODE_FLAG_PVSYNC ) }, +/* 800x600@120Hz RB */ + {DRM_MODE ("800x600" ,DRM_MODE_TYPE_DRIVER ,73250 ,800 ,848 , +880 ,960 ,0 ,600 ,603 ,607 ,636 ,0 , +DRM_MODE_FLAG_PHSYNC |DRM_MODE_FLAG_NVSYNC ) }, +/* 848x480@60Hz */ + {DRM_MODE ("848x480" ,DRM_MODE_TYPE_DRIVER ,33750 ,848 ,864 , +976 ,1088 ,0 ,480 ,486 ,494 ,517 ,0 , +DRM_MODE_FLAG_PHSYNC |DRM_MODE_FLAG_PVSYNC ) }, +/* 1024x768@43Hz, interlace */ + {DRM_MODE ("1024x768i" ,DRM_MODE_TYPE_DRIVER ,44900 ,1024 ,1032 , +1208 ,1264 ,0 ,768 ,768 ,772 ,817 ,0 , +DRM_MODE_FLAG_PHSYNC |DRM_MODE_FLAG_PVSYNC | +DRM_MODE_FLAG_INTERLACE ) }, +/* 1024x768@60Hz */ + {DRM_MODE ("1024x768" ,DRM_MODE_TYPE_DRIVER ,65000 ,1024 ,1048 , +1184 ,1344 ,0 ,768 ,771 ,777 ,806 ,0 , +DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_NVSYNC ) }, +/* 1024x768@70Hz */ + {DRM_MODE ("1024x768" ,DRM_MODE_TYPE_DRIVER ,75000 ,1024 ,1048 , +1184 ,1328 ,0 ,768 ,771 ,777 ,806 ,0 , +DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_NVSYNC ) }, +/* 1024x768@75Hz */ + {DRM_MODE ("1024x768" ,DRM_MODE_TYPE_DRIVER ,78750 ,1024 ,1040 , +1136 ,1312 ,0 ,768 ,769 ,772 ,800 ,0 , +DRM_MODE_FLAG_PHSYNC |DRM_MODE_FLAG_PVSYNC ) }, +/* 1024x768@85Hz */ + {DRM_MODE ("1024x768" ,DRM_MODE_TYPE_DRIVER ,94500 ,1024 ,1072 , +1168 ,1376 ,0 ,768 ,769 ,772 ,808 ,0 , +DRM_MODE_FLAG_PHSYNC |DRM_MODE_FLAG_PVSYNC ) }, +/* 1024x768@120Hz RB */ + {DRM_MODE ("1024x768" ,DRM_MODE_TYPE_DRIVER ,115500 ,1024 ,1072 , +1104 ,1184 ,0 ,768 ,771 ,775 ,813 ,0 , +DRM_MODE_FLAG_PHSYNC |DRM_MODE_FLAG_NVSYNC ) }, +/* 1152x864@75Hz */ + {DRM_MODE ("1152x864" ,DRM_MODE_TYPE_DRIVER ,108000 ,1152 ,1216 , +1344 ,1600 ,0 ,864 ,865 ,868 ,900 ,0 , +DRM_MODE_FLAG_PHSYNC |DRM_MODE_FLAG_PVSYNC ) }, +/* 1280x768@60Hz RB */ + {DRM_MODE ("1280x768" ,DRM_MODE_TYPE_DRIVER ,68250 ,1280 ,1328 , +1360 ,1440 ,0 ,768 ,771 ,778 ,790 ,0 , +DRM_MODE_FLAG_PHSYNC |DRM_MODE_FLAG_NVSYNC ) }, +/* 1280x768@60Hz */ + {DRM_MODE ("1280x768" ,DRM_MODE_TYPE_DRIVER ,79500 ,1280 ,1344 , +1472 ,1664 ,0 ,768 ,771 ,778 ,798 ,0 , +DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_PVSYNC ) }, +/* 1280x768@75Hz */ + {DRM_MODE ("1280x768" ,DRM_MODE_TYPE_DRIVER ,102250 ,1280 ,1360 , +1488 ,1696 ,0 ,768 ,771 ,778 ,805 ,0 , +DRM_MODE_FLAG_PHSYNC |DRM_MODE_FLAG_NVSYNC ) }, +/* 1280x768@85Hz */ + {DRM_MODE ("1280x768" ,DRM_MODE_TYPE_DRIVER ,117500 ,1280 ,1360 , +1496 ,1712 ,0 ,768 ,771 ,778 ,809 ,0 , +DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_PVSYNC ) }, +/* 1280x768@120Hz RB */ + {DRM_MODE ("1280x768" ,DRM_MODE_TYPE_DRIVER ,140250 ,1280 ,1328 , +1360 ,1440 ,0 ,768 ,771 ,778 ,813 ,0 , +DRM_MODE_FLAG_PHSYNC |DRM_MODE_FLAG_NVSYNC ) }, +/* 1280x800@60Hz RB */ + {DRM_MODE ("1280x800" ,DRM_MODE_TYPE_DRIVER ,71000 ,1280 ,1328 , +1360 ,1440 ,0 ,800 ,803 ,809 ,823 ,0 , +DRM_MODE_FLAG_PHSYNC |DRM_MODE_FLAG_NVSYNC ) }, +/* 1280x800@60Hz */ + {DRM_MODE ("1280x800" ,DRM_MODE_TYPE_DRIVER ,83500 ,1280 ,1352 , +1480 ,1680 ,0 ,800 ,803 ,809 ,831 ,0 , +DRM_MODE_FLAG_PHSYNC |DRM_MODE_FLAG_NVSYNC ) }, +/* 1280x800@75Hz */ + {DRM_MODE ("1280x800" ,DRM_MODE_TYPE_DRIVER ,106500 ,1280 ,1360 , +1488 ,1696 ,0 ,800 ,803 ,809 ,838 ,0 , +DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_PVSYNC ) }, +/* 1280x800@85Hz */ + {DRM_MODE ("1280x800" ,DRM_MODE_TYPE_DRIVER ,122500 ,1280 ,1360 , +1496 ,1712 ,0 ,800 ,803 ,809 ,843 ,0 , +DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_PVSYNC ) }, +/* 1280x800@120Hz RB */ + {DRM_MODE ("1280x800" ,DRM_MODE_TYPE_DRIVER ,146250 ,1280 ,1328 , +1360 ,1440 ,0 ,800 ,803 ,809 ,847 ,0 , +DRM_MODE_FLAG_PHSYNC |DRM_MODE_FLAG_NVSYNC ) }, +/* 1280x960@60Hz */ + {DRM_MODE ("1280x960" ,DRM_MODE_TYPE_DRIVER ,108000 ,1280 ,1376 , +1488 ,1800 ,0 ,960 ,961 ,964 ,1000 ,0 , +DRM_MODE_FLAG_PHSYNC |DRM_MODE_FLAG_PVSYNC ) }, +/* 1280x960@85Hz */ + {DRM_MODE ("1280x960" ,DRM_MODE_TYPE_DRIVER ,148500 ,1280 ,1344 , +1504 ,1728 ,0 ,960 ,961 ,964 ,1011 ,0 , +DRM_MODE_FLAG_PHSYNC |DRM_MODE_FLAG_PVSYNC ) }, +/* 1280x960@120Hz RB */ + {DRM_MODE ("1280x960" ,DRM_MODE_TYPE_DRIVER ,175500 ,1280 ,1328 , +1360 ,1440 ,0 ,960 ,963 ,967 ,1017 ,0 , +DRM_MODE_FLAG_PHSYNC |DRM_MODE_FLAG_NVSYNC ) }, +/* 1280x1024@60Hz */ + {DRM_MODE ("1280x1024" ,DRM_MODE_TYPE_DRIVER ,108000 ,1280 ,1328 , +1440 ,1688 ,0 ,1024 ,1025 ,1028 ,1066 ,0 , +DRM_MODE_FLAG_PHSYNC |DRM_MODE_FLAG_PVSYNC ) }, +/* 1280x1024@75Hz */ + {DRM_MODE ("1280x1024" ,DRM_MODE_TYPE_DRIVER ,135000 ,1280 ,1296 , +1440 ,1688 ,0 ,1024 ,1025 ,1028 ,1066 ,0 , +DRM_MODE_FLAG_PHSYNC |DRM_MODE_FLAG_PVSYNC ) }, +/* 1280x1024@85Hz */ + {DRM_MODE ("1280x1024" ,DRM_MODE_TYPE_DRIVER ,157500 ,1280 ,1344 , +1504 ,1728 ,0 ,1024 ,1025 ,1028 ,1072 ,0 , +DRM_MODE_FLAG_PHSYNC |DRM_MODE_FLAG_PVSYNC ) }, +/* 1280x1024@120Hz RB */ + {DRM_MODE ("1280x1024" ,DRM_MODE_TYPE_DRIVER ,187250 ,1280 ,1328 , +1360 ,1440 ,0 ,1024 ,1027 ,1034 ,1084 ,0 , +DRM_MODE_FLAG_PHSYNC |DRM_MODE_FLAG_NVSYNC ) }, +/* 1360x768@60Hz */ + {DRM_MODE ("1360x768" ,DRM_MODE_TYPE_DRIVER ,85500 ,1360 ,1424 , +1536 ,1792 ,0 ,768 ,771 ,777 ,795 ,0 , +DRM_MODE_FLAG_PHSYNC |DRM_MODE_FLAG_PVSYNC ) }, +/* 1360x768@120Hz RB */ + {DRM_MODE ("1360x768" ,DRM_MODE_TYPE_DRIVER ,148250 ,1360 ,1408 , +1440 ,1520 ,0 ,768 ,771 ,776 ,813 ,0 , +DRM_MODE_FLAG_PHSYNC |DRM_MODE_FLAG_NVSYNC ) }, +/* 1400x1050@60Hz RB */ + {DRM_MODE ("1400x1050" ,DRM_MODE_TYPE_DRIVER ,101000 ,1400 ,1448 , +1480 ,1560 ,0 ,1050 ,1053 ,1057 ,1080 ,0 , +DRM_MODE_FLAG_PHSYNC |DRM_MODE_FLAG_NVSYNC ) }, +/* 1400x1050@60Hz */ + {DRM_MODE ("1400x1050" ,DRM_MODE_TYPE_DRIVER ,121750 ,1400 ,1488 , +1632 ,1864 ,0 ,1050 ,1053 ,1057 ,1089 ,0 , +DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_PVSYNC ) }, +/* 1400x1050@75Hz */ + {DRM_MODE ("1400x1050" ,DRM_MODE_TYPE_DRIVER ,156000 ,1400 ,1504 , +1648 ,1896 ,0 ,1050 ,1053 ,1057 ,1099 ,0 , +DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_PVSYNC ) }, +/* 1400x1050@85Hz */ + {DRM_MODE ("1400x1050" ,DRM_MODE_TYPE_DRIVER ,179500 ,1400 ,1504 , +1656 ,1912 ,0 ,1050 ,1053 ,1057 ,1105 ,0 , +DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_PVSYNC ) }, +/* 1400x1050@120Hz RB */ + {DRM_MODE ("1400x1050" ,DRM_MODE_TYPE_DRIVER ,208000 ,1400 ,1448 , +1480 ,1560 ,0 ,1050 ,1053 ,1057 ,1112 ,0 , +DRM_MODE_FLAG_PHSYNC |DRM_MODE_FLAG_NVSYNC ) }, +/* 1440x900@60Hz RB */ + {DRM_MODE ("1440x900" ,DRM_MODE_TYPE_DRIVER ,88750 ,1440 ,1488 , +1520 ,1600 ,0 ,900 ,903 ,909 ,926 ,0 , +DRM_MODE_FLAG_PHSYNC |DRM_MODE_FLAG_NVSYNC ) }, +/* 1440x900@60Hz */ + {DRM_MODE ("1440x900" ,DRM_MODE_TYPE_DRIVER ,106500 ,1440 ,1520 , +1672 ,1904 ,0 ,900 ,903 ,909 ,934 ,0 , +DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_PVSYNC ) }, +/* 1440x900@75Hz */ + {DRM_MODE ("1440x900" ,DRM_MODE_TYPE_DRIVER ,136750 ,1440 ,1536 , +1688 ,1936 ,0 ,900 ,903 ,909 ,942 ,0 , +DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_PVSYNC ) }, +/* 1440x900@85Hz */ + {DRM_MODE ("1440x900" ,DRM_MODE_TYPE_DRIVER ,157000 ,1440 ,1544 , +1696 ,1952 ,0 ,900 ,903 ,909 ,948 ,0 , +DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_PVSYNC ) }, +/* 1440x900@120Hz RB */ + {DRM_MODE ("1440x900" ,DRM_MODE_TYPE_DRIVER ,182750 ,1440 ,1488 , +1520 ,1600 ,0 ,900 ,903 ,909 ,953 ,0 , +DRM_MODE_FLAG_PHSYNC |DRM_MODE_FLAG_NVSYNC ) }, +/* 1600x1200@60Hz */ + {DRM_MODE ("1600x1200" ,DRM_MODE_TYPE_DRIVER ,162000 ,1600 ,1664 , +1856 ,2160 ,0 ,1200 ,1201 ,1204 ,1250 ,0 , +DRM_MODE_FLAG_PHSYNC |DRM_MODE_FLAG_PVSYNC ) }, +/* 1600x1200@65Hz */ + {DRM_MODE ("1600x1200" ,DRM_MODE_TYPE_DRIVER ,175500 ,1600 ,1664 , +1856 ,2160 ,0 ,1200 ,1201 ,1204 ,1250 ,0 , +DRM_MODE_FLAG_PHSYNC |DRM_MODE_FLAG_PVSYNC ) }, +/* 1600x1200@70Hz */ + {DRM_MODE ("1600x1200" ,DRM_MODE_TYPE_DRIVER ,189000 ,1600 ,1664 , +1856 ,2160 ,0 ,1200 ,1201 ,1204 ,1250 ,0 , +DRM_MODE_FLAG_PHSYNC |DRM_MODE_FLAG_PVSYNC ) }, +/* 1600x1200@75Hz */ + {DRM_MODE ("1600x1200" ,DRM_MODE_TYPE_DRIVER ,202500 ,1600 ,1664 , +1856 ,2160 ,0 ,1200 ,1201 ,1204 ,1250 ,0 , +DRM_MODE_FLAG_PHSYNC |DRM_MODE_FLAG_PVSYNC ) }, +/* 1600x1200@85Hz */ + {DRM_MODE ("1600x1200" ,DRM_MODE_TYPE_DRIVER ,229500 ,1600 ,1664 , +1856 ,2160 ,0 ,1200 ,1201 ,1204 ,1250 ,0 , +DRM_MODE_FLAG_PHSYNC |DRM_MODE_FLAG_PVSYNC ) }, +/* 1600x1200@120Hz RB */ + {DRM_MODE ("1600x1200" ,DRM_MODE_TYPE_DRIVER ,268250 ,1600 ,1648 , +1680 ,1760 ,0 ,1200 ,1203 ,1207 ,1271 ,0 , +DRM_MODE_FLAG_PHSYNC |DRM_MODE_FLAG_NVSYNC ) }, +/* 1680x1050@60Hz RB */ + {DRM_MODE ("1680x1050" ,DRM_MODE_TYPE_DRIVER ,119000 ,1680 ,1728 , +1760 ,1840 ,0 ,1050 ,1053 ,1059 ,1080 ,0 , +DRM_MODE_FLAG_PHSYNC |DRM_MODE_FLAG_NVSYNC ) }, +/* 1680x1050@60Hz */ + {DRM_MODE ("1680x1050" ,DRM_MODE_TYPE_DRIVER ,146250 ,1680 ,1784 , +1960 ,2240 ,0 ,1050 ,1053 ,1059 ,1089 ,0 , +DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_PVSYNC ) }, +/* 1680x1050@75Hz */ + {DRM_MODE ("1680x1050" ,DRM_MODE_TYPE_DRIVER ,187000 ,1680 ,1800 , +1976 ,2272 ,0 ,1050 ,1053 ,1059 ,1099 ,0 , +DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_PVSYNC ) }, +/* 1680x1050@85Hz */ + {DRM_MODE ("1680x1050" ,DRM_MODE_TYPE_DRIVER ,214750 ,1680 ,1808 , +1984 ,2288 ,0 ,1050 ,1053 ,1059 ,1105 ,0 , +DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_PVSYNC ) }, +/* 1680x1050@120Hz RB */ + {DRM_MODE ("1680x1050" ,DRM_MODE_TYPE_DRIVER ,245500 ,1680 ,1728 , +1760 ,1840 ,0 ,1050 ,1053 ,1059 ,1112 ,0 , +DRM_MODE_FLAG_PHSYNC |DRM_MODE_FLAG_NVSYNC ) }, +/* 1792x1344@60Hz */ + {DRM_MODE ("1792x1344" ,DRM_MODE_TYPE_DRIVER ,204750 ,1792 ,1920 , +2120 ,2448 ,0 ,1344 ,1345 ,1348 ,1394 ,0 , +DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_PVSYNC ) }, +/* 1792x1344@75Hz */ + {DRM_MODE ("1792x1344" ,DRM_MODE_TYPE_DRIVER ,261000 ,1792 ,1888 , +2104 ,2456 ,0 ,1344 ,1345 ,1348 ,1417 ,0 , +DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_PVSYNC ) }, +/* 1792x1344@120Hz RB */ + {DRM_MODE ("1792x1344" ,DRM_MODE_TYPE_DRIVER ,333250 ,1792 ,1840 , +1872 ,1952 ,0 ,1344 ,1347 ,1351 ,1423 ,0 , +DRM_MODE_FLAG_PHSYNC |DRM_MODE_FLAG_NVSYNC ) }, +/* 1856x1392@60Hz */ + {DRM_MODE ("1856x1392" ,DRM_MODE_TYPE_DRIVER ,218250 ,1856 ,1952 , +2176 ,2528 ,0 ,1392 ,1393 ,1396 ,1439 ,0 , +DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_PVSYNC ) }, +/* 1856x1392@75Hz */ + {DRM_MODE ("1856x1392" ,DRM_MODE_TYPE_DRIVER ,288000 ,1856 ,1984 , +2208 ,2560 ,0 ,1392 ,1395 ,1399 ,1500 ,0 , +DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_PVSYNC ) }, +/* 1856x1392@120Hz RB */ + {DRM_MODE ("1856x1392" ,DRM_MODE_TYPE_DRIVER ,356500 ,1856 ,1904 , +1936 ,2016 ,0 ,1392 ,1395 ,1399 ,1474 ,0 , +DRM_MODE_FLAG_PHSYNC |DRM_MODE_FLAG_NVSYNC ) }, +/* 1920x1200@60Hz RB */ + {DRM_MODE ("1920x1200" ,DRM_MODE_TYPE_DRIVER ,154000 ,1920 ,1968 , +2000 ,2080 ,0 ,1200 ,1203 ,1209 ,1235 ,0 , +DRM_MODE_FLAG_PHSYNC |DRM_MODE_FLAG_NVSYNC ) }, +/* 1920x1200@60Hz */ + {DRM_MODE ("1920x1200" ,DRM_MODE_TYPE_DRIVER ,193250 ,1920 ,2056 , +2256 ,2592 ,0 ,1200 ,1203 ,1209 ,1245 ,0 , +DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_PVSYNC ) }, +/* 1920x1200@75Hz */ + {DRM_MODE ("1920x1200" ,DRM_MODE_TYPE_DRIVER ,245250 ,1920 ,2056 , +2264 ,2608 ,0 ,1200 ,1203 ,1209 ,1255 ,0 , +DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_PVSYNC ) }, +/* 1920x1200@85Hz */ + {DRM_MODE ("1920x1200" ,DRM_MODE_TYPE_DRIVER ,281250 ,1920 ,2064 , +2272 ,2624 ,0 ,1200 ,1203 ,1209 ,1262 ,0 , +DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_PVSYNC ) }, +/* 1920x1200@120Hz RB */ + {DRM_MODE ("1920x1200" ,DRM_MODE_TYPE_DRIVER ,317000 ,1920 ,1968 , +2000 ,2080 ,0 ,1200 ,1203 ,1209 ,1271 ,0 , +DRM_MODE_FLAG_PHSYNC |DRM_MODE_FLAG_NVSYNC ) }, +/* 1920x1440@60Hz */ + {DRM_MODE ("1920x1440" ,DRM_MODE_TYPE_DRIVER ,234000 ,1920 ,2048 , +2256 ,2600 ,0 ,1440 ,1441 ,1444 ,1500 ,0 , +DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_PVSYNC ) }, +/* 1920x1440@75Hz */ + {DRM_MODE ("1920x1440" ,DRM_MODE_TYPE_DRIVER ,297000 ,1920 ,2064 , +2288 ,2640 ,0 ,1440 ,1441 ,1444 ,1500 ,0 , +DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_PVSYNC ) }, +/* 1920x1440@120Hz RB */ + {DRM_MODE ("1920x1440" ,DRM_MODE_TYPE_DRIVER ,380500 ,1920 ,1968 , +2000 ,2080 ,0 ,1440 ,1443 ,1447 ,1525 ,0 , +DRM_MODE_FLAG_PHSYNC |DRM_MODE_FLAG_NVSYNC ) }, +/* 2560x1600@60Hz RB */ + {DRM_MODE ("2560x1600" ,DRM_MODE_TYPE_DRIVER ,268500 ,2560 ,2608 , +2640 ,2720 ,0 ,1600 ,1603 ,1609 ,1646 ,0 , +DRM_MODE_FLAG_PHSYNC |DRM_MODE_FLAG_NVSYNC ) }, +/* 2560x1600@60Hz */ + {DRM_MODE ("2560x1600" ,DRM_MODE_TYPE_DRIVER ,348500 ,2560 ,2752 , +3032 ,3504 ,0 ,1600 ,1603 ,1609 ,1658 ,0 , +DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_PVSYNC ) }, +/* 2560x1600@75HZ */ + {DRM_MODE ("2560x1600" ,DRM_MODE_TYPE_DRIVER ,443250 ,2560 ,2768 , +3048 ,3536 ,0 ,1600 ,1603 ,1609 ,1672 ,0 , +DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_PVSYNC ) }, +/* 2560x1600@85HZ */ + {DRM_MODE ("2560x1600" ,DRM_MODE_TYPE_DRIVER ,505250 ,2560 ,2768 , +3048 ,3536 ,0 ,1600 ,1603 ,1609 ,1682 ,0 , +DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_PVSYNC ) }, +/* 2560x1600@120Hz RB */ + {DRM_MODE ("2560x1600" ,DRM_MODE_TYPE_DRIVER ,552750 ,2560 ,2608 , +2640 ,2720 ,0 ,1600 ,1603 ,1609 ,1694 ,0 , +DRM_MODE_FLAG_PHSYNC |DRM_MODE_FLAG_NVSYNC ) }, +}; + +static const struct drm_display_mode edid_est_modes[] = { + {DRM_MODE ("800x600" ,DRM_MODE_TYPE_DRIVER ,40000 ,800 ,840 , +968 ,1056 ,0 ,600 ,601 ,605 ,628 ,0 , +DRM_MODE_FLAG_PHSYNC |DRM_MODE_FLAG_PVSYNC ) },/* 800x600@60Hz */ + {DRM_MODE ("800x600" ,DRM_MODE_TYPE_DRIVER ,36000 ,800 ,824 , +896 ,1024 ,0 ,600 ,601 ,603 ,625 ,0 , +DRM_MODE_FLAG_PHSYNC |DRM_MODE_FLAG_PVSYNC ) },/* 800x600@56Hz */ + {DRM_MODE ("640x480" ,DRM_MODE_TYPE_DRIVER ,31500 ,640 ,656 , +720 ,840 ,0 ,480 ,481 ,484 ,500 ,0 , +DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_NVSYNC ) },/* 640x480@75Hz */ + {DRM_MODE ("640x480" ,DRM_MODE_TYPE_DRIVER ,31500 ,640 ,664 , +704 ,832 ,0 ,480 ,489 ,491 ,520 ,0 , +DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_NVSYNC ) },/* 640x480@72Hz */ + {DRM_MODE ("640x480" ,DRM_MODE_TYPE_DRIVER ,30240 ,640 ,704 , +768 ,864 ,0 ,480 ,483 ,486 ,525 ,0 , +DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_NVSYNC ) },/* 640x480@67Hz */ + {DRM_MODE ("640x480" ,DRM_MODE_TYPE_DRIVER ,25200 ,640 ,656 , +752 ,800 ,0 ,480 ,490 ,492 ,525 ,0 , +DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_NVSYNC ) },/* 640x480@60Hz */ + {DRM_MODE ("720x400" ,DRM_MODE_TYPE_DRIVER ,35500 ,720 ,738 , +846 ,900 ,0 ,400 ,421 ,423 ,449 ,0 , +DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_NVSYNC ) },/* 720x400@88Hz */ + {DRM_MODE ("720x400" ,DRM_MODE_TYPE_DRIVER ,28320 ,720 ,738 , +846 ,900 ,0 ,400 ,412 ,414 ,449 ,0 , +DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_PVSYNC ) },/* 720x400@70Hz */ + {DRM_MODE ("1280x1024" ,DRM_MODE_TYPE_DRIVER ,135000 ,1280 ,1296 , +1440 ,1688 ,0 ,1024 ,1025 ,1028 ,1066 ,0 , +DRM_MODE_FLAG_PHSYNC |DRM_MODE_FLAG_PVSYNC ) },/* 1280x1024@75Hz */ + {DRM_MODE ("1024x768" ,DRM_MODE_TYPE_DRIVER ,78800 ,1024 ,1040 , +1136 ,1312 ,0 ,768 ,769 ,772 ,800 ,0 , +DRM_MODE_FLAG_PHSYNC |DRM_MODE_FLAG_PVSYNC ) },/* 1024x768@75Hz */ + {DRM_MODE ("1024x768" ,DRM_MODE_TYPE_DRIVER ,75000 ,1024 ,1048 , +1184 ,1328 ,0 ,768 ,771 ,777 ,806 ,0 , +DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_NVSYNC ) },/* 1024x768@70Hz */ + {DRM_MODE ("1024x768" ,DRM_MODE_TYPE_DRIVER ,65000 ,1024 ,1048 , +1184 ,1344 ,0 ,768 ,771 ,777 ,806 ,0 , +DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_NVSYNC ) },/* 1024x768@60Hz */ + {DRM_MODE ("1024x768i" ,DRM_MODE_TYPE_DRIVER ,44900 ,1024 ,1032 , +1208 ,1264 ,0 ,768 ,768 ,776 ,817 ,0 , +DRM_MODE_FLAG_PHSYNC |DRM_MODE_FLAG_PVSYNC |DRM_MODE_FLAG_INTERLACE ) },/* 1024x768@43Hz */ + {DRM_MODE ("832x624" ,DRM_MODE_TYPE_DRIVER ,57284 ,832 ,864 , +928 ,1152 ,0 ,624 ,625 ,628 ,667 ,0 , +DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_NVSYNC ) },/* 832x624@75Hz */ + {DRM_MODE ("800x600" ,DRM_MODE_TYPE_DRIVER ,49500 ,800 ,816 , +896 ,1056 ,0 ,600 ,601 ,604 ,625 ,0 , +DRM_MODE_FLAG_PHSYNC |DRM_MODE_FLAG_PVSYNC ) },/* 800x600@75Hz */ + {DRM_MODE ("800x600" ,DRM_MODE_TYPE_DRIVER ,50000 ,800 ,856 , +976 ,1040 ,0 ,600 ,637 ,643 ,666 ,0 , +DRM_MODE_FLAG_PHSYNC |DRM_MODE_FLAG_PVSYNC ) },/* 800x600@72Hz */ + {DRM_MODE ("1152x864" ,DRM_MODE_TYPE_DRIVER ,108000 ,1152 ,1216 , +1344 ,1600 ,0 ,864 ,865 ,868 ,900 ,0 , +DRM_MODE_FLAG_PHSYNC |DRM_MODE_FLAG_PVSYNC ) },/* 1152x864@75Hz */ +}; + +struct minimode { +short w; +short h; +short r; +short rb; +}; + +static const struct minimode est3_modes[] = { +/* byte 6 */ + {640 ,350 ,85 ,0 }, + {640 ,400 ,85 ,0 }, + {720 ,400 ,85 ,0 }, + {640 ,480 ,85 ,0 }, + {848 ,480 ,60 ,0 }, + {800 ,600 ,85 ,0 }, + {1024 ,768 ,85 ,0 }, + {1152 ,864 ,75 ,0 }, +/* byte 7 */ + {1280 ,768 ,60 ,1 }, + {1280 ,768 ,60 ,0 }, + {1280 ,768 ,75 ,0 }, + {1280 ,768 ,85 ,0 }, + {1280 ,960 ,60 ,0 }, + {1280 ,960 ,85 ,0 }, + {1280 ,1024 ,60 ,0 }, + {1280 ,1024 ,85 ,0 }, +/* byte 8 */ + {1360 ,768 ,60 ,0 }, + {1440 ,900 ,60 ,1 }, + {1440 ,900 ,60 ,0 }, + {1440 ,900 ,75 ,0 }, + {1440 ,900 ,85 ,0 }, + {1400 ,1050 ,60 ,1 }, + {1400 ,1050 ,60 ,0 }, + {1400 ,1050 ,75 ,0 }, +/* byte 9 */ + {1400 ,1050 ,85 ,0 }, + {1680 ,1050 ,60 ,1 }, + {1680 ,1050 ,60 ,0 }, + {1680 ,1050 ,75 ,0 }, + {1680 ,1050 ,85 ,0 }, + {1600 ,1200 ,60 ,0 }, + {1600 ,1200 ,65 ,0 }, + {1600 ,1200 ,70 ,0 }, +/* byte 10 */ + {1600 ,1200 ,75 ,0 }, + {1600 ,1200 ,85 ,0 }, + {1792 ,1344 ,60 ,0 }, + {1792 ,1344 ,85 ,0 }, + {1856 ,1392 ,60 ,0 }, + {1856 ,1392 ,75 ,0 }, + {1920 ,1200 ,60 ,1 }, + {1920 ,1200 ,60 ,0 }, +/* byte 11 */ + {1920 ,1200 ,75 ,0 }, + {1920 ,1200 ,85 ,0 }, + {1920 ,1440 ,60 ,0 }, + {1920 ,1440 ,75 ,0 }, +}; + +static const struct minimode extra_modes[] = { + {1024 ,576 ,60 ,0 }, + {1366 ,768 ,60 ,0 }, + {1600 ,900 ,60 ,0 }, + {1680 ,945 ,60 ,0 }, + {1920 ,1080 ,60 ,0 }, + {2048 ,1152 ,60 ,0 }, + {2048 ,1536 ,60 ,0 }, +}; + +/* +* Probably taken from CEA-861 spec. +* This table is converted from xorg's hw/xfree86/modes/xf86EdidModes.c. +*/ +static const struct drm_display_mode edid_cea_modes[] = { +/* 1 - 640x480@60Hz */ + {DRM_MODE ("640x480" ,DRM_MODE_TYPE_DRIVER ,25175 ,640 ,656 , +752 ,800 ,0 ,480 ,490 ,492 ,525 ,0 , +DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_NVSYNC ) }, +/* 2 - 720x480@60Hz */ + {DRM_MODE ("720x480" ,DRM_MODE_TYPE_DRIVER ,27000 ,720 ,736 , +798 ,858 ,0 ,480 ,489 ,495 ,525 ,0 , +DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_NVSYNC ) }, +/* 3 - 720x480@60Hz */ + {DRM_MODE ("720x480" ,DRM_MODE_TYPE_DRIVER ,27000 ,720 ,736 , +798 ,858 ,0 ,480 ,489 ,495 ,525 ,0 , +DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_NVSYNC ) }, +/* 4 - 1280x720@60Hz */ + {DRM_MODE ("1280x720" ,DRM_MODE_TYPE_DRIVER ,74250 ,1280 ,1390 , +1430 ,1650 ,0 ,720 ,725 ,730 ,750 ,0 , +DRM_MODE_FLAG_PHSYNC |DRM_MODE_FLAG_PVSYNC ) }, +/* 5 - 1920x1080i@60Hz */ + {DRM_MODE ("1920x1080i" ,DRM_MODE_TYPE_DRIVER ,74250 ,1920 ,2008 , +2052 ,2200 ,0 ,1080 ,1084 ,1094 ,1125 ,0 , +DRM_MODE_FLAG_PHSYNC |DRM_MODE_FLAG_PVSYNC | +DRM_MODE_FLAG_INTERLACE ) }, +/* 6 - 1440x480i@60Hz */ + {DRM_MODE ("1440x480i" ,DRM_MODE_TYPE_DRIVER ,27000 ,1440 ,1478 , +1602 ,1716 ,0 ,480 ,488 ,494 ,525 ,0 , +DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_NVSYNC | +DRM_MODE_FLAG_INTERLACE |DRM_MODE_FLAG_DBLCLK ) }, +/* 7 - 1440x480i@60Hz */ + {DRM_MODE ("1440x480i" ,DRM_MODE_TYPE_DRIVER ,27000 ,1440 ,1478 , +1602 ,1716 ,0 ,480 ,488 ,494 ,525 ,0 , +DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_NVSYNC | +DRM_MODE_FLAG_INTERLACE |DRM_MODE_FLAG_DBLCLK ) }, +/* 8 - 1440x240@60Hz */ + {DRM_MODE ("1440x240" ,DRM_MODE_TYPE_DRIVER ,27000 ,1440 ,1478 , +1602 ,1716 ,0 ,240 ,244 ,247 ,262 ,0 , +DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_NVSYNC | +DRM_MODE_FLAG_DBLCLK ) }, +/* 9 - 1440x240@60Hz */ + {DRM_MODE ("1440x240" ,DRM_MODE_TYPE_DRIVER ,27000 ,1440 ,1478 , +1602 ,1716 ,0 ,240 ,244 ,247 ,262 ,0 , +DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_NVSYNC | +DRM_MODE_FLAG_DBLCLK ) }, +/* 10 - 2880x480i@60Hz */ + {DRM_MODE ("2880x480i" ,DRM_MODE_TYPE_DRIVER ,54000 ,2880 ,2956 , +3204 ,3432 ,0 ,480 ,488 ,494 ,525 ,0 , +DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_NVSYNC | +DRM_MODE_FLAG_INTERLACE ) }, +/* 11 - 2880x480i@60Hz */ + {DRM_MODE ("2880x480i" ,DRM_MODE_TYPE_DRIVER ,54000 ,2880 ,2956 , +3204 ,3432 ,0 ,480 ,488 ,494 ,525 ,0 , +DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_NVSYNC | +DRM_MODE_FLAG_INTERLACE ) }, +/* 12 - 2880x240@60Hz */ + {DRM_MODE ("2880x240" ,DRM_MODE_TYPE_DRIVER ,54000 ,2880 ,2956 , +3204 ,3432 ,0 ,240 ,244 ,247 ,262 ,0 , +DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_NVSYNC ) }, +/* 13 - 2880x240@60Hz */ + {DRM_MODE ("2880x240" ,DRM_MODE_TYPE_DRIVER ,54000 ,2880 ,2956 , +3204 ,3432 ,0 ,240 ,244 ,247 ,262 ,0 , +DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_NVSYNC ) }, +/* 14 - 1440x480@60Hz */ + {DRM_MODE ("1440x480" ,DRM_MODE_TYPE_DRIVER ,54000 ,1440 ,1472 , +1596 ,1716 ,0 ,480 ,489 ,495 ,525 ,0 , +DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_NVSYNC ) }, +/* 15 - 1440x480@60Hz */ + {DRM_MODE ("1440x480" ,DRM_MODE_TYPE_DRIVER ,54000 ,1440 ,1472 , +1596 ,1716 ,0 ,480 ,489 ,495 ,525 ,0 , +DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_NVSYNC ) }, +/* 16 - 1920x1080@60Hz */ + {DRM_MODE ("1920x1080" ,DRM_MODE_TYPE_DRIVER ,148500 ,1920 ,2008 , +2052 ,2200 ,0 ,1080 ,1084 ,1089 ,1125 ,0 , +DRM_MODE_FLAG_PHSYNC |DRM_MODE_FLAG_PVSYNC ) }, +/* 17 - 720x576@50Hz */ + {DRM_MODE ("720x576" ,DRM_MODE_TYPE_DRIVER ,27000 ,720 ,732 , +796 ,864 ,0 ,576 ,581 ,586 ,625 ,0 , +DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_NVSYNC ) }, +/* 18 - 720x576@50Hz */ + {DRM_MODE ("720x576" ,DRM_MODE_TYPE_DRIVER ,27000 ,720 ,732 , +796 ,864 ,0 ,576 ,581 ,586 ,625 ,0 , +DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_NVSYNC ) }, +/* 19 - 1280x720@50Hz */ + {DRM_MODE ("1280x720" ,DRM_MODE_TYPE_DRIVER ,74250 ,1280 ,1720 , +1760 ,1980 ,0 ,720 ,725 ,730 ,750 ,0 , +DRM_MODE_FLAG_PHSYNC |DRM_MODE_FLAG_PVSYNC ) }, +/* 20 - 1920x1080i@50Hz */ + {DRM_MODE ("1920x1080i" ,DRM_MODE_TYPE_DRIVER ,74250 ,1920 ,2448 , +2492 ,2640 ,0 ,1080 ,1084 ,1094 ,1125 ,0 , +DRM_MODE_FLAG_PHSYNC |DRM_MODE_FLAG_PVSYNC | +DRM_MODE_FLAG_INTERLACE ) }, +/* 21 - 1440x576i@50Hz */ + {DRM_MODE ("1440x576i" ,DRM_MODE_TYPE_DRIVER ,27000 ,1440 ,1464 , +1590 ,1728 ,0 ,576 ,580 ,586 ,625 ,0 , +DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_NVSYNC | +DRM_MODE_FLAG_INTERLACE |DRM_MODE_FLAG_DBLCLK ) }, +/* 22 - 1440x576i@50Hz */ + {DRM_MODE ("1440x576i" ,DRM_MODE_TYPE_DRIVER ,27000 ,1440 ,1464 , +1590 ,1728 ,0 ,576 ,580 ,586 ,625 ,0 , +DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_NVSYNC | +DRM_MODE_FLAG_INTERLACE |DRM_MODE_FLAG_DBLCLK ) }, +/* 23 - 1440x288@50Hz */ + {DRM_MODE ("1440x288" ,DRM_MODE_TYPE_DRIVER ,27000 ,1440 ,1464 , +1590 ,1728 ,0 ,288 ,290 ,293 ,312 ,0 , +DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_NVSYNC | +DRM_MODE_FLAG_DBLCLK ) }, +/* 24 - 1440x288@50Hz */ + {DRM_MODE ("1440x288" ,DRM_MODE_TYPE_DRIVER ,27000 ,1440 ,1464 , +1590 ,1728 ,0 ,288 ,290 ,293 ,312 ,0 , +DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_NVSYNC | +DRM_MODE_FLAG_DBLCLK ) }, +/* 25 - 2880x576i@50Hz */ + {DRM_MODE ("2880x576i" ,DRM_MODE_TYPE_DRIVER ,54000 ,2880 ,2928 , +3180 ,3456 ,0 ,576 ,580 ,586 ,625 ,0 , +DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_NVSYNC | +DRM_MODE_FLAG_INTERLACE ) }, +/* 26 - 2880x576i@50Hz */ + {DRM_MODE ("2880x576i" ,DRM_MODE_TYPE_DRIVER ,54000 ,2880 ,2928 , +3180 ,3456 ,0 ,576 ,580 ,586 ,625 ,0 , +DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_NVSYNC | +DRM_MODE_FLAG_INTERLACE ) }, +/* 27 - 2880x288@50Hz */ + {DRM_MODE ("2880x288" ,DRM_MODE_TYPE_DRIVER ,54000 ,2880 ,2928 , +3180 ,3456 ,0 ,288 ,290 ,293 ,312 ,0 , +DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_NVSYNC ) }, +/* 28 - 2880x288@50Hz */ + {DRM_MODE ("2880x288" ,DRM_MODE_TYPE_DRIVER ,54000 ,2880 ,2928 , +3180 ,3456 ,0 ,288 ,290 ,293 ,312 ,0 , +DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_NVSYNC ) }, +/* 29 - 1440x576@50Hz */ + {DRM_MODE ("1440x576" ,DRM_MODE_TYPE_DRIVER ,54000 ,1440 ,1464 , +1592 ,1728 ,0 ,576 ,581 ,586 ,625 ,0 , +DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_NVSYNC ) }, +/* 30 - 1440x576@50Hz */ + {DRM_MODE ("1440x576" ,DRM_MODE_TYPE_DRIVER ,54000 ,1440 ,1464 , +1592 ,1728 ,0 ,576 ,581 ,586 ,625 ,0 , +DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_NVSYNC ) }, +/* 31 - 1920x1080@50Hz */ + {DRM_MODE ("1920x1080" ,DRM_MODE_TYPE_DRIVER ,148500 ,1920 ,2448 , +2492 ,2640 ,0 ,1080 ,1084 ,1089 ,1125 ,0 , +DRM_MODE_FLAG_PHSYNC |DRM_MODE_FLAG_PVSYNC ) }, +/* 32 - 1920x1080@24Hz */ + {DRM_MODE ("1920x1080" ,DRM_MODE_TYPE_DRIVER ,74250 ,1920 ,2558 , +2602 ,2750 ,0 ,1080 ,1084 ,1089 ,1125 ,0 , +DRM_MODE_FLAG_PHSYNC |DRM_MODE_FLAG_PVSYNC ) }, +/* 33 - 1920x1080@25Hz */ + {DRM_MODE ("1920x1080" ,DRM_MODE_TYPE_DRIVER ,74250 ,1920 ,2448 , +2492 ,2640 ,0 ,1080 ,1084 ,1089 ,1125 ,0 , +DRM_MODE_FLAG_PHSYNC |DRM_MODE_FLAG_PVSYNC ) }, +/* 34 - 1920x1080@30Hz */ + {DRM_MODE ("1920x1080" ,DRM_MODE_TYPE_DRIVER ,74250 ,1920 ,2008 , +2052 ,2200 ,0 ,1080 ,1084 ,1089 ,1125 ,0 , +DRM_MODE_FLAG_PHSYNC |DRM_MODE_FLAG_PVSYNC ) }, +/* 35 - 2880x480@60Hz */ + {DRM_MODE ("2880x480" ,DRM_MODE_TYPE_DRIVER ,108000 ,2880 ,2944 , +3192 ,3432 ,0 ,480 ,489 ,495 ,525 ,0 , +DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_NVSYNC ) }, +/* 36 - 2880x480@60Hz */ + {DRM_MODE ("2880x480" ,DRM_MODE_TYPE_DRIVER ,108000 ,2880 ,2944 , +3192 ,3432 ,0 ,480 ,489 ,495 ,525 ,0 , +DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_NVSYNC ) }, +/* 37 - 2880x576@50Hz */ + {DRM_MODE ("2880x576" ,DRM_MODE_TYPE_DRIVER ,108000 ,2880 ,2928 , +3184 ,3456 ,0 ,576 ,581 ,586 ,625 ,0 , +DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_NVSYNC ) }, +/* 38 - 2880x576@50Hz */ + {DRM_MODE ("2880x576" ,DRM_MODE_TYPE_DRIVER ,108000 ,2880 ,2928 , +3184 ,3456 ,0 ,576 ,581 ,586 ,625 ,0 , +DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_NVSYNC ) }, +/* 39 - 1920x1080i@50Hz */ + {DRM_MODE ("1920x1080i" ,DRM_MODE_TYPE_DRIVER ,72000 ,1920 ,1952 , +2120 ,2304 ,0 ,1080 ,1126 ,1136 ,1250 ,0 , +DRM_MODE_FLAG_PHSYNC |DRM_MODE_FLAG_NVSYNC | +DRM_MODE_FLAG_INTERLACE ) }, +/* 40 - 1920x1080i@100Hz */ + {DRM_MODE ("1920x1080i" ,DRM_MODE_TYPE_DRIVER ,148500 ,1920 ,2448 , +2492 ,2640 ,0 ,1080 ,1084 ,1094 ,1125 ,0 , +DRM_MODE_FLAG_PHSYNC |DRM_MODE_FLAG_PVSYNC | +DRM_MODE_FLAG_INTERLACE ) }, +/* 41 - 1280x720@100Hz */ + {DRM_MODE ("1280x720" ,DRM_MODE_TYPE_DRIVER ,148500 ,1280 ,1720 , +1760 ,1980 ,0 ,720 ,725 ,730 ,750 ,0 , +DRM_MODE_FLAG_PHSYNC |DRM_MODE_FLAG_PVSYNC ) }, +/* 42 - 720x576@100Hz */ + {DRM_MODE ("720x576" ,DRM_MODE_TYPE_DRIVER ,54000 ,720 ,732 , +796 ,864 ,0 ,576 ,581 ,586 ,625 ,0 , +DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_NVSYNC ) }, +/* 43 - 720x576@100Hz */ + {DRM_MODE ("720x576" ,DRM_MODE_TYPE_DRIVER ,54000 ,720 ,732 , +796 ,864 ,0 ,576 ,581 ,586 ,625 ,0 , +DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_NVSYNC ) }, +/* 44 - 1440x576i@100Hz */ + {DRM_MODE ("1440x576" ,DRM_MODE_TYPE_DRIVER ,54000 ,1440 ,1464 , +1590 ,1728 ,0 ,576 ,580 ,586 ,625 ,0 , +DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_NVSYNC | +DRM_MODE_FLAG_DBLCLK ) }, +/* 45 - 1440x576i@100Hz */ + {DRM_MODE ("1440x576" ,DRM_MODE_TYPE_DRIVER ,54000 ,1440 ,1464 , +1590 ,1728 ,0 ,576 ,580 ,586 ,625 ,0 , +DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_NVSYNC | +DRM_MODE_FLAG_DBLCLK ) }, +/* 46 - 1920x1080i@120Hz */ + {DRM_MODE ("1920x1080i" ,DRM_MODE_TYPE_DRIVER ,148500 ,1920 ,2008 , +2052 ,2200 ,0 ,1080 ,1084 ,1094 ,1125 ,0 , +DRM_MODE_FLAG_PHSYNC |DRM_MODE_FLAG_PVSYNC | +DRM_MODE_FLAG_INTERLACE ) }, +/* 47 - 1280x720@120Hz */ + {DRM_MODE ("1280x720" ,DRM_MODE_TYPE_DRIVER ,148500 ,1280 ,1390 , +1430 ,1650 ,0 ,720 ,725 ,730 ,750 ,0 , +DRM_MODE_FLAG_PHSYNC |DRM_MODE_FLAG_PVSYNC ) }, +/* 48 - 720x480@120Hz */ + {DRM_MODE ("720x480" ,DRM_MODE_TYPE_DRIVER ,54000 ,720 ,736 , +798 ,858 ,0 ,480 ,489 ,495 ,525 ,0 , +DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_NVSYNC ) }, +/* 49 - 720x480@120Hz */ + {DRM_MODE ("720x480" ,DRM_MODE_TYPE_DRIVER ,54000 ,720 ,736 , +798 ,858 ,0 ,480 ,489 ,495 ,525 ,0 , +DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_NVSYNC ) }, +/* 50 - 1440x480i@120Hz */ + {DRM_MODE ("1440x480i" ,DRM_MODE_TYPE_DRIVER ,54000 ,1440 ,1478 , +1602 ,1716 ,0 ,480 ,488 ,494 ,525 ,0 , +DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_NVSYNC | +DRM_MODE_FLAG_INTERLACE |DRM_MODE_FLAG_DBLCLK ) }, +/* 51 - 1440x480i@120Hz */ + {DRM_MODE ("1440x480i" ,DRM_MODE_TYPE_DRIVER ,54000 ,1440 ,1478 , +1602 ,1716 ,0 ,480 ,488 ,494 ,525 ,0 , +DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_NVSYNC | +DRM_MODE_FLAG_INTERLACE |DRM_MODE_FLAG_DBLCLK ) }, +/* 52 - 720x576@200Hz */ + {DRM_MODE ("720x576" ,DRM_MODE_TYPE_DRIVER ,108000 ,720 ,732 , +796 ,864 ,0 ,576 ,581 ,586 ,625 ,0 , +DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_NVSYNC ) }, +/* 53 - 720x576@200Hz */ + {DRM_MODE ("720x576" ,DRM_MODE_TYPE_DRIVER ,108000 ,720 ,732 , +796 ,864 ,0 ,576 ,581 ,586 ,625 ,0 , +DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_NVSYNC ) }, +/* 54 - 1440x576i@200Hz */ + {DRM_MODE ("1440x576i" ,DRM_MODE_TYPE_DRIVER ,108000 ,1440 ,1464 , +1590 ,1728 ,0 ,576 ,580 ,586 ,625 ,0 , +DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_NVSYNC | +DRM_MODE_FLAG_INTERLACE |DRM_MODE_FLAG_DBLCLK ) }, +/* 55 - 1440x576i@200Hz */ + {DRM_MODE ("1440x576i" ,DRM_MODE_TYPE_DRIVER ,108000 ,1440 ,1464 , +1590 ,1728 ,0 ,576 ,580 ,586 ,625 ,0 , +DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_NVSYNC | +DRM_MODE_FLAG_INTERLACE |DRM_MODE_FLAG_DBLCLK ) }, +/* 56 - 720x480@240Hz */ + {DRM_MODE ("720x480" ,DRM_MODE_TYPE_DRIVER ,108000 ,720 ,736 , +798 ,858 ,0 ,480 ,489 ,495 ,525 ,0 , +DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_NVSYNC ) }, +/* 57 - 720x480@240Hz */ + {DRM_MODE ("720x480" ,DRM_MODE_TYPE_DRIVER ,108000 ,720 ,736 , +798 ,858 ,0 ,480 ,489 ,495 ,525 ,0 , +DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_NVSYNC ) }, +/* 58 - 1440x480i@240 */ + {DRM_MODE ("1440x480i" ,DRM_MODE_TYPE_DRIVER ,108000 ,1440 ,1478 , +1602 ,1716 ,0 ,480 ,488 ,494 ,525 ,0 , +DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_NVSYNC | +DRM_MODE_FLAG_INTERLACE |DRM_MODE_FLAG_DBLCLK ) }, +/* 59 - 1440x480i@240 */ + {DRM_MODE ("1440x480i" ,DRM_MODE_TYPE_DRIVER ,108000 ,1440 ,1478 , +1602 ,1716 ,0 ,480 ,488 ,494 ,525 ,0 , +DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_NVSYNC | +DRM_MODE_FLAG_INTERLACE |DRM_MODE_FLAG_DBLCLK ) }, +/* 60 - 1280x720@24Hz */ + {DRM_MODE ("1280x720" ,DRM_MODE_TYPE_DRIVER ,59400 ,1280 ,3040 , +3080 ,3300 ,0 ,720 ,725 ,730 ,750 ,0 , +DRM_MODE_FLAG_PHSYNC |DRM_MODE_FLAG_PVSYNC ) }, +/* 61 - 1280x720@25Hz */ + {DRM_MODE ("1280x720" ,DRM_MODE_TYPE_DRIVER ,74250 ,1280 ,3700 , +3740 ,3960 ,0 ,720 ,725 ,730 ,750 ,0 , +DRM_MODE_FLAG_PHSYNC |DRM_MODE_FLAG_PVSYNC ) }, +/* 62 - 1280x720@30Hz */ + {DRM_MODE ("1280x720" ,DRM_MODE_TYPE_DRIVER ,74250 ,1280 ,3040 , +3080 ,3300 ,0 ,720 ,725 ,730 ,750 ,0 , +DRM_MODE_FLAG_PHSYNC |DRM_MODE_FLAG_PVSYNC ) }, +/* 63 - 1920x1080@120Hz */ + {DRM_MODE ("1920x1080" ,DRM_MODE_TYPE_DRIVER ,297000 ,1920 ,2008 , +2052 ,2200 ,0 ,1080 ,1084 ,1089 ,1125 ,0 , +DRM_MODE_FLAG_PHSYNC |DRM_MODE_FLAG_PVSYNC ) }, +/* 64 - 1920x1080@100Hz */ + {DRM_MODE ("1920x1080" ,DRM_MODE_TYPE_DRIVER ,297000 ,1920 ,2448 , +2492 ,2640 ,0 ,1080 ,1084 ,1094 ,1125 ,0 , +DRM_MODE_FLAG_PHSYNC |DRM_MODE_FLAG_PVSYNC ) }, +}; +/*** DDC fetch and block validation ***/ static const u8 edid_header[] = {
@@ -542,7 +1281,7 @@ struct drm_display_mode *drm_mode_find_dmt(struct drm_device *dev, {int i; -for (i =0 ; i < drm_num_dmt_modes; i++) { +for (i =0 ; i <ARRAY_SIZE (drm_dmt_modes); i++) {const struct drm_display_mode *ptr = &drm_dmt_modes[i];if (hsize != ptr->hdisplay)continue ;
@@ -1083,7 +1822,7 @@ drm_dmt_modes_for_range(struct drm_connector *connector, struct edid *edid,struct drm_display_mode *newmode;struct drm_device *dev = connector->dev; -for (i =0 ; i < drm_num_dmt_modes; i++) { +for (i =0 ; i <ARRAY_SIZE (drm_dmt_modes); i++) {if (mode_in_range (drm_dmt_modes + i, edid, timing) &&valid_inferred_mode (connector, drm_dmt_modes + i)) { newmode =drm_mode_duplicate (dev, &drm_dmt_modes[i]);
@@ -1118,7 +1857,7 @@ drm_gtf_modes_for_range(struct drm_connector *connector, struct edid *edid,struct drm_display_mode *newmode;struct drm_device *dev = connector->dev; -for (i =0 ; i < num_extra_modes; i++) { +for (i =0 ; i <ARRAY_SIZE (extra_modes); i++) {const struct minimode *m = &extra_modes[i]; newmode =drm_gtf_mode (dev, m->w, m->h, m->r,0 ,0 );if (!newmode)
@@ -1147,7 +1886,7 @@ drm_cvt_modes_for_range(struct drm_connector *connector, struct edid *edid,struct drm_device *dev = connector->dev;bool rb =drm_monitor_supports_rb (edid); -for (i =0 ; i < num_extra_modes; i++) { +for (i =0 ; i <ARRAY_SIZE (extra_modes); i++) {const struct minimode *m = &extra_modes[i]; newmode =drm_cvt_mode (dev, m->w, m->h, m->r, rb,0 ,0 );if (!newmode)
@@ -1528,7 +2267,7 @@ u8 drm_match_cea_mode(const struct drm_display_mode *to_match)struct drm_display_mode *cea_mode;u8 mode; -for (mode =0 ; mode < drm_num_cea_modes; mode++) { +for (mode =0 ; mode <ARRAY_SIZE (edid_cea_modes); mode++) { cea_mode = (struct drm_display_mode *)&edid_cea_modes[mode];if (drm_mode_equal (to_match, cea_mode))
@@ -1548,7 +2287,7 @@ do_cea_modes (struct drm_connector *connector, u8 *db, u8 len)for (mode = db; mode < db + len; mode++) { cea_mode = (*mode &127 ) -1 ;/* CEA modes are numbered 1..127 */ -if (cea_mode < drm_num_cea_modes) { +if (cea_mode <ARRAY_SIZE (edid_cea_modes)) {struct drm_display_mode *newmode; newmode =drm_mode_duplicate (dev, &edid_cea_modes[cea_mode]);
drivers/gpu/drm/drm_edid_modes.h deleted +0 -774
774 lines not on this page · raw message
Signature · 1 line
1.8.1.2
PATCH v5 3/9 drm: Add some missing forward declarations
In reply to Thierry RedingThe drm_file and drm_clip_rect structures are used throughout the file but they are never declared nor pulled in through an include. Add forward declarations to make them available.
--- include/drm/drm_crtc.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
include/drm/drm_crtc.h +2 -1
@@ -38,7 +38,8 @@ struct drm_device;struct drm_mode_set ;struct drm_framebuffer ;struct drm_object_properties ; - +struct drm_file ; +struct drm_clip_rect ;#define DRM_MODE_OBJECT_CRTC 0xcccccccc#define DRM_MODE_OBJECT_CONNECTOR 0xc0c0c0c0
Signature · 1 line
1.8.1.2
PATCH v5 4/9 video: Add generic HDMI infoframe helpers
In reply to Thierry RedingAdd generic helpers to pack HDMI infoframes into binary buffers.
---
Changes in v2:
- add support for audio, vendor-specific and SPD infoframes
- add various validity checks on infoframes
- factor out checksum computation
Changes in v3:
- introduce HDMI_INFOFRAME_HEADER_SIZE
- fix SPD infoframe SDI field offset
Changes in v4:
- remove needless checks for input parameters
- use memcpy() instead of manual copy loop
- update SPD SPI enum to include HD-DVD and PMP as per CEA-861-E
- add audio coding type extension support
- match audio coding type names to those in CEA-861-E
drivers/video/Kconfig | 3 + drivers/video/Makefile | 1 + drivers/video/hdmi.c | 308 +++++++++++++++++++++++++++++++++++++++++++++++++ include/linux/hdmi.h | 231 +++++++++++++++++++++++++++++++++++++ 4 files changed, 543 insertions(+) create mode 100644 drivers/video/hdmi.c create mode 100644 include/linux/hdmi.h
drivers/video/Kconfig +3 -0
@@ -52,6 +52,9 @@ config OF_VIDEOMODE help helper to get videomodes from the devicetree +config HDMI + bool + menuconfig FB tristate "Support for frame buffer devices" ---help---
drivers/video/Makefile +1 -0
@@ -5,6 +5,7 @@ # Each configuration option enables a list of files. obj-$(CONFIG_VGASTATE) += vgastate.o +obj-$(CONFIG_HDMI) += hdmi.o obj-y += fb_notify.o obj-$(CONFIG_FB) += fb.o fb-y := fbmem.o fbmon.o fbcmap.o fbsysfs.o \
drivers/video/hdmi.c new file +308 -0
308 lines not on this page · raw message
include/linux/hdmi.h new file +231 -0
231 lines not on this page · raw message
Signature · 1 line
1.8.1.2
Re: [PATCH v5 4/9] video: Add generic HDMI infoframe helpers
On Fri, Feb 22, 2013 at 08:03:26AM +0100, Thierry Reding wrote:
<snip>
Quoted 6 lines
include/linux/hdmi.h new file +6
-0+enum hdmi_audio_coding_type { +HDMI_AUDIO_CODING_TYPE_STREAM , +HDMI_AUDIO_CODING_TYPE_PCM , +HDMI_AUDIO_CODING_TYPE_AC3 , +HDMI_AUDIO_CODING_TYPE_MPEG1 , +HDMI_AUDIO_CODING_TYPE_MP3 ,
include/linux/hdmi.h line 174
Quoted 10 lines
include/linux/hdmi.h new file +10
-0+HDMI_AUDIO_CODING_TYPE_MPEG2 , +HDMI_AUDIO_CODING_TYPE_AAC_LC , +HDMI_AUDIO_CODING_TYPE_DTS , +HDMI_AUDIO_CODING_TYPE_ATRAC , +HDMI_AUDIO_CODING_TYPE_DSD , +HDMI_AUDIO_CODING_TYPE_EAC3 , +HDMI_AUDIO_CODING_TYPE_DTS_HD , +HDMI_AUDIO_CODING_TYPE_MLP , +HDMI_AUDIO_CODING_TYPE_DST , + HDMI_AUDIO_CODING_TYPE_WMA_PRO,
+ HDMI_AUDIO_CODING_TYPE_EXT or something like it?
Quoted 12 lines
include/linux/hdmi.h new file +12
-0+}; + +enum hdmi_audio_sample_size { +HDMI_AUDIO_SAMPLE_SIZE_STREAM , +HDMI_AUDIO_SAMPLE_SIZE_16 , +HDMI_AUDIO_SAMPLE_SIZE_20 , +HDMI_AUDIO_SAMPLE_SIZE_24 , +}; + +enum hdmi_audio_sample_frequency { +HDMI_AUDIO_SAMPLE_FREQUENCY_STREAM , +HDMI_AUDIO_SAMPLE_FREQUENCY_32000 ,
include/linux/hdmi.h line 196
Quoted 10 lines
include/linux/hdmi.h new file +10
-0+HDMI_AUDIO_SAMPLE_FREQUENCY_44100 , +HDMI_AUDIO_SAMPLE_FREQUENCY_48000 , +HDMI_AUDIO_SAMPLE_FREQUENCY_88200 , +HDMI_AUDIO_SAMPLE_FREQUENCY_96000 , +HDMI_AUDIO_SAMPLE_FREQUENCY_176400 , + HDMI_AUDIO_SAMPLE_FREQUENCY_192000, +}; + +enum hdmi_audio_coding_type_ext { + HDMI_AUDIO_CODING_TYPE_EXT_STREAM,
The spec is a bit confusing w.r.t. this value, but I think this is correct. Any other value is illegal when CT!=15, and when CT==15, CXT=0 means that look at CT (infinite loop anyone?), or stream header. Since the infinite loop option doesn't make sense, looking at the stream header is the only option. Although I think it would be generally safer to avoid that specific combination. I'm sure some "clever" guy would actually implement the infinite loop instead.
Quoted 5 lines
include/linux/hdmi.h new file +5
-0+HDMI_AUDIO_CODING_TYPE_EXT_HE_AAC , +HDMI_AUDIO_CODING_TYPE_EXT_HE_AAC_V2 , + HDMI_AUDIO_CODING_TYPE_EXT_MPEG_SURROUND, +}; +
Signature · 2 lines
Ville Syrjälä Intel OTC
Re: [PATCH v5 4/9] video: Add generic HDMI infoframe helpers
In reply to Thierry RedingQuoted 60 lines · Thierry Reding
Add generic helpers to pack HDMI infoframes into binary buffers.
Signed-off-by Thierry Reding <[email protected]>---
Changes in v2:
- add support for audio, vendor-specific and SPD infoframes
- add various validity checks on infoframes
- factor out checksum computationChanges in v3:
- introduceHDMI_INFOFRAME_HEADER_SIZE
- fix SPD infoframe SDI field offsetChanges in v4:
- remove needless checks for input parameters
- usememcpy()instead of manual copy loop
- update SPD SPI enum to include HD-DVD and PMP as per CEA-861-E
- add audio coding type extension support
- match audio coding type names to those in CEA-861-Edrivers/video/Kconfig | 3 + drivers/video/Makefile | 1 + drivers/video/hdmi.c | 308 +++++++++++++++++++++++++++++++++++++++++++++++++ include/linux/hdmi.h | 231 +++++++++++++++++++++++++++++++++++++ 4 files changed, 543 insertions(+) create mode 100644 drivers/video/hdmi.c create mode 100644 include/linux/hdmi.hdrivers/video/Kconfig +3
-0@@ -52,6 +52,9 @@ config OF_VIDEOMODE help helper to get videomodes from the devicetree +config HDMI + bool + menuconfig FB tristate "Support for frame buffer devices" ---help---drivers/video/Makefile +1
-0@@ -5,6 +5,7 @@ # Each configuration option enables a list of files. obj-$(CONFIG_VGASTATE) += vgastate.o +obj-$(CONFIG_HDMI) += hdmi.o obj-y += fb_notify.o obj-$(CONFIG_FB) += fb.o fb-y := fbmem.o fbmon.o fbcmap.o fbsysfs.o \drivers/video/hdmi.c new file +0
-0
drivers/video/hdmi.c line 7
Quoted 7 lines
drivers/video/hdmi.c new file +7
-0@@ -0,0 +1,308 @@ +/* +* Copyright (C) 2012 Avionic Design GmbH +* +* 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. +*/
BTW was there any discussion about the license? drm is generally MIT. Are people OK with depending on GPL code for infoframe support?
Signature · 2 lines
Ville Syrjälä Intel OTC
Re: [PATCH v5 4/9] video: Add generic HDMI infoframe helpers
Quoted 1 line · Ville Syrjälä
On Fri, Feb 22, 2013 at 08:03:26AM +0100, Thierry Reding wrote:
[...]
Quoted 8 lines
Quoted 8 lines
drivers/video/hdmi.c new file +2
-0@@ -0,0 +1,308 @@ +/* +* Copyright (C) 2012 Avionic Design GmbH
Quoted 8 lines
drivers/video/hdmi.c line 7
Quoted 5 lines
drivers/video/hdmi.c new file +5
-0+* +* 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. +*/ BTW was there any discussion about the license? drm is generally MIT. Are people OK with depending on GPL code for infoframe support?
I wasn't aware of that. I don't know how much of an issue it is really since all symbols are exported non-GPL.
Thierry
_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v5 4/9] video: Add generic HDMI infoframe helpers
Am Montag, den 04.03.2013, 16:02 +0100 schrieb Thierry Reding:
Quoted 20 lines · Ville Syrjälä
Quoted 1 line · Thierry Reding
[...]
Quoted 8 lines
Quoted 8 lines
drivers/video/hdmi.c new file +2
-0@@ -0,0 +1,308 @@ +/* +* Copyright (C) 2012 Avionic Design GmbH Quoted 8 lines
drivers/video/hdmi.c line 7
Quoted 5 lines
drivers/video/hdmi.c new file +5
-0+* +* 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. +*/ BTW was there any discussion about the license? drm is generally MIT. Are people OK with depending on GPL code for infoframe support?
Quoted 4 lines
I wasn't aware of that. I don't know how much of an issue it is really since all symbols are exported non-GPL.
Thierry
It's not about the export of the symbols, but more about porting DRM to other UNIXes like BSD. Using the GPL here makes life for the BSD guys a lot harder and they are already struggling really hard to keep up with the pace of Linux. So if you don't care too much it would be nice to use MIT here.
Regards,
Lucas
_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v5 4/9] video: Add generic HDMI infoframe helpers
Quoted 24 lines · Lucas Stach
Am Montag, den 04.03.2013, 16:02 +0100 schrieb Thierry Reding:
Quoted 23 lines · Ville Syrjälä
Quoted 1 line · Thierry Reding
[...]
Quoted 8 lines
Quoted 8 lines
drivers/video/hdmi.c new file +2
-0@@ -0,0 +1,308 @@ +/* +* Copyright (C) 2012 Avionic Design GmbH Quoted 8 lines
drivers/video/hdmi.c line 7
Quoted 5 lines
drivers/video/hdmi.c new file +5
-0+* +* 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. +*/ BTW was there any discussion about the license? drm is generally MIT. Are people OK with depending on GPL code for infoframe support?
I wasn't aware of that. I don't know how much of an issue it is really since all symbols are exported non-GPL.
Quoted 7 lines
Quoted 1 line
Thierry
It's not about the export of the symbols, but more about porting DRM to other UNIXes like BSD. Using the GPL here makes life for the BSD guys a lot harder and they are already struggling really hard to keep up with the pace of Linux. So if you don't care too much it would be nice to use MIT here.
Sure, I'll relicense it under MIT then.
Thierry
_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v5 4/9] video: Add generic HDMI infoframe helpers
Quoted 27 lines · Thierry Reding
Quoted 26 lines · Lucas Stach
Am Montag, den 04.03.2013, 16:02 +0100 schrieb Thierry Reding:
Quoted 24 lines · Ville Syrjälä
Quoted 1 line · Thierry Reding
[...]
Quoted 8 lines
Quoted 8 lines
drivers/video/hdmi.c new file +2
-0@@ -0,0 +1,308 @@ +/* +* Copyright (C) 2012 Avionic Design GmbH Quoted 8 lines
drivers/video/hdmi.c line 7
Quoted 5 lines
drivers/video/hdmi.c new file +5
-0+* +* 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. +*/ BTW was there any discussion about the license? drm is generally MIT. Are people OK with depending on GPL code for infoframe support?
I wasn't aware of that. I don't know how much of an issue it is really since all symbols are exported non-GPL.
Thierry
Quoted 7 lines
Quoted 5 lines
It's not about the export of the symbols, but more about porting DRM to other UNIXes like BSD. Using the GPL here makes life for the BSD guys a lot harder and they are already struggling really hard to keep up with the pace of Linux. So if you don't care too much it would be nice to use MIT here.
Sure, I'll relicense it under MIT then.
It seems these got merged as GPL. Do you want to provide a patch for changing the license?
Signature · 2 lines
Ville Syrjälä Intel OTC
Re: [PATCH v5 4/9] video: Add generic HDMI infoframe helpers
Quoted 34 lines · Ville Syrjälä
Quoted 33 lines · Thierry Reding
Quoted 31 lines · Lucas Stach
Am Montag, den 04.03.2013, 16:02 +0100 schrieb Thierry Reding:
Quoted 20 lines · Ville Syrjälä
Quoted 1 line · Thierry Reding
[...]
Quoted 8 lines
Quoted 8 lines
drivers/video/hdmi.c new file +2
-0@@ -0,0 +1,308 @@ +/* +* Copyright (C) 2012 Avionic Design GmbH Quoted 8 lines
drivers/video/hdmi.c line 7
Quoted 5 lines
drivers/video/hdmi.c new file +5
-0+* +* 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. +*/ BTW was there any discussion about the license? drm is generally MIT. Are people OK with depending on GPL code for infoframe support?
Quoted 4 lines
I wasn't aware of that. I don't know how much of an issue it is really since all symbols are exported non-GPL.
Thierry
It's not about the export of the symbols, but more about porting DRM to other UNIXes like BSD. Using the GPL here makes life for the BSD guys a lot harder and they are already struggling really hard to keep up with the pace of Linux. So if you don't care too much it would be nice to use MIT here.
Quoted 4 lines
Quoted 1 line
Sure, I'll relicense it under MIT then.
It seems these got merged as GPL. Do you want to provide a patch for changing the license?
Yes, I have the patch locally but had forgotten to send it out. Done now. Thanks for reminding me.
Thierry
_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v5 5/9 drm: Add HDMI infoframe helpers
In reply to Thierry RedingAdd a generic helper to fill in an HDMI AVI infoframe with data extracted from a DRM display mode.
---
Changes in v2:
- reuse CEA modes defined in drm_edid_modes.h
- don't use pixel aspect ratio for picture aspect
Changes in v3:
- move implementation into drm_edid.[ch]
drivers/gpu/drm/Kconfig | 1 + drivers/gpu/drm/drm_edid.c | 33 +++++++++++++++++++++++++++++++++ include/drm/drm_edid.h | 6 ++++++ 3 files changed, 40 insertions(+)
drivers/gpu/drm/Kconfig +1 -0
@@ -7,6 +7,7 @@ menuconfig DRM tristate "Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)" depends on (AGP || AGP=n) && !EMULATED_CMPXCHG && MMU + select HDMI select I2C select I2C_ALGOBIT select DMA_SHARED_BUFFER
drivers/gpu/drm/drm_edid.c +33 -0
@@ -29,6 +29,7 @@*/ #include <linux/kernel.h> #include <linux/slab.h> +#include <linux/hdmi.h> #include <linux/i2c.h> #include <linux/module.h> #include <drm/drmP.h>
@@ -2856,3 +2857,35 @@ int drm_add_modes_noedid(struct drm_connector *connector,return num_modes; }EXPORT_SYMBOL (drm_add_modes_noedid); + +/** +* drm_hdmi_avi_infoframe_from_display_mode() - fill an HDMI AVI infoframe with +* data from a DRM display mode +* @frame: HDMI AVI infoframe +* @mode: DRM display mode +* +* Returns 0 on success or a negative error code on failure. +*/ +int +drm_hdmi_avi_infoframe_from_display_mode (struct hdmi_avi_infoframe *frame, +const struct drm_display_mode *mode) +{ +int err; + +if (!frame || !mode) +return -EINVAL ; + + err =hdmi_avi_infoframe_init (frame); +if (err <0 ) +return err; + + frame->video_code =drm_match_cea_mode (mode); +if (!frame->video_code) +return 0 ; + + frame->picture_aspect =HDMI_PICTURE_ASPECT_NONE ; + frame->active_aspect =HDMI_ACTIVE_ASPECT_PICTURE ; + +return 0 ; +} +EXPORT_SYMBOL (drm_hdmi_avi_infoframe_from_display_mode);
include/drm/drm_edid.h +6 -0
@@ -247,6 +247,8 @@ struct edid {struct drm_encoder ;struct drm_connector ;struct drm_display_mode ; +struct hdmi_avi_infoframe ; +void drm_edid_to_eld (struct drm_connector *connector,struct edid *edid);int drm_av_sync_delay (struct drm_connector *connector,struct drm_display_mode *mode);
@@ -254,4 +256,8 @@ struct drm_connector *drm_select_eld(struct drm_encoder *encoder, struct drm_display_mode *mode);int drm_load_edid_firmware (struct drm_connector *connector); +int +drm_hdmi_avi_infoframe_from_display_mode (struct hdmi_avi_infoframe *frame, +const struct drm_display_mode *mode); +#endif /* __DRM_EDID_H__ */
Signature · 1 line
1.8.1.2
PATCH v5 6/9 drm: Add EDID helper documentation
In reply to Thierry RedingAdd a reference section about the EDID helper functions to the DRM documentation.
--- Documentation/DocBook/drm.tmpl | 4 ++++ 1 file changed, 4 insertions(+)
Documentation/DocBook/drm.tmpl +4 -0
@@ -2151,6 +2151,10 @@ void intel_crt_init(struct drm_device *dev) !Iinclude/drm/drm_dp_helper.h !Edrivers/gpu/drm/drm_dp_helper.c </sect2> + <sect2> + <title>EDID Helper Functions Reference</title> +!Edrivers/gpu/drm/drm_edid.c + </sect2> </sect1> <!-- Internals: vertical blanking -->
Signature · 1 line
1.8.1.2
PATCH v5 7/9 drm/tegra: Use generic HDMI infoframe helpers
In reply to Thierry RedingUse the generic HDMI infoframe helpers to get rid of the NVIDIA Tegra reimplementation.
--- drivers/gpu/drm/tegra/Kconfig | 1 + drivers/gpu/drm/tegra/hdmi.c | 226 ++++++++++++++++++++---------------------- drivers/gpu/drm/tegra/hdmi.h | 189 ----------------------------------- 3 files changed, 110 insertions(+), 306 deletions(-)
drivers/gpu/drm/tegra/Kconfig +1 -0
@@ -4,6 +4,7 @@ config DRM_TEGRA select DRM_KMS_HELPER select DRM_GEM_CMA_HELPER select DRM_KMS_CMA_HELPER + select DRM_HDMI select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT
drivers/gpu/drm/tegra/hdmi.c +109 -117
303 lines not on this page · raw message
drivers/gpu/drm/tegra/hdmi.h +0 -189
195 lines not on this page · raw message
Signature · 1 line
1.8.1.2
PATCH v5 8/9 drm/i915: Use generic HDMI infoframe helpers
In reply to Thierry RedingFrom: Paulo Zanoni <[email protected]>
Use the generic HDMI infoframe helpers to get rid of the duplicate implementation in the i915 driver.
This patch is based on the initial patch by Thierry Reding, but with a different approach.
TODO:
- The SDVO part is totally untested. I am not sure if the buffer size on the SDVO code must be a multiple of 4.
- The HDMI part was tested only on SNB/CPT.
- The patch is forcing pixel_repeat to 1 so I can properly test the patch. Remove this before the final version.
- The correctnes of this patch depends on a fix on patch "video: add Generic HDMI infoframe helpers"
--- drivers/gpu/drm/i915/intel_drv.h | 65 +------------ drivers/gpu/drm/i915/intel_hdmi.c | 191 ++++++++++++++++++++------------------ drivers/gpu/drm/i915/intel_sdvo.c | 27 +++--- 3 files changed, 117 insertions(+), 166 deletions(-)
drivers/gpu/drm/i915/intel_drv.h +3 -62
@@ -26,6 +26,7 @@#define __INTEL_DRV_H__#include <linux/i2c.h> +#include <linux/hdmi.h> #include <drm/i915_drm.h> #include "i915_drv.h" #include <drm/drm_crtc.h>
@@ -286,66 +287,6 @@ struct cxsr_latency {#define to_intel_framebuffer (x) container_of(x, struct intel_framebuffer, base)#define to_intel_plane (x) container_of(x, struct intel_plane, base) -#define DIP_HEADER_SIZE 5 - -#define DIP_TYPE_AVI 0x82 -#define DIP_VERSION_AVI 0x2 -#define DIP_LEN_AVI 13 -#define DIP_AVI_PR_1 0 -#define DIP_AVI_PR_2 1 -#define DIP_AVI_RGB_QUANT_RANGE_DEFAULT (0 << 2) -#define DIP_AVI_RGB_QUANT_RANGE_LIMITED (1 << 2) -#define DIP_AVI_RGB_QUANT_RANGE_FULL (2 << 2) - -#define DIP_TYPE_SPD 0x83 -#define DIP_VERSION_SPD 0x1 -#define DIP_LEN_SPD 25 -#define DIP_SPD_UNKNOWN 0 -#define DIP_SPD_DSTB 0x1 -#define DIP_SPD_DVDP 0x2 -#define DIP_SPD_DVHS 0x3 -#define DIP_SPD_HDDVR 0x4 -#define DIP_SPD_DVC 0x5 -#define DIP_SPD_DSC 0x6 -#define DIP_SPD_VCD 0x7 -#define DIP_SPD_GAME 0x8 -#define DIP_SPD_PC 0x9 -#define DIP_SPD_BD 0xa -#define DIP_SPD_SCD 0xb - -struct dip_infoframe { -uint8_t type;/* HB0 */ -uint8_t ver;/* HB1 */ -uint8_t len;/* HB2 - body len, not including checksum */ -uint8_t ecc;/* Header ECC */ -uint8_t checksum;/* PB0 */ -union { -struct { -/* PB1 - Y 6:5, A 4:4, B 3:2, S 1:0 */ -uint8_t Y_A_B_S; -/* PB2 - C 7:6, M 5:4, R 3:0 */ -uint8_t C_M_R; -/* PB3 - ITC 7:7, EC 6:4, Q 3:2, SC 1:0 */ -uint8_t ITC_EC_Q_SC; -/* PB4 - VIC 6:0 */ -uint8_t VIC; -/* PB5 - YQ 7:6, CN 5:4, PR 3:0 */ -uint8_t YQ_CN_PR; -/* PB6 to PB13 */ -uint16_t top_bar_end; -uint16_t bottom_bar_start; -uint16_t left_bar_end; -uint16_t right_bar_start; - } __attribute__ ((packed)) avi; -struct { -uint8_t vn[8 ]; -uint8_t pd[16 ]; -uint8_t sdi; - } __attribute__ ((packed)) spd; -uint8_t payload[27 ]; - } __attribute__ ((packed)) body; -} __attribute__((packed)); -struct intel_hdmi {u32 sdvox_reg;int ddc_bus;
@@ -356,7 +297,8 @@ struct intel_hdmi {enum hdmi_force_audio force_audio;bool rgb_quant_range_selectable;void (*write_infoframe)(struct drm_encoder *encoder, -struct dip_infoframe *frame); +uint8_t *frame,ssize_t len, +enum hdmi_infoframe_type type);void (*set_infoframes)(struct drm_encoder *encoder,struct drm_display_mode *adjusted_mode); };
@@ -450,7 +392,6 @@ extern struct intel_hdmi *enc_to_intel_hdmi(struct drm_encoder *encoder);extern bool intel_hdmi_mode_fixup (struct drm_encoder *encoder,const struct drm_display_mode *mode,struct drm_display_mode *adjusted_mode); -extern void intel_dip_infoframe_csum (struct dip_infoframe *avi_if);extern bool intel_sdvo_init (struct drm_device *dev,uint32_t sdvo_reg,bool is_sdvob);extern void intel_dvo_init (struct drm_device *dev);
drivers/gpu/drm/i915/intel_hdmi.c +102 -89
374 lines not on this page · raw message
drivers/gpu/drm/i915/intel_sdvo.c +12 -15
@@ -29,6 +29,7 @@#include <linux/slab.h> #include <linux/delay.h> #include <linux/export.h> +#include <linux/hdmi.h> #include <drm/drmP.h> #include <drm/drm_crtc.h> #include <drm/drm_edid.h>
@@ -951,27 +952,23 @@ static bool intel_sdvo_write_infoframe(struct intel_sdvo *intel_sdvo,static bool intel_sdvo_set_avi_infoframe (struct intel_sdvo *intel_sdvo,const struct drm_display_mode *adjusted_mode) { -struct dip_infoframe avi_if = { - .type =DIP_TYPE_AVI , - .ver =DIP_VERSION_AVI , - .len =DIP_LEN_AVI , - }; -uint8_t sdvo_data[4 +sizeof (avi_if.body.avi)]; +uint8_t sdvo_data[HDMI_AVI_INFOFRAME_SIZE + +HDMI_INFOFRAME_HEADER_SIZE ]; +struct hdmi_avi_infoframe frame; +ssize_t len; + + len =hdmi_avi_infoframe_init (&frame); +WARN (len <0 ,"hdmi_avi_infoframe_init failed!\n" );if (intel_sdvo->rgb_quant_range_selectable) {if (adjusted_mode->private_flags &INTEL_MODE_LIMITED_COLOR_RANGE ) - avi_if.body.avi.ITC_EC_Q_SC |=DIP_AVI_RGB_QUANT_RANGE_LIMITED ; + frame.quantization_range =HDMI_QUANTIZATION_RANGE_LIMITED ;else - avi_if.body.avi.ITC_EC_Q_SC |=DIP_AVI_RGB_QUANT_RANGE_FULL ; + frame.quantization_range =HDMI_QUANTIZATION_RANGE_FULL ; } -intel_dip_infoframe_csum (&avi_if); - -/* sdvo spec says that the ecc is handled by the hw, and it looks like -* we must not send the ecc field, either. */ -memcpy (sdvo_data, &avi_if,3 ); - sdvo_data[3 ] = avi_if.checksum; -memcpy (&sdvo_data[4 ], &avi_if.body,sizeof (avi_if.body.avi)); + len =hdmi_avi_infoframe_pack (&frame, sdvo_data,sizeof (sdvo_data)); +WARN (len <0 ,"hdmi_avi_infoframe_pack failed!\n" ); return intel_sdvo_write_infoframe(intel_sdvo, SDVO_HBUF_INDEX_AVI_IF, SDVO_HBUF_TX_VSYNC,
Signature · 1 line
1.8.1.2
PATCH v5 9/9 drm/radeon: Use generic HDMI infoframe helpers
In reply to Thierry RedingUse the generic HDMI infoframe helpers to get rid of the duplicate implementation in the radeon driver.
--- drivers/gpu/drm/radeon/evergreen_hdmi.c | 85 +++++--------------- drivers/gpu/drm/radeon/r600_hdmi.c | 134 ++++++++++---------------------- 2 files changed, 58 insertions(+), 161 deletions(-)
drivers/gpu/drm/radeon/evergreen_hdmi.c +19 -66
@@ -24,6 +24,7 @@* Authors: Christian König * Rafał Miłecki */ +#include <linux/hdmi.h> #include <drm/drmP.h> #include <drm/radeon_drm.h> #include "radeon.h"
@@ -54,79 +55,18 @@ static void evergreen_hdmi_update_ACR(struct drm_encoder *encoder, uint32_t cloc }/* -* calculate the crc for a given info frame -*/ -static void evergreen_hdmi_infoframe_checksum (uint8_t packetType, -uint8_t versionNumber, -uint8_t length, -uint8_t *frame) -{ -int i; - frame[0 ] = packetType + versionNumber + length; -for (i =1 ; i <= length; i++) - frame[0 ] += frame[i]; - frame[0 ] =0x100 - frame[0 ]; -} - -/* * build a HDMI Video Info Frame */ -static void evergreen_hdmi_videoinfoframe ( -struct drm_encoder *encoder, -uint8_t color_format, -int active_information_present, -uint8_t active_format_aspect_ratio, -uint8_t scan_information, -uint8_t colorimetry, -uint8_t ex_colorimetry, -uint8_t quantization, -int ITC , -uint8_t picture_aspect_ratio, -uint8_t video_format_identification, -uint8_t pixel_repetition, -uint8_t non_uniform_picture_scaling, -uint8_t bar_info_data_valid, -uint16_t top_bar, -uint16_t bottom_bar, -uint16_t left_bar, -uint16_t right_bar -) +static void evergreen_hdmi_update_avi_infoframe (struct drm_encoder *encoder, +void *buffer,size_t size) {struct drm_device *dev = encoder->dev;struct radeon_device *rdev = dev->dev_private;struct radeon_encoder *radeon_encoder =to_radeon_encoder (encoder);struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv;uint32_t offset = dig->afmt->offset; +uint8_t *frame = buffer +3 ; -uint8_t frame[14 ]; - - frame[0x0 ] =0 ; - frame[0x1 ] = - (scan_information &0x3 ) | - ((bar_info_data_valid &0x3 ) <<2 ) | - ((active_information_present &0x1 ) <<4 ) | - ((color_format &0x3 ) <<5 ); - frame[0x2 ] = - (active_format_aspect_ratio &0xF ) | - ((picture_aspect_ratio &0x3 ) <<4 ) | - ((colorimetry &0x3 ) <<6 ); - frame[0x3 ] = - (non_uniform_picture_scaling &0x3 ) | - ((quantization &0x3 ) <<2 ) | - ((ex_colorimetry &0x7 ) <<4 ) | - ((ITC &0x1 ) <<7 ); - frame[0x4 ] = (video_format_identification &0x7F ); - frame[0x5 ] = (pixel_repetition &0xF ); - frame[0x6 ] = (top_bar &0xFF ); - frame[0x7 ] = (top_bar >>8 ); - frame[0x8 ] = (bottom_bar &0xFF ); - frame[0x9 ] = (bottom_bar >>8 ); - frame[0xA ] = (left_bar &0xFF ); - frame[0xB ] = (left_bar >>8 ); - frame[0xC ] = (right_bar &0xFF ); - frame[0xD ] = (right_bar >>8 ); - -evergreen_hdmi_infoframe_checksum (0x82 ,0x02 ,0x0D , frame);/* Our header values (type, version, length) should be alright, Intel * is using the same. Checksum function also seems to be OK, it works * fine for audio infoframe. However calculated value is always lower
@@ -154,7 +94,10 @@ void evergreen_hdmi_setmode(struct drm_encoder *encoder, struct drm_display_modestruct radeon_device *rdev = dev->dev_private;struct radeon_encoder *radeon_encoder =to_radeon_encoder (encoder);struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv; +u8 buffer[HDMI_INFOFRAME_HEADER_SIZE +HDMI_AVI_INFOFRAME_SIZE ]; +struct hdmi_avi_infoframe frame;uint32_t offset; +ssize_t err;/* Silent, r600_hdmi_enable will raise WARN for us */ if (!dig->afmt->enabled)
@@ -200,9 +143,19 @@ void evergreen_hdmi_setmode(struct drm_encoder *encoder, struct drm_display_modeWREG32 (HDMI_GC + offset,0 );/* unset HDMI_GC_AVMUTE */ -evergreen_hdmi_videoinfoframe (encoder,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 , -0 ,0 ,0 ,0 ,0 ,0 ); + err =drm_hdmi_avi_infoframe_from_display_mode (&frame, mode); +if (err <0 ) { +DRM_ERROR ("failed to setup AVI infoframe: %zd\n" , err); +return ; + } + + err =hdmi_avi_infoframe_pack (&frame, buffer,sizeof (buffer)); +if (err <0 ) { +DRM_ERROR ("failed to pack AVI infoframe: %zd\n" , err); +return ; + } +evergreen_hdmi_update_avi_infoframe (encoder, buffer,sizeof (buffer));evergreen_hdmi_update_ACR (encoder, mode->clock);/* it's unknown what these bits do excatly, but it's indeed quite useful for debugging */
drivers/gpu/drm/radeon/r600_hdmi.c +39 -95
196 lines not on this page · raw message
Signature · 6 lines
1.8.1.2 _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel