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

Commit 31fa6840 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued 



Backmerge because:
- Maarten needs latest atomic patches from drm-misc.
- Lionel needs the color manager core patch from drm-misc.
- Ander extracted intel_dpll_mgr.c, we need a backmerge to avoid git
  losing track of things too often (right now it seems ok due to
  cherry-picks).
- Tvrtko needs a stable baseline to apply some large-scale renaming
  patches to i915 GEM code.

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
parents 359d2243 86d65b7e

Documentation/DocBook/device-drivers.tmpl

+1 −0
Original line number Diff line number Diff line
@@ -229,6 +229,7 @@ X!Isound/sound_firmware.c 
!Iinclude/media/v4l2-dv-timings.h

!Iinclude/media/v4l2-event.h

!Iinclude/media/v4l2-flash-led-class.h

!Iinclude/media/v4l2-mc.h

!Iinclude/media/v4l2-mediabus.h

!Iinclude/media/v4l2-mem2mem.h

!Iinclude/media/v4l2-of.h

Documentation/DocBook/gpu.tmpl

+57 −2
Original line number Diff line number Diff line
@@ -1816,7 +1816,7 @@ void intel_crt_init(struct drm_device *dev) 
	<td valign="top" >Description/Restrictions</td>

	</tr>

	<tr>

	<td rowspan="37" valign="top" >DRM</td>

	<td rowspan="42" valign="top" >DRM</td>

	<td valign="top" >Generic</td>

	<td valign="top" >“rotation”</td>

	<td valign="top" >BITMASK</td>
@@ -2068,7 +2068,7 @@ void intel_crt_init(struct drm_device *dev) 
	<td valign="top" >property to suggest an Y offset for a connector</td>

	</tr>

	<tr>

	<td rowspan="3" valign="top" >Optional</td>

	<td rowspan="8" valign="top" >Optional</td>

	<td valign="top" >“scaling mode”</td>

	<td valign="top" >ENUM</td>

	<td valign="top" >{ "None", "Full", "Center", "Full aspect" }</td>
@@ -2092,6 +2092,61 @@ void intel_crt_init(struct drm_device *dev) 
	<td valign="top" >TBD</td>

	</tr>

	<tr>

	<td valign="top" >“DEGAMMA_LUT”</td>

	<td valign="top" >BLOB</td>

	<td valign="top" >0</td>

	<td valign="top" >CRTC</td>

	<td valign="top" >DRM property to set the degamma lookup table

		(LUT) mapping pixel data from the framebuffer before it is

		given to the transformation matrix. The data is an interpreted

		as an array of struct drm_color_lut elements. Hardware might

		choose not to use the full precision of the LUT elements nor

		use all the elements of the LUT (for example the hardware

		might choose to interpolate between LUT[0] and LUT[4]). </td>

	</tr>

	<tr>

	<td valign="top" >“DEGAMMA_LUT_SIZE”</td>

	<td valign="top" >RANGE | IMMUTABLE</td>

	<td valign="top" >Min=0, Max=UINT_MAX</td>

	<td valign="top" >CRTC</td>

	<td valign="top" >DRM property to gives the size of the lookup

		table to be set on the DEGAMMA_LUT property (the size depends

		on the underlying hardware).</td>

	</tr>

	<tr>

	<td valign="top" >“CTM”</td>

	<td valign="top" >BLOB</td>

	<td valign="top" >0</td>

	<td valign="top" >CRTC</td>

	<td valign="top" >DRM property to set the current

		transformation matrix (CTM) apply to pixel data after the

		lookup through the degamma LUT and before the lookup through

		the gamma LUT. The data is an interpreted as a struct

		drm_color_ctm.</td>

	</tr>

	<tr>

	<td valign="top" >“GAMMA_LUT”</td>

	<td valign="top" >BLOB</td>

	<td valign="top" >0</td>

	<td valign="top" >CRTC</td>

	<td valign="top" >DRM property to set the gamma lookup table

		(LUT) mapping pixel data after to the transformation matrix to

		data sent to the connector. The data is an interpreted as an

		array of struct drm_color_lut elements. Hardware might choose

		not to use the full precision of the LUT elements nor use all

		the elements of the LUT (for example the hardware might choose

		to interpolate between LUT[0] and LUT[4]).</td>

	</tr>

	<tr>

	<td valign="top" >“GAMMA_LUT_SIZE”</td>

	<td valign="top" >RANGE | IMMUTABLE</td>

	<td valign="top" >Min=0, Max=UINT_MAX</td>

	<td valign="top" >CRTC</td>

	<td valign="top" >DRM property to gives the size of the lookup

		table to be set on the GAMMA_LUT property (the size depends on

		the underlying hardware).</td>

	</tr>

	<tr>

	<td rowspan="20" valign="top" >i915</td>

	<td rowspan="2" valign="top" >Generic</td>

	<td valign="top" >"Broadcast RGB"</td>

