Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 28ee4618 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'drm/hdmi-for-3.9' of git://anongit.freedesktop.org/tegra/linux into drm-next 

Thierry writes:
"Remove a duplicate implementation of the CEA VIC lookup and move the CEA
and other mode tables to drm_edid.c to make it more difficult to create
duplicates of the tables.

Add some helpers to pack CEA-861/HDMI AVI, audio and SPD infoframes into
binary buffers that can easily be written into hardware registers. A new
helper function makes it easy construct an AVI infoframe from a DRM
display mode.

Convert the Tegra and Radeon drivers to use the new HDMI helpers."
* 'drm/hdmi-for-3.9' of git://anongit.freedesktop.org/tegra/linux:
  drm/radeon: Use generic HDMI infoframe helpers
  drm/tegra: Use generic HDMI infoframe helpers
  drm: Add EDID helper documentation
  drm: Add HDMI infoframe helpers
  video: Add generic HDMI infoframe helpers
  drm: Add some missing forward declarations
  drm: Move mode tables to drm_edid.c
  drm: Remove duplicate drm_mode_cea_vic()
parents a497bfe9 e3b2e034

Documentation/DocBook/drm.tmpl

+4 −0
Original line number Diff line number Diff line
@@ -2157,6 +2157,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 -->

drivers/gpu/drm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -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

+777 −21

File changed.

Preview size limit exceeded, changes collapsed.

drivers/gpu/drm/drm_edid_modes.h

deleted100644 → 0
+0 −774

File deleted.

Preview size limit exceeded, changes collapsed.

drivers/gpu/drm/i915/intel_dp.c

+1 −1
Original line number Diff line number Diff line
@@ -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;