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

Commit 1a4be38a authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'topic/drm-misc-2016-03-14' of git://anongit.freedesktop.org/drm-intel into drm-next 

* tag 'topic/drm-misc-2016-03-14' of git://anongit.freedesktop.org/drm-intel: (27 commits)
  drm: atomic helper: do not unreference error pointer
  drm/edid: Extract SADs properly from multiple audio data blocks
  drm: fix blob pointer check
  drm: introduce pipe color correction properties
  drm/atomic: Clean up update_connector_routing.
  drm/atomic: Clean up steal_encoder, v2.
  drm/atomic: Handle encoder assignment conflicts in a separate check, v3.
  drm/atomic: Handle encoder stealing from set_config better.
  drm/atomic: Always call steal_encoder, v2.
  drm/ast: removed optional dummy crtc mode_fixup function.
  drm/bochs: removed optional dummy crtc mode_fixup function.
  drm/fsl-dcu: removed optional dummy crtc mode_fixup function.
  drm/virtio: removed optional dummy crtc mode_fixup function.
  drm/nouveau/dispnv04: removed optional dummy crtc mode_fixup function.
  drm/atmel-hlcdc: remove optional dummy crtc mode_fixup function.
  drm/sti: removed optional dummy crtc mode_fixup function.
  drm/shmobile: removed optional dummy crtc mode_fixup function.
  drm/msm/mdp: removed optional dummy crtc mode_fixup function.
  drm/omapdrm: removed optional dummy crtc mode_fixup function.
  drm/rcar-du: removed optional dummy crtc mode_fixup function.
  ...
parents c51e034f c1f415c9

Documentation/DocBook/gpu.tmpl

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

	<td valign="top" >Description/Restrictions</td>

	</tr>

	</tr>

	<tr>

	<tr>

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

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

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

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

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

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

	<td valign="top" >BITMASK</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>

	<td valign="top" >property to suggest an Y offset for a connector</td>

	</tr>

	</tr>

	<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" >“scaling mode”</td>

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

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

	<td valign="top" >{ "None", "Full", "Center", "Full aspect" }</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>

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

	</tr>

	</tr>

	<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="20" valign="top" >i915</td>

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

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

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

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

drivers/gpu/drm/ast/ast_mode.c

+0 −8
Original line number Original line Diff line number Diff line
@@ -497,13 +497,6 @@ static void ast_crtc_dpms(struct drm_crtc *crtc, int mode) 
	}

	}

}

}





static bool ast_crtc_mode_fixup(struct drm_crtc *crtc,

				const struct drm_display_mode *mode,

				struct drm_display_mode *adjusted_mode)

{

	return true;

}



/* ast is different - we will force move buffers out of VRAM */

/* ast is different - we will force move buffers out of VRAM */

static int ast_crtc_do_set_base(struct drm_crtc *crtc,

static int ast_crtc_do_set_base(struct drm_crtc *crtc,

				struct drm_framebuffer *fb,

				struct drm_framebuffer *fb,
@@ -617,7 +610,6 @@ static void ast_crtc_commit(struct drm_crtc *crtc) 




static const struct drm_crtc_helper_funcs ast_crtc_helper_funcs = {

static const struct drm_crtc_helper_funcs ast_crtc_helper_funcs = {

	.dpms = ast_crtc_dpms,

	.dpms = ast_crtc_dpms,

	.mode_fixup = ast_crtc_mode_fixup,

	.mode_set = ast_crtc_mode_set,

	.mode_set = ast_crtc_mode_set,

	.mode_set_base = ast_crtc_mode_set_base,

	.mode_set_base = ast_crtc_mode_set_base,

	.disable = ast_crtc_disable,

	.disable = ast_crtc_disable,

drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c

+0 −9
Original line number Original line Diff line number Diff line
@@ -121,13 +121,6 @@ static void atmel_hlcdc_crtc_mode_set_nofb(struct drm_crtc *c) 
			   cfg);

			   cfg);

}

}





static bool atmel_hlcdc_crtc_mode_fixup(struct drm_crtc *crtc,

					const struct drm_display_mode *mode,

					struct drm_display_mode *adjusted_mode)

{

	return true;

}



static void atmel_hlcdc_crtc_disable(struct drm_crtc *c)

static void atmel_hlcdc_crtc_disable(struct drm_crtc *c)

