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

Commit c09cd6e9 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

Merge branch 'backlight-rework' into drm-intel-next-queued 



Pull in Jani's backlight rework branch. This was merged through a
separate branch to be able to sort out the Broadwell conflicts
properly before pulling it into the main development branch.

Conflicts:
	drivers/gpu/drm/i915/intel_display.c

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parents 7eb1c496 96ab4c70

MAINTAINERS

+2 −0
Original line number Original line Diff line number Diff line
@@ -2834,7 +2834,9 @@ L: dri-devel@lists.freedesktop.org 
L:	linux-tegra@vger.kernel.org

L:	linux-tegra@vger.kernel.org

T:	git git://anongit.freedesktop.org/tegra/linux.git

T:	git git://anongit.freedesktop.org/tegra/linux.git

S:	Supported

S:	Supported

F:	drivers/gpu/drm/tegra/

F:	drivers/gpu/host1x/

F:	drivers/gpu/host1x/

F:	include/linux/host1x.h

F:	include/uapi/drm/tegra_drm.h

F:	include/uapi/drm/tegra_drm.h

F:	Documentation/devicetree/bindings/gpu/nvidia,tegra20-host1x.txt

F:	Documentation/devicetree/bindings/gpu/nvidia,tegra20-host1x.txt

arch/x86/kernel/early-quirks.c

+12 −0
Original line number Original line Diff line number Diff line
@@ -313,6 +313,16 @@ static size_t __init gen6_stolen_size(int num, int slot, int func) 
	return gmch_ctrl << 25; /* 32 MB units */

	return gmch_ctrl << 25; /* 32 MB units */

}

}





static inline size_t gen8_stolen_size(int num, int slot, int func)

{

	u16 gmch_ctrl;



	gmch_ctrl = read_pci_config_16(num, slot, func, SNB_GMCH_CTRL);

	gmch_ctrl >>= BDW_GMCH_GMS_SHIFT;

	gmch_ctrl &= BDW_GMCH_GMS_MASK;

	return gmch_ctrl << 25; /* 32 MB units */

}



typedef size_t (*stolen_size_fn)(int num, int slot, int func);

typedef size_t (*stolen_size_fn)(int num, int slot, int func);





static struct pci_device_id intel_stolen_ids[] __initdata = {

static struct pci_device_id intel_stolen_ids[] __initdata = {
@@ -336,6 +346,8 @@ static struct pci_device_id intel_stolen_ids[] __initdata = { 
	INTEL_IVB_D_IDS(gen6_stolen_size),

	INTEL_IVB_D_IDS(gen6_stolen_size),

	INTEL_HSW_D_IDS(gen6_stolen_size),

	INTEL_HSW_D_IDS(gen6_stolen_size),

	INTEL_HSW_M_IDS(gen6_stolen_size),

	INTEL_HSW_M_IDS(gen6_stolen_size),

	INTEL_BDW_M_IDS(gen8_stolen_size),

	INTEL_BDW_D_IDS(gen8_stolen_size)

};

};





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

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

drivers/gpu/drm/Kconfig

+4 −0
Original line number Original line Diff line number Diff line
@@ -176,6 +176,8 @@ source "drivers/gpu/drm/mgag200/Kconfig" 




source "drivers/gpu/drm/cirrus/Kconfig"

source "drivers/gpu/drm/cirrus/Kconfig"





source "drivers/gpu/drm/armada/Kconfig"



source "drivers/gpu/drm/rcar-du/Kconfig"

source "drivers/gpu/drm/rcar-du/Kconfig"





source "drivers/gpu/drm/shmobile/Kconfig"

source "drivers/gpu/drm/shmobile/Kconfig"
@@ -187,3 +189,5 @@ source "drivers/gpu/drm/tilcdc/Kconfig" 
source "drivers/gpu/drm/qxl/Kconfig"

source "drivers/gpu/drm/qxl/Kconfig"





source "drivers/gpu/drm/msm/Kconfig"

source "drivers/gpu/drm/msm/Kconfig"



source "drivers/gpu/drm/tegra/Kconfig"

drivers/gpu/drm/Makefile

+2 −0
Original line number Original line Diff line number Diff line
@@ -50,10 +50,12 @@ obj-$(CONFIG_DRM_EXYNOS) +=exynos/ 
obj-$(CONFIG_DRM_GMA500) += gma500/

obj-$(CONFIG_DRM_GMA500) += gma500/

obj-$(CONFIG_DRM_UDL) += udl/

obj-$(CONFIG_DRM_UDL) += udl/

obj-$(CONFIG_DRM_AST) += ast/

obj-$(CONFIG_DRM_AST) += ast/

obj-$(CONFIG_DRM_ARMADA) += armada/

obj-$(CONFIG_DRM_RCAR_DU) += rcar-du/

obj-$(CONFIG_DRM_RCAR_DU) += rcar-du/

obj-$(CONFIG_DRM_SHMOBILE) +=shmobile/

obj-$(CONFIG_DRM_SHMOBILE) +=shmobile/

obj-$(CONFIG_DRM_OMAP)	+= omapdrm/

obj-$(CONFIG_DRM_OMAP)	+= omapdrm/

obj-$(CONFIG_DRM_TILCDC)	+= tilcdc/

obj-$(CONFIG_DRM_TILCDC)	+= tilcdc/

obj-$(CONFIG_DRM_QXL) += qxl/

obj-$(CONFIG_DRM_QXL) += qxl/

obj-$(CONFIG_DRM_MSM) += msm/

obj-$(CONFIG_DRM_MSM) += msm/

obj-$(CONFIG_DRM_TEGRA) += tegra/

obj-y			+= i2c/
 
obj-y			+= i2c/

drivers/gpu/drm/armada/Kconfig

0 → 100644
+24 −0
Original line number Original line Diff line number Diff line 
config DRM_ARMADA

	tristate "DRM support for Marvell Armada SoCs"

	depends on DRM && HAVE_CLK && ARM

	select FB_CFB_FILLRECT

	select FB_CFB_COPYAREA

	select FB_CFB_IMAGEBLIT

	select DRM_KMS_HELPER

	help

	  Support the "LCD" controllers found on the Marvell Armada 510

	  devices.  There are two controllers on the device, each controller

	  supports graphics and video overlays.



	  This driver provides no built-in acceleration; acceleration is

	  performed by other IP found on the SoC.  This driver provides

	  kernel mode setting and buffer management to userspace.



config DRM_ARMADA_TDA1998X

	bool "Support TDA1998X HDMI output"

	depends on DRM_ARMADA != n

	depends on I2C && DRM_I2C_NXP_TDA998X = y

	default y

	help

	  Support the TDA1998x HDMI output device found on the Solid-Run

	  CuBox.