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

Commit 0355e22a authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-next-fixes-2017-07-10' of... 

Merge tag 'drm-misc-next-fixes-2017-07-10' of git://anongit.freedesktop.org/git/drm-misc into drm-next

Core Changes:
- Fix empty timestamps on hw without vlbank counter (Laurent)
- Clear atomic state before retrying ww/mutex acquisition in remove_fb (Maarten)

Driver Changes:
- rockchip: Fix incorrect NULL pointer check after allocation (Gustavo)

Cc: Gustavo A. R. Silva <garsilva@embeddedor.com>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>

* tag 'drm-misc-next-fixes-2017-07-10' of git://anongit.freedesktop.org/git/drm-misc:
  drm/rockchip: fix NULL check on devm_kzalloc() return value
  drm/atomic: Add missing drm_atomic_state_clear to atomic_remove_fb
  drm: vblank: Fix vblank timestamp update
  DRM: Fix an incorrectly formatted table
  bridge: Fix panel-bridge error return on !panel.
  drm/rockchip: gem: add the lacks lock and trivial changes
parents caa164e3 6f6e0b21

drivers/gpu/drm/bridge/panel.c

+1 −1
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ struct drm_bridge *drm_panel_bridge_add(struct drm_panel *panel, 
	int ret;



	if (!panel)

		return ERR_PTR(EINVAL);

		return ERR_PTR(-EINVAL);



	panel_bridge = devm_kzalloc(panel->dev, sizeof(*panel_bridge),

				    GFP_KERNEL);

drivers/gpu/drm/drm_framebuffer.c

+1 −0
Original line number Diff line number Diff line
@@ -832,6 +832,7 @@ static int atomic_remove_fb(struct drm_framebuffer *fb) 
		drm_atomic_clean_old_fb(dev, plane_mask, ret);



	if (ret == -EDEADLK) {

		drm_atomic_state_clear(state);

		drm_modeset_backoff(&ctx);

		goto retry;

	}

drivers/gpu/drm/drm_vblank.c

+1 −1
Original line number Diff line number Diff line
@@ -242,7 +242,7 @@ static void drm_update_vblank_count(struct drm_device *dev, unsigned int pipe, 
	 * Otherwise reinitialize delayed at next vblank interrupt and assign 0

	 * for now, to mark the vblanktimestamp as invalid.

	 */

	if (!rc && in_vblank_irq)

	if (!rc && !in_vblank_irq)

		t_vblank = (struct timeval) {0, 0};



	store_vblank(dev, pipe, diff, &t_vblank, cur_vblank);

drivers/gpu/drm/rockchip/cdn-dp-core.c

+1 −1
Original line number Diff line number Diff line
@@ -1195,7 +1195,7 @@ static int cdn_dp_probe(struct platform_device *pdev) 
			continue;



		port = devm_kzalloc(dev, sizeof(*port), GFP_KERNEL);

		if (!dp)

		if (!port)

			return -ENOMEM;



		port->extcon = extcon;

drivers/gpu/drm/rockchip/rockchip_drm_drv.h

+1 −1
Original line number Diff line number Diff line
@@ -45,13 +45,13 @@ struct rockchip_crtc_state { 
 *

 * @crtc: array of enabled CRTCs, used to map from "pipe" to drm_crtc.

 * @num_pipe: number of pipes for this device.

 * @mm_lock: protect drm_mm on multi-threads.

 */

struct rockchip_drm_private {

	struct drm_fb_helper fbdev_helper;

	struct drm_gem_object *fbdev_bo;

	struct drm_atomic_state *state;

	struct iommu_domain *domain;

	/* protect drm_mm on multi-threads */

	struct mutex mm_lock;

	struct drm_mm mm;

	struct list_head psr_list;