{

{

	struct drm_device *dev = c->dev;

	struct drm_device *dev = c->dev;
@@ -261,7 +254,6 @@ static void atmel_hlcdc_crtc_atomic_flush(struct drm_crtc *crtc, 
}

}





static const struct drm_crtc_helper_funcs lcdc_crtc_helper_funcs = {

static const struct drm_crtc_helper_funcs lcdc_crtc_helper_funcs = {

	.mode_fixup = atmel_hlcdc_crtc_mode_fixup,

	.mode_set = drm_helper_crtc_mode_set,

	.mode_set = drm_helper_crtc_mode_set,

	.mode_set_nofb = atmel_hlcdc_crtc_mode_set_nofb,

	.mode_set_nofb = atmel_hlcdc_crtc_mode_set_nofb,

	.mode_set_base = drm_helper_crtc_mode_set_base,

	.mode_set_base = drm_helper_crtc_mode_set_base,
@@ -349,4 +341,3 @@ int atmel_hlcdc_crtc_create(struct drm_device *dev) 
	atmel_hlcdc_crtc_destroy(&crtc->base);

	atmel_hlcdc_crtc_destroy(&crtc->base);

	return ret;

	return ret;

}
 
}

drivers/gpu/drm/bochs/bochs_kms.c

+0 −8
Original line number Original line Diff line number Diff line
@@ -30,13 +30,6 @@ static void bochs_crtc_dpms(struct drm_crtc *crtc, int mode) 
	}

	}

}

}





static bool bochs_crtc_mode_fixup(struct drm_crtc *crtc,

				  const struct drm_display_mode *mode,

				  struct drm_display_mode *adjusted_mode)

{

	return true;

}



static int bochs_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y,

static int bochs_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y,

				    struct drm_framebuffer *old_fb)

				    struct drm_framebuffer *old_fb)

{

{
@@ -135,7 +128,6 @@ static const struct drm_crtc_funcs bochs_crtc_funcs = { 




static const struct drm_crtc_helper_funcs bochs_helper_funcs = {

static const struct drm_crtc_helper_funcs bochs_helper_funcs = {

	.dpms = bochs_crtc_dpms,

	.dpms = bochs_crtc_dpms,

	.mode_fixup = bochs_crtc_mode_fixup,

	.mode_set = bochs_crtc_mode_set,

	.mode_set = bochs_crtc_mode_set,

	.mode_set_base = bochs_crtc_mode_set_base,

	.mode_set_base = bochs_crtc_mode_set_base,

	.prepare = bochs_crtc_prepare,

	.prepare = bochs_crtc_prepare,

drivers/gpu/drm/cirrus/cirrus_mode.c

+0 −13
Original line number Original line Diff line number Diff line
@@ -91,18 +91,6 @@ static void cirrus_crtc_dpms(struct drm_crtc *crtc, int mode) 
	WREG_GFX(0xe, gr0e);

	WREG_GFX(0xe, gr0e);

}

}





/*

 * The core passes the desired mode to the CRTC code to see whether any

 * CRTC-specific modifications need to be made to it. We're in a position

 * to just pass that straight through, so this does nothing

 */

static bool cirrus_crtc_mode_fixup(struct drm_crtc *crtc,

				   const struct drm_display_mode *mode,

				   struct drm_display_mode *adjusted_mode)

{

	return true;

}



static void cirrus_set_start_address(struct drm_crtc *crtc, unsigned offset)

static void cirrus_set_start_address(struct drm_crtc *crtc, unsigned offset)

{

{

	struct cirrus_device *cdev = crtc->dev->dev_private;

	struct cirrus_device *cdev = crtc->dev->dev_private;
@@ -372,7 +360,6 @@ static const struct drm_crtc_funcs cirrus_crtc_funcs = { 




static const struct drm_crtc_helper_funcs cirrus_helper_funcs = {

static const struct drm_crtc_helper_funcs cirrus_helper_funcs = {

	.dpms = cirrus_crtc_dpms,

	.dpms = cirrus_crtc_dpms,

	.mode_fixup = cirrus_crtc_mode_fixup,

	.mode_set = cirrus_crtc_mode_set,

	.mode_set = cirrus_crtc_mode_set,

	.mode_set_base = cirrus_crtc_mode_set_base,

	.mode_set_base = cirrus_crtc_mode_set_base,

	.prepare = cirrus_crtc_prepare,

	.prepare = cirrus_crtc_prepare,