Documentation/DocBook/media/v4l/controls.xml

+58 −0
Original line number Diff line number Diff line
@@ -2329,6 +2329,14 @@ to search and match for the present Macroblock (MB) in the reference picture. Th 
vertical search range for motion estimation module in video encoder.</entry>

	      </row>



	      <row><entry></entry></row>

	      <row id="v4l2-mpeg-video-force-key-frame">

		<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME</constant>&nbsp;</entry>

		<entry>button</entry>

	      </row><row><entry spanname="descr">Force a key frame for the next queued buffer. Applicable to encoders.

This is a general, codec-agnostic keyframe control.</entry>

	      </row>



	      <row><entry></entry></row>

	      <row>

		<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_H264_CPB_SIZE</constant>&nbsp;</entry>
@@ -5069,6 +5077,46 @@ interface and may change in the future.</para> 
	    This control is applicable to VGA, DVI-A/D, HDMI and DisplayPort connectors.

	    </entry>

	  </row>

	  <row>

	    <entry spanname="id"><constant>V4L2_CID_DV_TX_IT_CONTENT_TYPE</constant></entry>

	    <entry id="v4l2-dv-content-type">enum v4l2_dv_it_content_type</entry>

	  </row>

	  <row><entry spanname="descr">Configures the IT Content Type

	    of the transmitted video. This information is sent over HDMI and DisplayPort connectors

	    as part of the AVI InfoFrame. The term 'IT Content' is used for content that originates

	    from a computer as opposed to content from a TV broadcast or an analog source. The

	    enum&nbsp;v4l2_dv_it_content_type defines the possible content types:</entry>

	  </row>

	  <row>

	    <entrytbl spanname="descr" cols="2">

	      <tbody valign="top">

	        <row>

	          <entry><constant>V4L2_DV_IT_CONTENT_TYPE_GRAPHICS</constant>&nbsp;</entry>

		  <entry>Graphics content. Pixel data should be passed unfiltered and without

		  analog reconstruction.</entry>

		</row>

	        <row>

	          <entry><constant>V4L2_DV_IT_CONTENT_TYPE_PHOTO</constant>&nbsp;</entry>

		  <entry>Photo content. The content is derived from digital still pictures.

		  The content should be passed through with minimal scaling and picture

		  enhancements.</entry>

		</row>

	        <row>

	          <entry><constant>V4L2_DV_IT_CONTENT_TYPE_CINEMA</constant>&nbsp;</entry>

		  <entry>Cinema content.</entry>

		</row>

	        <row>

	          <entry><constant>V4L2_DV_IT_CONTENT_TYPE_GAME</constant>&nbsp;</entry>

		  <entry>Game content. Audio and video latency should be minimized.</entry>

		</row>

	        <row>

	          <entry><constant>V4L2_DV_IT_CONTENT_TYPE_NO_ITC</constant>&nbsp;</entry>

		  <entry>No IT Content information is available and the ITC bit in the AVI

		  InfoFrame is set to 0.</entry>

		</row>

	      </tbody>

	    </entrytbl>

	  </row>

	  <row>

	    <entry spanname="id"><constant>V4L2_CID_DV_RX_POWER_PRESENT</constant></entry>

	    <entry>bitmask</entry>
