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

Commit 955e36d0 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

Merge branch 'topic/skl-stage1' into drm-intel-next-queued 



SKL stage 1 patches still need polish so will likely miss the 3.18
merge window. We've decided to postpone to 3.19 so let's pull this in
to make patch merging and conflict handling easier.

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
parents ce31d9f4 c83155a6

Documentation/DocBook/drm.tmpl

+1 −1
Original line number Diff line number Diff line
@@ -3406,7 +3406,7 @@ void (*disable_vblank) (struct drm_device *dev, int crtc);</synopsis> 
    <sect2>

      <title>Vertical Blanking and Interrupt Handling Functions Reference</title>

!Edrivers/gpu/drm/drm_irq.c

!Iinclude/drm/drmP.h drm_crtc_vblank_waitqueue

!Finclude/drm/drmP.h drm_crtc_vblank_waitqueue

    </sect2>

  </sect1>

Documentation/devicetree/bindings/video/exynos_dsim.txt

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ Exynos MIPI DSI Master 


Required properties:

  - compatible: value should be one of the following

		"samsung,exynos3250-mipi-dsi" /* for Exynos3250/3472 SoCs */

		"samsung,exynos4210-mipi-dsi" /* for Exynos4 SoCs */

		"samsung,exynos5410-mipi-dsi" /* for Exynos5410/5420/5440 SoCs */

  - reg: physical base address and length of the registers set for the device

Documentation/devicetree/bindings/video/samsung-fimd.txt

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ Required properties: 
		"samsung,s3c2443-fimd"; /* for S3C24XX SoCs */

		"samsung,s3c6400-fimd"; /* for S3C64XX SoCs */

		"samsung,s5pv210-fimd"; /* for S5PV210 SoC */

		"samsung,exynos3250-fimd"; /* for Exynos3250/3472 SoCs */

		"samsung,exynos4210-fimd"; /* for Exynos4 SoCs */

		"samsung,exynos5250-fimd"; /* for Exynos5 SoCs */

arch/arm/boot/dts/exynos3250.dtsi

+33 −0
Original line number Diff line number Diff line
@@ -132,6 +132,12 @@ 
			reg = <0x10020000 0x4000>;

		};



		mipi_phy: video-phy@10020710 {

			compatible = "samsung,s5pv210-mipi-video-phy";

			reg = <0x10020710 8>;

			#phy-cells = <1>;

		};



		pd_cam: cam-power-domain@10023C00 {

			compatible = "samsung,exynos4210-pd";

			reg = <0x10023C00 0x20>;
@@ -216,6 +222,33 @@ 
			interrupts = <0 240 0>;

		};



		fimd: fimd@11c00000 {

			compatible = "samsung,exynos3250-fimd";

			reg = <0x11c00000 0x30000>;

			interrupt-names = "fifo", "vsync", "lcd_sys";

			interrupts = <0 84 0>, <0 85 0>, <0 86 0>;

			clocks = <&cmu CLK_SCLK_FIMD0>, <&cmu CLK_FIMD0>;

			clock-names = "sclk_fimd", "fimd";

			samsung,power-domain = <&pd_lcd0>;

			samsung,sysreg = <&sys_reg>;

			status = "disabled";

		};



		dsi_0: dsi@11C80000 {

			compatible = "samsung,exynos3250-mipi-dsi";

			reg = <0x11C80000 0x10000>;

			interrupts = <0 83 0>;

			samsung,phy-type = <0>;

			samsung,power-domain = <&pd_lcd0>;

			phys = <&mipi_phy 1>;

			phy-names = "dsim";

			clocks = <&cmu CLK_DSIM0>, <&cmu CLK_SCLK_MIPI0>;

			clock-names = "bus_clk", "pll_clk";

			#address-cells = <1>;

			#size-cells = <0>;

			status = "disabled";

		};



		mshc_0: mshc@12510000 {

			compatible = "samsung,exynos5250-dw-mshc";

			reg = <0x12510000 0x1000>;

arch/x86/kernel/early-quirks.c

+23 −0
Original line number Diff line number Diff line
@@ -455,6 +455,23 @@ struct intel_stolen_funcs { 
	u32 (*base)(int num, int slot, int func, size_t size);

};



static size_t __init gen9_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;



	if (gmch_ctrl < 0xf0)

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

	else

		/* 4MB increments starting at 0xf0 for 4MB */

		return (gmch_ctrl - 0xf0 + 1) << 22;

}



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



static const struct intel_stolen_funcs i830_stolen_funcs __initconst = {

	.base = i830_stolen_base,

	.size = i830_stolen_size,
@@ -490,6 +507,11 @@ static const struct intel_stolen_funcs gen8_stolen_funcs __initconst = { 
	.size = gen8_stolen_size,

};



static const struct intel_stolen_funcs gen9_stolen_funcs __initconst = {

	.base = intel_stolen_base,

	.size = gen9_stolen_size,

};



static const struct intel_stolen_funcs chv_stolen_funcs __initconst = {

	.base = intel_stolen_base,

	.size = chv_stolen_size,
@@ -523,6 +545,7 @@ static const struct pci_device_id intel_stolen_ids[] __initconst = { 
	INTEL_BDW_M_IDS(&gen8_stolen_funcs),

	INTEL_BDW_D_IDS(&gen8_stolen_funcs),

	INTEL_CHV_IDS(&chv_stolen_funcs),

	INTEL_SKL_IDS(&gen9_stolen_funcs),

};



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