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

Commit 198ceac0 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'for-airlied' of git://people.freedesktop.org/~danvet/drm-intel into drm-core-next 

* 'for-airlied' of git://people.freedesktop.org/~danvet/drm-intel:
  drm/i915: add a LLC feature flag in device description
  drm/i915: kill i915_mem.c
  drm/i915: Use kcalloc instead of kzalloc to allocate array
  drm/i915/dp: Check for AUXCH error before checking for success
  drm/i915/dp: Use auxch precharge value of 5 everywhere
  drm/i915/dp: Tweak auxch clock divider for PCH
  drm/i915: Remove a comment about PCH from the non-PCH path
  drm/i915: Fix assert_pch_hdmi_disabled to mention HDMI (not DP)
  drm/i915: Implement plane-disabled assertion for PCH too
  drivers: i915: Fix BLC PWM register setup
  drm/i915: Check that plane/pipe is disabled before removing the fb
  drm/i915: fix typo in function name
  drm/i915: split out pll divider code
  drm/i915: split 9xx refclk & sdvo tv code out
  agp/intel: Add pci id for hostbridge from has/qemu
  drm/i915: there is no pipe CxSR on ironlake
  drm/i915: Only look for matching clocks for LVDS downclock
  drm/i915: Silence _DSM errors
parents 83b316fd 3d29b842

drivers/char/agp/intel-agp.c

+1 −0
Original line number Diff line number Diff line
@@ -850,6 +850,7 @@ static struct pci_device_id agp_intel_pci_table[] = { 
	.subvendor	= PCI_ANY_ID,			\

	.subdevice	= PCI_ANY_ID,			\

	}

	ID(PCI_DEVICE_ID_INTEL_82441), /* for HAS2 support */

	ID(PCI_DEVICE_ID_INTEL_82443LX_0),

	ID(PCI_DEVICE_ID_INTEL_82443BX_0),

	ID(PCI_DEVICE_ID_INTEL_82443GX_0),

drivers/gpu/drm/drm_ioctl.c

+2 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 
#include "drm_core.h"



#include "linux/pci.h"

#include "linux/export.h"



/**

 * Get the bus id.
@@ -346,3 +347,4 @@ int drm_noop(struct drm_device *dev, void *data, 
	DRM_DEBUG("\n");

	return 0;

}

EXPORT_SYMBOL(drm_noop);

drivers/gpu/drm/i915/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.



ccflags-y := -Iinclude/drm

i915-y := i915_drv.o i915_dma.o i915_irq.o i915_mem.o \

i915-y := i915_drv.o i915_dma.o i915_irq.o \

	  i915_debugfs.o \

          i915_suspend.o \

	  i915_gem.o \

drivers/gpu/drm/i915/i915_debugfs.c

+1 −0
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ static int i915_capabilities(struct seq_file *m, void *data) 
	B(supports_tv);

	B(has_bsd_ring);

	B(has_blt_ring);

	B(has_llc);

#undef B



	return 0;

drivers/gpu/drm/i915/i915_dma.c

+7 −10
Original line number Diff line number Diff line
@@ -784,6 +784,9 @@ static int i915_getparam(struct drm_device *dev, void *data, 
	case I915_PARAM_HAS_GEN7_SOL_RESET:

		value = 1;

		break;

	case I915_PARAM_HAS_LLC:

		value = HAS_LLC(dev);

		break;

	default:

		DRM_DEBUG_DRIVER("Unknown parameter %d\n",

				 param->param);
@@ -2247,18 +2250,12 @@ void i915_driver_lastclose(struct drm_device * dev) 


	i915_gem_lastclose(dev);



	if (dev_priv->agp_heap)

		i915_mem_takedown(&(dev_priv->agp_heap));



	i915_dma_cleanup(dev);

}



void i915_driver_preclose(struct drm_device * dev, struct drm_file *file_priv)

{

	drm_i915_private_t *dev_priv = dev->dev_private;

	i915_gem_release(dev, file_priv);

	if (!drm_core_check_feature(dev, DRIVER_MODESET))

		i915_mem_release(dev, file_priv, dev_priv->agp_heap);

}



void i915_driver_postclose(struct drm_device *dev, struct drm_file *file)
@@ -2277,11 +2274,11 @@ struct drm_ioctl_desc i915_ioctls[] = { 
	DRM_IOCTL_DEF_DRV(I915_IRQ_WAIT, i915_irq_wait, DRM_AUTH),

	DRM_IOCTL_DEF_DRV(I915_GETPARAM, i915_getparam, DRM_AUTH),

	DRM_IOCTL_DEF_DRV(I915_SETPARAM, i915_setparam, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),

	DRM_IOCTL_DEF_DRV(I915_ALLOC, i915_mem_alloc, DRM_AUTH),

	DRM_IOCTL_DEF_DRV(I915_FREE, i915_mem_free, DRM_AUTH),

	DRM_IOCTL_DEF_DRV(I915_INIT_HEAP, i915_mem_init_heap, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),

	DRM_IOCTL_DEF_DRV(I915_ALLOC, drm_noop, DRM_AUTH),

	DRM_IOCTL_DEF_DRV(I915_FREE, drm_noop, DRM_AUTH),

	DRM_IOCTL_DEF_DRV(I915_INIT_HEAP, drm_noop, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),

	DRM_IOCTL_DEF_DRV(I915_CMDBUFFER, i915_cmdbuffer, DRM_AUTH),

	DRM_IOCTL_DEF_DRV(I915_DESTROY_HEAP,  i915_mem_destroy_heap, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),

	DRM_IOCTL_DEF_DRV(I915_DESTROY_HEAP,  drm_noop, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),

	DRM_IOCTL_DEF_DRV(I915_SET_VBLANK_PIPE,  i915_vblank_pipe_set, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),

	DRM_IOCTL_DEF_DRV(I915_GET_VBLANK_PIPE,  i915_vblank_pipe_get, DRM_AUTH),

	DRM_IOCTL_DEF_DRV(I915_VBLANK_SWAP, i915_vblank_swap, DRM_AUTH),