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

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

Merge tag 'drm-intel-next-2013-10-18' of... 

Merge tag 'drm-intel-next-2013-10-18' of git://people.freedesktop.org/~danvet/drm-intel into drm-next

- CRC support from Damien and He Shuang. Long term this should allow us to
  test an awful lot modesetting corner cases automatically. So for me as
  the maintainer this is really big.
- HDMI audio fix from Jani.
- VLV dpll computation code refactoring from Ville.
- Fixups for the gpu booster from last time around (Chris).
- Some cleanups in the context code from Ben.
- More watermark work from Ville (we'll be getting there ...).
- vblank timestamp improvements from Ville.
- CONFIG_FB=n support, including drm core changes to make the fbdev
  helpers optional.
- DP link training improvements (Jani).
- mmio vtable from Ben, prep work for future hw.

* tag 'drm-intel-next-2013-10-18' of git://people.freedesktop.org/~danvet/drm-intel: (132 commits)
  drm/i915/dp: don't mention eDP bpp clamping if it doesn't affect bpp
  drm/i915: remove dead code in ironlake_crtc_mode_set
  drm/i915: crc support for hsw
  drm/i915: fix CRC debugfs setup
  drm/i915: wait one vblank when disabling CRCs
  drm/i915: use ->get_vblank_counter for the crc frame counter
  drm/i915: wire up CRC interrupt for ilk/snb
  drm/i915: add CRC #defines for ilk/snb
  drm/i915: extract display_pipe_crc_update
  drm/i915: don't Oops in debugfs for I915_FBDEV=n
  drm/i915: set HDMI pixel clock in audio configuration
  drm/i915: pass mode to ELD write vfuncs
  cpufreq: Add dummy cpufreq_cpu_get/put for CONFIG_CPU_FREQ=n
  drm/i915: check gem bo size when creating framebuffers
  drm/i915: Use unsigned long for obj->user_pin_count
  drm/i915: prevent tiling changes on framebuffer backing storage
  drm/i915: grab dev->struct_mutex around framebuffer_init
  drm/i915: vlv: fix VGA hotplug after modeset
  drm: add support for additional stereo 3D modes
  drm/i915: preserve dispaly init order on ByT
  ...
parents 5cab51cb 6da7f10d

drivers/gpu/drm/Kconfig

+10 −59
Original line number Diff line number Diff line
@@ -29,11 +29,17 @@ config DRM_USB 
config DRM_KMS_HELPER

	tristate

	depends on DRM

	help

	  CRTC helpers for KMS drivers.



config DRM_KMS_FB_HELPER

	bool

	depends on DRM_KMS_HELPER

	select FB

	select FRAMEBUFFER_CONSOLE if !EXPERT

	select FRAMEBUFFER_CONSOLE_DETECT_PRIMARY if FRAMEBUFFER_CONSOLE

	help

	  FB and CRTC helpers for KMS drivers.

	  FBDEV helpers for KMS drivers.



config DRM_LOAD_EDID_FIRMWARE

	bool "Allow to specify an EDID data set instead of probing for it"
@@ -64,6 +70,7 @@ config DRM_GEM_CMA_HELPER 
config DRM_KMS_CMA_HELPER

	bool

	select DRM_GEM_CMA_HELPER

	select DRM_KMS_FB_HELPER

	select FB_SYS_FILLRECT

	select FB_SYS_COPYAREA

	select FB_SYS_IMAGEBLIT
@@ -96,6 +103,7 @@ config DRM_RADEON 
	select FB_CFB_IMAGEBLIT

	select FW_LOADER

        select DRM_KMS_HELPER

	select DRM_KMS_FB_HELPER

        select DRM_TTM

	select POWER_SUPPLY

	select HWMON
@@ -120,64 +128,7 @@ config DRM_I810 
	  selected, the module will be called i810.  AGP support is required

	  for this driver to work.



config DRM_I915

	tristate "Intel 8xx/9xx/G3x/G4x/HD Graphics"

	depends on DRM

	depends on AGP

	depends on AGP_INTEL

	# we need shmfs for the swappable backing store, and in particular

	# the shmem_readpage() which depends upon tmpfs

	select SHMEM

	select TMPFS

	select DRM_KMS_HELPER

	select FB_CFB_FILLRECT

	select FB_CFB_COPYAREA

	select FB_CFB_IMAGEBLIT

	# i915 depends on ACPI_VIDEO when ACPI is enabled

	# but for select to work, need to select ACPI_VIDEO's dependencies, ick

	select BACKLIGHT_LCD_SUPPORT if ACPI

	select BACKLIGHT_CLASS_DEVICE if ACPI

	select VIDEO_OUTPUT_CONTROL if ACPI

	select INPUT if ACPI

	select THERMAL if ACPI

	select ACPI_VIDEO if ACPI

	select ACPI_BUTTON if ACPI

	help

	  Choose this option if you have a system that has "Intel Graphics

	  Media Accelerator" or "HD Graphics" integrated graphics,

	  including 830M, 845G, 852GM, 855GM, 865G, 915G, 945G, 965G,

	  G35, G41, G43, G45 chipsets and Celeron, Pentium, Core i3,

	  Core i5, Core i7 as well as Atom CPUs with integrated graphics.

	  If M is selected, the module will be called i915.  AGP support

	  is required for this driver to work. This driver is used by

	  the Intel driver in X.org 6.8 and XFree86 4.4 and above. It

	  replaces the older i830 module that supported a subset of the

	  hardware in older X.org releases.



	  Note that the older i810/i815 chipsets require the use of the

	  i810 driver instead, and the Atom z5xx series has an entirely

	  different implementation.



config DRM_I915_KMS

	bool "Enable modesetting on intel by default"

	depends on DRM_I915

	help

	  Choose this option if you want kernel modesetting enabled by default,

	  and you have a new enough userspace to support this. Running old

	  userspaces with this enabled will cause pain.  Note that this causes

	  the driver to bind to PCI devices, which precludes loading things

	  like intelfb.



config DRM_I915_PRELIMINARY_HW_SUPPORT

	bool "Enable preliminary support for prerelease Intel hardware by default"

	depends on DRM_I915

	help

	  Choose this option if you have prerelease Intel hardware and want the

	  i915 driver to support it by default.  You can enable such support at

	  runtime with the module option i915.preliminary_hw_support=1; this

	  option changes the default for that module option.



	  If in doubt, say "N".

source "drivers/gpu/drm/i915/Kconfig"



config DRM_MGA

	tristate "Matrox g200/g400"

drivers/gpu/drm/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -21,8 +21,9 @@ drm-$(CONFIG_PCI) += ati_pcigart.o 


drm-usb-y   := drm_usb.o



drm_kms_helper-y := drm_fb_helper.o drm_crtc_helper.o drm_dp_helper.o

drm_kms_helper-y := drm_crtc_helper.o drm_dp_helper.o

drm_kms_helper-$(CONFIG_DRM_LOAD_EDID_FIRMWARE) += drm_edid_load.o

drm_kms_helper-$(CONFIG_DRM_KMS_FB_HELPER) += drm_fb_helper.o

drm_kms_helper-$(CONFIG_DRM_KMS_CMA_HELPER) += drm_fb_cma_helper.o



obj-$(CONFIG_DRM_KMS_HELPER) += drm_kms_helper.o

drivers/gpu/drm/ast/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ config DRM_AST 
	select FB_SYS_FILLRECT

	select FB_SYS_IMAGEBLIT

	select DRM_KMS_HELPER

	select DRM_KMS_FB_HELPER

	select DRM_TTM

	help

	 Say yes for experimental AST GPU driver. Do not enable

drivers/gpu/drm/cirrus/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ config DRM_CIRRUS_QEMU 
	select FB_SYS_COPYAREA

	select FB_SYS_IMAGEBLIT

	select DRM_KMS_HELPER

	select DRM_KMS_FB_HELPER

	select DRM_TTM

	help

	 This is a KMS driver for emulated cirrus device in qemu.

drivers/gpu/drm/drm_crtc_helper.c

+4 −0
Original line number Diff line number Diff line
@@ -39,6 +39,10 @@ 
#include <drm/drm_fb_helper.h>

#include <drm/drm_edid.h>



MODULE_AUTHOR("David Airlie, Jesse Barnes");

MODULE_DESCRIPTION("DRM KMS helper");

MODULE_LICENSE("GPL and additional rights");



/**

 * drm_helper_move_panel_connectors_to_head() - move panels to the front in the

 * 						connector list