Commit 86b7eab2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drm-fixes-for-v4.11-rc4' of git://people.freedesktop.org/~airlied/linux 

Pull drm fixes from Dave Airlie:

 - one core drm/fbdev regression fix

 - a set of i915 fixes including a few GVT related fixes, along with
   some reset fixes

 - one new PCI id for amdgpu, and some minor workaround regression
   fixes

 - .. and a set of exynos fixes, dropping support for an old unsupported
   SoC, some vblank timing fixes, and an info leak fix

* tag 'drm-fixes-for-v4.11-rc4' of git://people.freedesktop.org/~airlied/linux: (34 commits)
  drm/fb-helper: Allow var->x/yres(_virtual) < fb->width/height again
  drm/i915: make context status notifier head be per engine
  drm/i915: Avoid rcu_barrier() from reclaim paths (shrinker)
  drm/exynos/dsi: make te-gpios optional
  drm/exynos: Print kernel pointers in a restricted form
  drm/exynos/decon5433: fix software trigger mask
  drm/exynos/fimd: signal frame done interrupt at front porch
  drm/exynos/decon5433: signal frame done interrupt at front porch
  drm/exynos/decon5433: fix vblank event handling
  drm/exynos: move crtc event handling to drivers callbacks
  drm/exynos: Remove support for Exynos4415 (SoC not supported anymore)
  drm/exynos/decon5433: & vs | typo
  drm/amd/amdgpu: add POLARIS12 PCI ID
  drm/i915/gvt: Fix gvt scheduler interval time
  drm/i915/gvt: GVT pin/unpin shadow context
  drm/i915/gvt: scan shadow indirect context image when valid
  drm/i915/kvmgt: fix suspicious rcu dereference usage
  drm/i915/gvt: add enable_execlists check before enable gvt
  drm/i915/gvt: Remove bogus retry around i915_wait_request
  drm/i915/gvt: correct the ggtt valid bit check in pipe control command
  ...
parents ebe64824 d64a0472

Documentation/devicetree/bindings/display/exynos/exynos_dsim.txt

+0 −1
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ 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,exynos4415-mipi-dsi" /* for Exynos4415 SoC */

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

		"samsung,exynos5422-mipi-dsi" /* for Exynos5422/5800 SoCs */

		"samsung,exynos5433-mipi-dsi" /* for Exynos5433 SoCs */

Documentation/devicetree/bindings/display/exynos/samsung-fimd.txt

+0 −1
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ Required properties: 
		"samsung,s5pv210-fimd"; /* for S5PV210 SoC */

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

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

		"samsung,exynos4415-fimd"; /* for Exynos4415 SoC */

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

		"samsung,exynos5420-fimd"; /* for Exynos5420/5422/5800 SoCs */

drivers/gpu/drm/amd/amdgpu/amdgpu_device.c

+2 −2
Original line number Diff line number Diff line
@@ -475,7 +475,7 @@ static int amdgpu_wb_init(struct amdgpu_device *adev) 
	int r;



	if (adev->wb.wb_obj == NULL) {

		r = amdgpu_bo_create_kernel(adev, AMDGPU_MAX_WB * 4,

		r = amdgpu_bo_create_kernel(adev, AMDGPU_MAX_WB * sizeof(uint32_t),

					    PAGE_SIZE, AMDGPU_GEM_DOMAIN_GTT,

					    &adev->wb.wb_obj, &adev->wb.gpu_addr,

					    (void **)&adev->wb.wb);
@@ -488,7 +488,7 @@ static int amdgpu_wb_init(struct amdgpu_device *adev) 
		memset(&adev->wb.used, 0, sizeof(adev->wb.used));



		/* clear wb memory */

		memset((char *)adev->wb.wb, 0, AMDGPU_GPU_PAGE_SIZE);

		memset((char *)adev->wb.wb, 0, AMDGPU_MAX_WB * sizeof(uint32_t));

	}



	return 0;

drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c

+1 −0
Original line number Diff line number Diff line
@@ -421,6 +421,7 @@ static const struct pci_device_id pciidlist[] = { 
	{0x1002, 0x6985, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS12},

	{0x1002, 0x6986, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS12},

	{0x1002, 0x6987, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS12},

	{0x1002, 0x6995, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS12},

	{0x1002, 0x699F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS12},



	{0, 0, 0}

drivers/gpu/drm/amd/amdgpu/si_dpm.c

+7 −3
Original line number Diff line number Diff line
@@ -3465,9 +3465,13 @@ static void si_apply_state_adjust_rules(struct amdgpu_device *adev, 
			max_sclk = 75000;

		}

	} else if (adev->asic_type == CHIP_OLAND) {

		if ((adev->pdev->device == 0x6604) &&

		    (adev->pdev->subsystem_vendor == 0x1028) &&

		    (adev->pdev->subsystem_device == 0x066F)) {

		if ((adev->pdev->revision == 0xC7) ||

		    (adev->pdev->revision == 0x80) ||

		    (adev->pdev->revision == 0x81) ||

		    (adev->pdev->revision == 0x83) ||

		    (adev->pdev->revision == 0x87) ||

		    (adev->pdev->device == 0x6604) ||

		    (adev->pdev->device == 0x6605)) {

			max_sclk = 75000;

		}

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE