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

Commit 76af753b authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'fixes-for-v4.9-rc5' of http://git.agner.ch/git/linux-drm-fsl-dcu into drm-fixes 

Yet another small batch of fixes. Two of the patches I had prepared
since quite some time, but they did not seem to affect operation in
a visible manner so far. Until recently, when I discovered the third
issue (disable planes before disabling CRTC), which made the two
previous fixes necessary.

* 'fixes-for-v4.9-rc5' of http://git.agner.ch/git/linux-drm-fsl-dcu:
  drm/fsl-dcu: disable planes before disabling CRTC
  drm/fsl-dcu: update all registers on flush
  drm/fsl-dcu: do not update when modifying irq registers
parents 24399f4f 3d6f3710

drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c

+11 −2
Original line number Diff line number Diff line
@@ -25,8 +25,13 @@ 
static void fsl_dcu_drm_crtc_atomic_flush(struct drm_crtc *crtc,

					  struct drm_crtc_state *old_crtc_state)

{

	struct drm_device *dev = crtc->dev;

	struct fsl_dcu_drm_device *fsl_dev = dev->dev_private;

	struct drm_pending_vblank_event *event = crtc->state->event;



	regmap_write(fsl_dev->regmap,

		     DCU_UPDATE_MODE, DCU_UPDATE_MODE_READREG);



	if (event) {

		crtc->state->event = NULL;
@@ -39,11 +44,15 @@ static void fsl_dcu_drm_crtc_atomic_flush(struct drm_crtc *crtc, 
	}

}



static void fsl_dcu_drm_disable_crtc(struct drm_crtc *crtc)

static void fsl_dcu_drm_crtc_atomic_disable(struct drm_crtc *crtc,

					struct drm_crtc_state *old_crtc_state)

{

	struct drm_device *dev = crtc->dev;

	struct fsl_dcu_drm_device *fsl_dev = dev->dev_private;



	/* always disable planes on the CRTC */

	drm_atomic_helper_disable_planes_on_crtc(old_crtc_state, true);



	drm_crtc_vblank_off(crtc);



	regmap_update_bits(fsl_dev->regmap, DCU_DCU_MODE,
@@ -122,8 +131,8 @@ static void fsl_dcu_drm_crtc_mode_set_nofb(struct drm_crtc *crtc) 
}



static const struct drm_crtc_helper_funcs fsl_dcu_drm_crtc_helper_funcs = {

	.atomic_disable = fsl_dcu_drm_crtc_atomic_disable,

	.atomic_flush = fsl_dcu_drm_crtc_atomic_flush,

	.disable = fsl_dcu_drm_disable_crtc,

	.enable = fsl_dcu_drm_crtc_enable,

	.mode_set_nofb = fsl_dcu_drm_crtc_mode_set_nofb,

};

drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c

+0 −4
Original line number Diff line number Diff line
@@ -59,8 +59,6 @@ static int fsl_dcu_drm_irq_init(struct drm_device *dev) 


	regmap_write(fsl_dev->regmap, DCU_INT_STATUS, 0);

	regmap_write(fsl_dev->regmap, DCU_INT_MASK, ~0);

	regmap_write(fsl_dev->regmap, DCU_UPDATE_MODE,

		     DCU_UPDATE_MODE_READREG);



	return ret;

}
@@ -139,8 +137,6 @@ static irqreturn_t fsl_dcu_drm_irq(int irq, void *arg) 
		drm_handle_vblank(dev, 0);



	regmap_write(fsl_dev->regmap, DCU_INT_STATUS, int_status);

	regmap_write(fsl_dev->regmap, DCU_UPDATE_MODE,

		     DCU_UPDATE_MODE_READREG);



	return IRQ_HANDLED;

}

drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c

+0 −5
Original line number Diff line number Diff line
@@ -160,11 +160,6 @@ static void fsl_dcu_drm_plane_atomic_update(struct drm_plane *plane, 
			     DCU_LAYER_POST_SKIP(0) |

			     DCU_LAYER_PRE_SKIP(0));

	}

	regmap_update_bits(fsl_dev->regmap, DCU_DCU_MODE,

			   DCU_MODE_DCU_MODE_MASK,

			   DCU_MODE_DCU_MODE(DCU_MODE_NORMAL));

	regmap_write(fsl_dev->regmap,

		     DCU_UPDATE_MODE, DCU_UPDATE_MODE_READREG);



	return;

}