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

Commit 90eeb3aa authored by Dave Airlie's avatar Dave Airlie
Browse files

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

regression fix for vc4 + rpm stable fix for analogix bridge

* tag 'drm-misc-fixes-2017-12-07' of git://anongit.freedesktop.org/drm/drm-misc:
  drm/bridge: analogix dp: Fix runtime PM state in get_modes() callback
  drm/vc4: Fix false positive WARN() backtrace on refcount_inc() usage
parents 96980844 510353a6

drivers/gpu/drm/bridge/analogix/analogix_dp_core.c

+2 −0
Original line number Diff line number Diff line
@@ -946,7 +946,9 @@ static int analogix_dp_get_modes(struct drm_connector *connector) 
			return 0;

		}



		pm_runtime_get_sync(dp->dev);

		edid = drm_get_edid(connector, &dp->aux.ddc);

		pm_runtime_put(dp->dev);

		if (edid) {

			drm_mode_connector_update_edid_property(&dp->connector,

								edid);

drivers/gpu/drm/vc4/vc4_bo.c

+2 −1
Original line number Diff line number Diff line
@@ -637,7 +637,8 @@ int vc4_bo_inc_usecnt(struct vc4_bo *bo) 
	mutex_lock(&bo->madv_lock);

	switch (bo->madv) {

	case VC4_MADV_WILLNEED:

		refcount_inc(&bo->usecnt);

		if (!refcount_inc_not_zero(&bo->usecnt))

			refcount_set(&bo->usecnt, 1);

		ret = 0;

		break;

	case VC4_MADV_DONTNEED: