Commit ed8c37e1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux 

Pull drm fixes from Dave Airlie:
 "Smattering of fixes, i915, exynos, tegra, msm, vmwgfx.

  A bit of framebuffer reference counting fallout fixes, i915 GM45
  regression fix, DVI regression fix, vmware info leak between processes
  fix"

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/exynos: use %pad for dma_addr_t
  drm/exynos: dsi: use IS_ERR() to check devm_ioremap_resource() results
  MAINTAINERS: update maintainer entry for Exynos DP driver
  drm/exynos: balance framebuffer refcount
  drm/i915: Move all ring resets before setting the HWS page
  drm/i915: Don't WARN nor handle unexpected hpd interrupts on gmch platforms
  drm/msm/mdp4: cure for the cursor blues (v2)
  drm/msm: default to XR24 rather than AR24
  drm/msm: fix memory leak
  drm/tegra: restrict plane loops to legacy planes
  drm/i915: Allow full PPGTT with param override
  drm/i915: Discard BIOS framebuffers too small to accommodate chosen mode
  drm/vmwgfx: Make sure user-space can't DMA across buffer object boundaries v2
  drm/i915: get power domain in case the BIOS enabled eDP VDD
  drm/i915: Don't check gmch state on inherited configs
  drm/i915: Allow user modes to exceed DVI 165MHz limit
parents 2aafe1a4 b8eade24

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -3485,6 +3485,12 @@ S: Maintained 
F:	drivers/extcon/

F:	Documentation/extcon/



EXYNOS DP DRIVER

M:	Jingoo Han <jg1.han@samsung.com>

L:	dri-devel@lists.freedesktop.org

S:	Maintained

F:	drivers/gpu/drm/exynos/exynos_dp*



EXYNOS MIPI DISPLAY DRIVERS

M:	Inki Dae <inki.dae@samsung.com>

M:	Donghwa Lee <dh09.lee@samsung.com>

drivers/gpu/drm/exynos/exynos_drm_crtc.c

+1 −0
Original line number Diff line number Diff line
@@ -145,6 +145,7 @@ exynos_drm_crtc_mode_set(struct drm_crtc *crtc, struct drm_display_mode *mode, 


	plane->crtc = crtc;

	plane->fb = crtc->primary->fb;

	drm_framebuffer_reference(plane->fb);



	return 0;

}

drivers/gpu/drm/exynos/exynos_drm_dmabuf.c

+1 −1
Original line number Diff line number Diff line
@@ -263,7 +263,7 @@ struct drm_gem_object *exynos_dmabuf_prime_import(struct drm_device *drm_dev, 
	buffer->sgt = sgt;

	exynos_gem_obj->base.import_attach = attach;



	DRM_DEBUG_PRIME("dma_addr = 0x%x, size = 0x%lx\n", buffer->dma_addr,

	DRM_DEBUG_PRIME("dma_addr = %pad, size = 0x%lx\n", &buffer->dma_addr,

								buffer->size);



	return &exynos_gem_obj->base;

drivers/gpu/drm/exynos/exynos_drm_dsi.c

+2 −2
Original line number Diff line number Diff line
@@ -1426,9 +1426,9 @@ static int exynos_dsi_probe(struct platform_device *pdev) 


	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	dsi->reg_base = devm_ioremap_resource(&pdev->dev, res);

	if (!dsi->reg_base) {

	if (IS_ERR(dsi->reg_base)) {

		dev_err(&pdev->dev, "failed to remap io region\n");

		return -EADDRNOTAVAIL;

		return PTR_ERR(dsi->reg_base);

	}



	dsi->phy = devm_phy_get(&pdev->dev, "dsim");

drivers/gpu/drm/exynos/exynos_drm_vidi.c

+1 −1
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ static void vidi_win_commit(struct exynos_drm_manager *mgr, int zpos) 


	win_data->enabled = true;



	DRM_DEBUG_KMS("dma_addr = 0x%x\n", win_data->dma_addr);

	DRM_DEBUG_KMS("dma_addr = %pad\n", &win_data->dma_addr);



	if (ctx->vblank_on)

		schedule_work(&ctx->work);

CRA Git | Maintained and supported by SUSTech CRA and CCSE