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

Commit 78fd8223 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:
 "This is probably a bit big, but just because I fell behind last week
  and didn't get to doing any pulls, so stuff backed up behind me, I
  actually should have sent this for -rc3 but failed to even manage
  that.

  So this has radeon, intel, nouveau, vmware, exynos and tegra fixes in
  it, and the line count isn't all the bad in the end"

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: (50 commits)
  drm: fix the addition of the side-by-side (half) flag for extra 3D modes
  drm/edid: fix length check when adding extra 3D modes
  drm/radeon/atom: fix bus probes when hw_i2c is set (v2)
  drm/radeon: fix null pointer dereference in dce6+ audio code
  drm/radeon: fixup bad vram size on SI
  udl: fix issue with imported prime buffers
  drm/vmwgfx: Add our connectors to sysfs
  drm/vmwgfx: Fix dma buffer memory size accounting
  drm/vmwgfx: Fix up and comment the dumb buffer implementation
  drm/vmwgfx: Correctly set the enabled state on crtcs
  drm/nv50/disp: min/max are reversed in nv50_crtc_gamma_set()
  drm/nouveau/sw: fix oops if gpu has its display block disabled
  drm/nouveau: unreference fence after syncing
  drm/nouveau/kms: send timestamp data for correct head in flip completion events
  drm/nouveau/clk: Add support for NVAA/NVAC
  drm/nouveau/fifo: Hook up pause and resume for NV50 and NV84+
  drm/nv10/plane: some chipsets don't support NV12
  drm/nv10/plane: add downscaling restrictions
  drm/nv10/plane: fix format computation
  drm/nv04-nv30/clk: provide an empty domain list
  ...
parents 32ac4869 9255ce80

drivers/gpu/drm/drm_edid.c

+2 −2
Original line number Diff line number Diff line
@@ -2674,7 +2674,7 @@ static int add_3d_struct_modes(struct drm_connector *connector, u16 structure, 
	int modes = 0;

	u8 cea_mode;



	if (video_db == NULL || video_index > video_len)

	if (video_db == NULL || video_index >= video_len)

		return 0;



	/* CEA modes are numbered 1..127 */
@@ -2701,7 +2701,7 @@ static int add_3d_struct_modes(struct drm_connector *connector, u16 structure, 
	if (structure & (1 << 8)) {

		newmode = drm_mode_duplicate(dev, &edid_cea_modes[cea_mode]);

		if (newmode) {

			newmode->flags = DRM_MODE_FLAG_3D_SIDE_BY_SIDE_HALF;

			newmode->flags |= DRM_MODE_FLAG_3D_SIDE_BY_SIDE_HALF;

			drm_mode_probed_add(connector, newmode);

			modes++;

		}

drivers/gpu/drm/exynos/exynos_drm_drv.c

+22 −13
Original line number Diff line number Diff line
@@ -172,29 +172,38 @@ static int exynos_drm_open(struct drm_device *dev, struct drm_file *file) 


static void exynos_drm_preclose(struct drm_device *dev,

					struct drm_file *file)

{

	exynos_drm_subdrv_close(dev, file);

}



static void exynos_drm_postclose(struct drm_device *dev, struct drm_file *file)

{

	struct exynos_drm_private *private = dev->dev_private;

	struct drm_pending_vblank_event *e, *t;

	struct drm_pending_vblank_event *v, *vt;

	struct drm_pending_event *e, *et;

	unsigned long flags;



	/* release events of current file */

	if (!file->driver_priv)

		return;



	/* Release all events not unhandled by page flip handler. */

	spin_lock_irqsave(&dev->event_lock, flags);

	list_for_each_entry_safe(e, t, &private->pageflip_event_list,

	list_for_each_entry_safe(v, vt, &private->pageflip_event_list,

			base.link) {

		if (e->base.file_priv == file) {

			list_del(&e->base.link);

			e->base.destroy(&e->base);

		if (v->base.file_priv == file) {

			list_del(&v->base.link);

			drm_vblank_put(dev, v->pipe);

			v->base.destroy(&v->base);

		}

	}

	spin_unlock_irqrestore(&dev->event_lock, flags);



	exynos_drm_subdrv_close(dev, file);

	/* Release all events handled by page flip handler but not freed. */

	list_for_each_entry_safe(e, et, &file->event_list, link) {

		list_del(&e->link);

		e->destroy(e);

	}

	spin_unlock_irqrestore(&dev->event_lock, flags);



static void exynos_drm_postclose(struct drm_device *dev, struct drm_file *file)

{

	if (!file->driver_priv)

		return;



	kfree(file->driver_priv);

	file->driver_priv = NULL;

drivers/gpu/drm/exynos/exynos_drm_fimd.c

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
#include "exynos_drm_iommu.h"



/*

 * FIMD is stand for Fully Interactive Mobile Display and

 * FIMD stands for Fully Interactive Mobile Display and

 * as a display controller, it transfers contents drawn on memory

 * to a LCD Panel through Display Interfaces such as RGB or

 * CPU Interface.

drivers/gpu/drm/i915/i915_drv.c

+2 −0
Original line number Diff line number Diff line
@@ -534,8 +534,10 @@ static int i915_drm_freeze(struct drm_device *dev) 
		 * Disable CRTCs directly since we want to preserve sw state

		 * for _thaw.

		 */

		mutex_lock(&dev->mode_config.mutex);

		list_for_each_entry(crtc, &dev->mode_config.crtc_list, head)

			dev_priv->display.crtc_disable(crtc);

		mutex_unlock(&dev->mode_config.mutex);



		intel_modeset_suspend_hw(dev);

	}

drivers/gpu/drm/i915/i915_gem.c

+3 −4
Original line number Diff line number Diff line
@@ -4442,10 +4442,9 @@ i915_gem_init_hw(struct drm_device *dev) 
	if (dev_priv->ellc_size)

		I915_WRITE(HSW_IDICR, I915_READ(HSW_IDICR) | IDIHASHMSK(0xf));



	if (IS_HSW_GT3(dev))

		I915_WRITE(MI_PREDICATE_RESULT_2, LOWER_SLICE_ENABLED);

	else

		I915_WRITE(MI_PREDICATE_RESULT_2, LOWER_SLICE_DISABLED);

	if (IS_HASWELL(dev))

		I915_WRITE(MI_PREDICATE_RESULT_2, IS_HSW_GT3(dev) ?

			   LOWER_SLICE_ENABLED : LOWER_SLICE_DISABLED);



	if (HAS_PCH_NOP(dev)) {

		u32 temp = I915_READ(GEN7_MSG_CTL);