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

Commit 8b7ad1bb authored Feb 05, 2014 by Dave Airlie

drm/mgag200,ast,cirrus: fix regression with drm_can_sleep conversion



I totally sign inverted my way out of this one.

Cc: stable@vger.kernel.org
Reported-by: "Sabrina Dubroca" <sd@queasysnail.net>
Signed-off-by: Dave Airlie <airlied@redhat.com>

parent ec22b4aa

drivers/gpu/drm/ast/ast_fb.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -65,7 +65,7 @@ static void ast_dirty_update(struct ast_fbdev *afbdev,
		* then the BO is being moved and we should
		* store up the damage until later.
		*/
		if (!drm_can_sleep())
		if (drm_can_sleep())
		ret = ast_bo_reserve(bo, true);
		if (ret) {
		if (ret != -EBUSY)

drivers/gpu/drm/cirrus/cirrus_fbdev.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -39,7 +39,7 @@ static void cirrus_dirty_update(struct cirrus_fbdev *afbdev,
		* then the BO is being moved and we should
		* store up the damage until later.
		*/
		if (!drm_can_sleep())
		if (drm_can_sleep())
		ret = cirrus_bo_reserve(bo, true);
		if (ret) {
		if (ret != -EBUSY)

drivers/gpu/drm/mgag200/mgag200_fb.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -41,7 +41,7 @@ static void mga_dirty_update(struct mga_fbdev *mfbdev,
		* then the BO is being moved and we should
		* store up the damage until later.
		*/
		if (!drm_can_sleep())
		if (drm_can_sleep())
		ret = mgag200_bo_reserve(bo, true);
		if (ret) {
		if (ret != -EBUSY)