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

Commit e1dee197 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-next-2015-04-23-fixed' of... 

Merge tag 'drm-intel-next-2015-04-23-fixed' of git://anongit.freedesktop.org/drm-intel into drm-next

drm-intel-next-2015-04-23:
- dither support for ns2501 dvo (Thomas Richter)
- some polish for the gtt code and fixes to finally enable the cmd parser on hsw
- first pile of bxt stage 1 enabling (too many different people to list ...)
- more psr fixes from Rodrigo
- skl rotation support from Chandra
- more atomic work from Ander and Matt
- pile of cleanups and micro-ops for execlist from Chris
drm-intel-next-2015-04-10:
- cdclk handling cleanup and fixes from Ville
- more prep patches for olr removal from John Harrison
- gmbus pin naming rework from Jani (prep for bxt)
- remove ->new_config from Ander (more atomic conversion work)
- rps (boost) tuning and unification with byt/bsw from Chris
- cmd parser batch bool tuning from Chris
- gen8 dynamic pte allocation (Michel Thierry, based on work from Ben Widawsky)
- execlist tuning (not yet all of it) from Chris
- add drm_plane_from_index (Chandra)
- various small things all over

* tag 'drm-intel-next-2015-04-23-fixed' of git://anongit.freedesktop.org/drm-intel: (204 commits)
  drm/i915/gtt: Allocate va range only if vma is not bound
  drm/i915: Enable cmd parser to do secure batch promotion for aliasing ppgtt
  drm/i915: fix intel_prepare_ddi
  drm/i915: factor out ddi_get_encoder_port
  drm/i915/hdmi: check port in ibx_infoframe_enabled
  drm/i915/hdmi: fix vlv infoframe port check
  drm/i915: Silence compiler warning in dvo
  drm/i915: Update DRIVER_DATE to 20150423
  drm/i915: Enable dithering on NatSemi DVO2501 for Fujitsu S6010
  rm/i915: Move i915_get_ggtt_vma_pages into ggtt_bind_vma
  drm/i915: Don't try to outsmart gcc in i915_gem_gtt.c
  drm/i915: Unduplicate i915_ggtt_unbind/bind_vma
  drm/i915: Move ppgtt_bind/unbind around
  drm/i915: move i915_gem_restore_gtt_mappings around
  drm/i915: Fix up the vma aliasing ppgtt binding
  drm/i915: Remove misleading comment around bind_to_vm
  drm/i915: Don't use atomics for pg_dirty_rings
  drm/i915: Don't look at pg_dirty_rings for aliasing ppgtt
  drm/i915/skl: Support Y tiling in MMIO flips
  drm/i915: Fixup kerneldoc for struct intel_context
  ...

Conflicts:
	drivers/gpu/drm/i915/i915_drv.c
parents c0fe07aa 93a96c6f

Documentation/DocBook/drm.tmpl

+2 −2
Original line number Diff line number Diff line
@@ -4067,7 +4067,7 @@ int num_ioctls;</synopsis> 
        <title>DPIO</title>

!Pdrivers/gpu/drm/i915/i915_reg.h DPIO

	<table id="dpiox2">

	  <title>Dual channel PHY (VLV/CHV)</title>

	  <title>Dual channel PHY (VLV/CHV/BXT)</title>

	  <tgroup cols="8">

	    <colspec colname="c0" />

	    <colspec colname="c1" />
@@ -4118,7 +4118,7 @@ int num_ioctls;</synopsis> 
	  </tgroup>

	</table>

	<table id="dpiox1">

	  <title>Single channel PHY (CHV)</title>

	  <title>Single channel PHY (CHV/BXT)</title>

	  <tgroup cols="4">

	    <colspec colname="c0" />

	    <colspec colname="c1" />

arch/x86/kernel/early-quirks.c

+1 −0
Original line number Diff line number Diff line
@@ -546,6 +546,7 @@ static const struct pci_device_id intel_stolen_ids[] __initconst = { 
	INTEL_BDW_D_IDS(&gen8_stolen_funcs),

	INTEL_CHV_IDS(&chv_stolen_funcs),

	INTEL_SKL_IDS(&gen9_stolen_funcs),

	INTEL_BXT_IDS(&gen9_stolen_funcs),

};



static void __init intel_graphics_stolen(int num, int slot, int func)

drivers/gpu/drm/drm_crtc.c