@@ -5098,6 +5146,16 @@ interface and may change in the future.</para> 
	    This control is applicable to VGA, DVI-A/D, HDMI and DisplayPort connectors.

	    </entry>

	  </row>

	  <row>

	    <entry spanname="id"><constant>V4L2_CID_DV_RX_IT_CONTENT_TYPE</constant></entry>

	    <entry>enum v4l2_dv_it_content_type</entry>

	  </row>

	  <row><entry spanname="descr">Reads the IT Content Type

	    of the received video. This information is sent over HDMI and DisplayPort connectors

	    as part of the AVI InfoFrame. The term 'IT Content' is used for content that originates

	    from a computer as opposed to content from a TV broadcast or an analog source. See

	    <constant>V4L2_CID_DV_TX_IT_CONTENT_TYPE</constant> for the available content types.</entry>

	  </row>

	  <row><entry></entry></row>

	</tbody>

      </tgroup>

Documentation/DocBook/media/v4l/media-ioc-g-topology.xml

+0 −3
Original line number Diff line number Diff line
@@ -48,9 +48,6 @@ 


  <refsect1>

    <title>Description</title>



    <para><emphasis role="bold">NOTE:</emphasis> This new ioctl is programmed to be added on Kernel 4.6. Its definition/arguments may change until its final version.</para>



    <para>The typical usage of this ioctl is to call it twice.

    On the first call, the structure defined at &media-v2-topology; should

    be zeroed. At return, if no errors happen, this ioctl will return the

Documentation/DocBook/media/v4l/media-types.xml

+28 −5
Original line number Diff line number Diff line
@@ -56,10 +56,6 @@ 
	    <entry><constant>MEDIA_ENT_F_CONN_COMPOSITE</constant></entry>

	    <entry>Connector for a RGB composite signal.</entry>

	  </row>

	  <row>

	    <entry><constant>MEDIA_ENT_F_CONN_TEST</constant></entry>

	    <entry>Connector for a test generator.</entry>

	  </row>

	  <row>

	    <entry><constant>MEDIA_ENT_F_CAM_SENSOR</constant></entry>

	    <entry>Camera video sensor entity.</entry>
@@ -84,7 +80,34 @@ 
	  </row>

	  <row>

	    <entry><constant>MEDIA_ENT_F_TUNER</constant></entry>

	    <entry>Digital TV, analog TV, radio and/or software radio tuner.</entry>

	    <entry>Digital TV, analog TV, radio and/or software radio tuner,

		   with consists on a PLL tuning stage that converts radio

		   frequency (RF) signal into an Intermediate Frequency (IF).

		   Modern tuners have internally IF-PLL decoders for audio

		   and video, but older models have those stages implemented

		   on separate entities.

	    </entry>

	  </row>

	  <row>

	    <entry><constant>MEDIA_ENT_F_IF_VID_DECODER</constant></entry>

	    <entry>IF-PLL video decoder. It receives the IF from a PLL

		   and decodes the analog TV video signal. This is commonly

		   found on some very old analog tuners, like Philips MK3

		   designs. They all contain a tda9887 (or some software

		   compatible similar chip, like tda9885). Those devices

		   use a different I2C address than the tuner PLL.

	    </entry>

	  </row>

	  <row>

	    <entry><constant>MEDIA_ENT_F_IF_AUD_DECODER</constant></entry>

	    <entry>IF-PLL sound decoder. It receives the IF from a PLL

		   and decodes the analog TV audio signal. This is commonly

		   found on some very old analog hardware, like Micronas

		   msp3400, Philips tda9840, tda985x, etc. Those devices

		   use a different I2C address than the tuner PLL and

		   should be controlled together with the IF-PLL video

		   decoder.

	    </entry>

	  </row>

	</tbody>

      </tgroup>