Commit f480de3f authored by Dave Airlie's avatar Dave Airlie
Browse files

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



- pick up the cmdline fix which missed the merge window (Dmitry)
- a handful of msm fixes so i don't have to spin up msm-fixes (Various)
- fix -Wunused-but-set-variable warning in drm_framebuffer (Qian)

Cc: Dmitry Osipenko <digetx@gmail.com>
Cc: Rob Clark <robdclark@gmail.com>
Cc: Qian Cai <cai@lca.pw>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Sean Paul <sean@poorly.run>
Link: https://patchwork.freedesktop.org/patch/msgid/20190725160909.GA106249@art_vandelay
parents 5f9e832c bbb6fc43

drivers/gpu/drm/drm_client_modeset.c

+1 −1
Original line number Diff line number Diff line
@@ -859,7 +859,7 @@ bool drm_client_rotation(struct drm_mode_set *modeset, unsigned int *rotation) 
	 * simple XOR between the two handle the addition nicely.

	 */

	cmdline = &connector->cmdline_mode;

	if (cmdline->specified) {

	if (cmdline->specified && cmdline->rotation_reflection) {

		unsigned int cmdline_rest, panel_rest;

		unsigned int cmdline_rot, panel_rot;

		unsigned int sum_rot, sum_rest;

drivers/gpu/drm/drm_framebuffer.c

+1 −1
Original line number Diff line number Diff line
@@ -835,7 +835,7 @@ static int atomic_remove_fb(struct drm_framebuffer *fb) 
	struct drm_device *dev = fb->dev;

	struct drm_atomic_state *state;

	struct drm_plane *plane;

	struct drm_connector *conn;

	struct drm_connector *conn __maybe_unused;

	struct drm_connector_state *conn_state;

	int i, ret;

	unsigned plane_mask;

drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c

+1 −2
Original line number Diff line number Diff line
@@ -2221,8 +2221,6 @@ int dpu_encoder_setup(struct drm_device *dev, struct drm_encoder *enc, 
	if (ret)

		goto fail;



	spin_lock_init(&dpu_enc->enc_spinlock);



	atomic_set(&dpu_enc->frame_done_timeout_ms, 0);

	timer_setup(&dpu_enc->frame_done_timer,

			dpu_encoder_frame_done_timeout, 0);
@@ -2276,6 +2274,7 @@ struct drm_encoder *dpu_encoder_init(struct drm_device *dev, 


	drm_encoder_helper_add(&dpu_enc->base, &dpu_encoder_helper_funcs);



	spin_lock_init(&dpu_enc->enc_spinlock);

	dpu_enc->enabled = false;



	return &dpu_enc->base;

drivers/gpu/drm/msm/msm_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -619,7 +619,7 @@ static int context_init(struct drm_device *dev, struct drm_file *file) 


	msm_submitqueue_init(dev, ctx);



	ctx->aspace = priv->gpu->aspace;

	ctx->aspace = priv->gpu ? priv->gpu->aspace : NULL;

	file->driver_priv = ctx;



	return 0;

drivers/gpu/drm/msm/msm_gem.c

+2 −2
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ static struct page **get_pages(struct drm_gem_object *obj) 
		 * because display controller, GPU, etc. are not coherent:

		 */

		if (msm_obj->flags & (MSM_BO_WC|MSM_BO_UNCACHED))

			dma_map_sg(dev->dev, msm_obj->sgt->sgl,

			dma_sync_sg_for_device(dev->dev, msm_obj->sgt->sgl,

					msm_obj->sgt->nents, DMA_BIDIRECTIONAL);

	}
@@ -127,7 +127,7 @@ static void put_pages(struct drm_gem_object *obj) 
			 * GPU, etc. are not coherent:

			 */

			if (msm_obj->flags & (MSM_BO_WC|MSM_BO_UNCACHED))

				dma_unmap_sg(obj->dev->dev, msm_obj->sgt->sgl,

				dma_sync_sg_for_cpu(obj->dev->dev, msm_obj->sgt->sgl,

					     msm_obj->sgt->nents,

					     DMA_BIDIRECTIONAL);

CRA Git | Maintained and supported by SUSTech CRA and CCSE