+23 −0
Original line number Diff line number Diff line
@@ -1288,6 +1288,29 @@ unsigned int drm_plane_index(struct drm_plane *plane) 
}

EXPORT_SYMBOL(drm_plane_index);



/**

 * drm_plane_from_index - find the registered plane at an index

 * @dev: DRM device

 * @idx: index of registered plane to find for

 *

 * Given a plane index, return the registered plane from DRM device's

 * list of planes with matching index.

 */

struct drm_plane *

drm_plane_from_index(struct drm_device *dev, int idx)

{

	struct drm_plane *plane;

	unsigned int i = 0;



	list_for_each_entry(plane, &dev->mode_config.plane_list, head) {

		if (i == idx)

			return plane;

		i++;

	}

	return NULL;

}

EXPORT_SYMBOL(drm_plane_from_index);



/**

 * drm_plane_force_disable - Forcibly disable a plane

 * @plane: plane to disable

drivers/gpu/drm/i915/dvo_ivch.c

+18 −3
Original line number Diff line number Diff line
@@ -23,6 +23,9 @@ 
 * Authors:

 *    Eric Anholt <eric@anholt.net>

 *

 * Minor modifications (Dithering enable):

 *    Thomas Richter <thor@math.tu-berlin.de>

 *

 */



#include "dvo.h"
@@ -59,6 +62,8 @@ 
# define VR01_DVO_BYPASS_ENABLE		(1 << 1)

/** Enables the DVO clock */

# define VR01_DVO_ENABLE		(1 << 0)

/** Enable dithering for 18bpp panels. Not documented. */

# define VR01_DITHER_ENABLE             (1 << 4)



/*

 * LCD Interface Format
@@ -74,6 +79,8 @@ 
# define VR10_INTERFACE_2X18		(2 << 2)

/** Enables 2x24-bit LVDS output */

# define VR10_INTERFACE_2X24		(3 << 2)

/** Mask that defines the depth of the pipeline */

# define VR10_INTERFACE_DEPTH_MASK      (3 << 2)



/*

 * VR20 LCD Horizontal Display Size
@@ -342,9 +349,15 @@ static void ivch_mode_set(struct intel_dvo_device *dvo, 
			  struct drm_display_mode *adjusted_mode)

{

	uint16_t vr40 = 0;

	uint16_t vr01;

	uint16_t vr01 = 0;

	uint16_t vr10;



	ivch_read(dvo, VR10, &vr10);

	/* Enable dithering for 18 bpp pipelines */

	vr10 &= VR10_INTERFACE_DEPTH_MASK;

	if (vr10 == VR10_INTERFACE_2X18 || vr10 == VR10_INTERFACE_1X18)

		vr01 = VR01_DITHER_ENABLE;



	vr01 = 0;

	vr40 = (VR40_STALL_ENABLE | VR40_VERTICAL_INTERP_ENABLE |

		VR40_HORIZONTAL_INTERP_ENABLE);
@@ -353,7 +366,7 @@ static void ivch_mode_set(struct intel_dvo_device *dvo, 
		uint16_t x_ratio, y_ratio;



		vr01 |= VR01_PANEL_FIT_ENABLE;

		vr40 |= VR40_CLOCK_GATING_ENABLE;

		vr40 |= VR40_CLOCK_GATING_ENABLE | VR40_ENHANCED_PANEL_FITTING;

		x_ratio = (((mode->hdisplay - 1) << 16) /

			   (adjusted_mode->hdisplay - 1)) >> 2;

		y_ratio = (((mode->vdisplay - 1) << 16) /
@@ -380,6 +393,8 @@ static void ivch_dump_regs(struct intel_dvo_device *dvo) 
	DRM_DEBUG_KMS("VR00: 0x%04x\n", val);

	ivch_read(dvo, VR01, &val);

	DRM_DEBUG_KMS("VR01: 0x%04x\n", val);

	ivch_read(dvo, VR10, &val);

	DRM_DEBUG_KMS("VR10: 0x%04x\n", val);

	ivch_read(dvo, VR30, &val);

	DRM_DEBUG_KMS("VR30: 0x%04x\n", val);

	ivch_read(dvo, VR40, &val);

drivers/gpu/drm/i915/dvo_ns2501.c

+374 −296

File changed.

Preview size limit exceeded, changes collapsed.