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

Commit 155e36d4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux 

Pull drm fixes from Dave Airlie:
 "A bunch of scattered fixes ati/intel/nouveau, couple of core ones,
  nothing too shocking or different."

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm: Add EDID_QUIRK_FORCE_REDUCED_BLANKING for ASUS VW222S
  gma500: Consider CRTC initially active.
  drm/radeon: fix dig encoder selection on DCE61
  drm/radeon: fix double free in radeon_gpu_reset
  drm/radeon: force dma32 to fix regression rs4xx,rs6xx,rs740
  drm/radeon: rework panel mode setup
  drm/radeon/atom: powergating fixes for DCE6
  drm/radeon/atom: rework DIG modesetting on DCE3+
  drm/radeon: don't disable plls that are in use by other crtcs
  drm/radeon: add proper checking of RESOLVE_BOX command for r600-r700
  drm/radeon: initialize tracked CS state
  drm/radeon: fix reading CB_COLORn_MASK from the CS
  drm/nvc0/copy: check PUNITS to determine which copy engines are disabled
  i915: Quirk no_lvds on Gigabyte GA-D525TUD ITX motherboard
  drm/i915: Use the correct size of the GTT for placing the per-process entries
  drm: Check for invalid cursor flags
  drm: Initialize object type when using DRM_MODE() macro
  drm/i915: fix color order for BGR formats on IVB
  drm/i915: fix wrong order of parameters in port checking functions
parents 318e1510 6f33814b

drivers/gpu/drm/drm_crtc.c

+1 −1
Original line number Diff line number Diff line
@@ -1981,7 +1981,7 @@ int drm_mode_cursor_ioctl(struct drm_device *dev, 
	if (!drm_core_check_feature(dev, DRIVER_MODESET))

		return -EINVAL;



	if (!req->flags)

	if (!req->flags || (~DRM_MODE_CURSOR_FLAGS & req->flags))

		return -EINVAL;



	mutex_lock(&dev->mode_config.mutex);

drivers/gpu/drm/drm_edid.c

+3 −0
Original line number Diff line number Diff line
@@ -87,6 +87,9 @@ static struct edid_quirk { 
	int product_id;

	u32 quirks;

} edid_quirk_list[] = {

	/* ASUS VW222S */

	{ "ACI", 0x22a2, EDID_QUIRK_FORCE_REDUCED_BLANKING },



	/* Acer AL1706 */

	{ "ACR", 44358, EDID_QUIRK_PREFER_LARGE_60 },

	/* Acer F51 */

drivers/gpu/drm/gma500/psb_intel_display.c

+3 −0
Original line number Diff line number Diff line
@@ -1362,6 +1362,9 @@ void psb_intel_crtc_init(struct drm_device *dev, int pipe, 
	    (struct drm_connector **) (psb_intel_crtc + 1);

	psb_intel_crtc->mode_set.num_connectors = 0;

	psb_intel_cursor_init(dev, psb_intel_crtc);



	/* Set to true so that the pipe is forced off on initial config. */

	psb_intel_crtc->active = true;

}



int psb_intel_get_pipe_from_crtc_id(struct drm_device *dev, void *data,

drivers/gpu/drm/i915/i915_gem_gtt.c

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ int i915_gem_init_aliasing_ppgtt(struct drm_device *dev) 
	/* ppgtt PDEs reside in the global gtt pagetable, which has 512*1024

	 * entries. For aliasing ppgtt support we just steal them at the end for

	 * now. */

	first_pd_entry_in_global_pt = 512*1024 - I915_PPGTT_PD_ENTRIES;

	first_pd_entry_in_global_pt = dev_priv->mm.gtt->gtt_total_entries - I915_PPGTT_PD_ENTRIES;



	ppgtt = kzalloc(sizeof(*ppgtt), GFP_KERNEL);

	if (!ppgtt)

drivers/gpu/drm/i915/intel_display.c

+6 −6
Original line number Diff line number Diff line
@@ -1384,7 +1384,7 @@ static void assert_pch_hdmi_disabled(struct drm_i915_private *dev_priv, 
				     enum pipe pipe, int reg)

{

	u32 val = I915_READ(reg);

	WARN(hdmi_pipe_enabled(dev_priv, val, pipe),

	WARN(hdmi_pipe_enabled(dev_priv, pipe, val),

	     "PCH HDMI (0x%08x) enabled on transcoder %c, should be disabled\n",

	     reg, pipe_name(pipe));
@@ -1404,13 +1404,13 @@ static void assert_pch_ports_disabled(struct drm_i915_private *dev_priv, 


	reg = PCH_ADPA;

	val = I915_READ(reg);

	WARN(adpa_pipe_enabled(dev_priv, val, pipe),

	WARN(adpa_pipe_enabled(dev_priv, pipe, val),

	     "PCH VGA enabled on transcoder %c, should be disabled\n",

	     pipe_name(pipe));



	reg = PCH_LVDS;

	val = I915_READ(reg);

	WARN(lvds_pipe_enabled(dev_priv, val, pipe),

	WARN(lvds_pipe_enabled(dev_priv, pipe, val),

	     "PCH LVDS enabled on transcoder %c, should be disabled\n",

	     pipe_name(pipe));
@@ -1872,7 +1872,7 @@ static void disable_pch_hdmi(struct drm_i915_private *dev_priv, 
			     enum pipe pipe, int reg)

{

	u32 val = I915_READ(reg);

	if (hdmi_pipe_enabled(dev_priv, val, pipe)) {

	if (hdmi_pipe_enabled(dev_priv, pipe, val)) {

		DRM_DEBUG_KMS("Disabling pch HDMI %x on pipe %d\n",

			      reg, pipe);

		I915_WRITE(reg, val & ~PORT_ENABLE);
@@ -1894,12 +1894,12 @@ static void intel_disable_pch_ports(struct drm_i915_private *dev_priv, 


	reg = PCH_ADPA;

	val = I915_READ(reg);

	if (adpa_pipe_enabled(dev_priv, val, pipe))

	if (adpa_pipe_enabled(dev_priv, pipe, val))

		I915_WRITE(reg, val & ~ADPA_DAC_ENABLE);



	reg = PCH_LVDS;

	val = I915_READ(reg);

	if (lvds_pipe_enabled(dev_priv, val, pipe)) {

	if (lvds_pipe_enabled(dev_priv, pipe, val)) {

		DRM_DEBUG_KMS("disable lvds on pipe %d val 0x%08x\n", pipe, val);

		I915_WRITE(reg, val & ~LVDS_PORT_EN);

		POSTING_READ(reg);