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

Commit 8f778bbc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux 

Pull drm fixes from Dave Airlie:
 "One drm core fix, one exynos regression fix, two sets of radeon fixes
  (Alex was a bit behind last week), and two i915 fixes.

  Nothing too serious we seem to have calmed down i915 since last week"

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/radeon: fix wait in radeon_mn_invalidate_range_start
  drm/radeon: add extra check in radeon_ttm_tt_unpin_userptr
  drm: Exynos: Respect framebuffer pitch for FIMD/Mixer
  drm/i915: Reject the colorkey ioctls for primary and cursor planes
  drm/i915: Skip allocating shadow batch for 0-length batches
  drm/radeon: programm the VCE fw BAR as well
  drm/radeon: always dump the ring content if it's available
  radeon: Do not directly dereference pointers to BIOS area.
  drm/radeon/dpm: fix 120hz handling harder
  drm/edid: set ELD for firmware and debugfs override EDIDs
parents 4e8a4830 51b52fac

drivers/gpu/drm/drm_edid_load.c

+1 −0
Original line number Diff line number Diff line
@@ -287,6 +287,7 @@ int drm_load_edid_firmware(struct drm_connector *connector) 


	drm_mode_connector_update_edid_property(connector, edid);

	ret = drm_add_edid_modes(connector, edid);

	drm_edid_to_eld(connector, edid);

	kfree(edid);



	return ret;

drivers/gpu/drm/drm_probe_helper.c

+1 −0
Original line number Diff line number Diff line
@@ -174,6 +174,7 @@ static int drm_helper_probe_single_connector_modes_merge_bits(struct drm_connect 
			struct edid *edid = (struct edid *) connector->edid_blob_ptr->data;



			count = drm_add_edid_modes(connector, edid);

			drm_edid_to_eld(connector, edid);

		} else

			count = (*connector_funcs->get_modes)(connector);

	}

drivers/gpu/drm/exynos/exynos_drm_fimd.c

+5 −3
Original line number Diff line number Diff line
@@ -147,6 +147,7 @@ struct fimd_win_data { 
	unsigned int		ovl_height;

	unsigned int		fb_width;

	unsigned int		fb_height;

	unsigned int		fb_pitch;

	unsigned int		bpp;

	unsigned int		pixel_format;

	dma_addr_t		dma_addr;
@@ -532,13 +533,14 @@ static void fimd_win_mode_set(struct exynos_drm_crtc *crtc, 
	win_data->offset_y = plane->crtc_y;

	win_data->ovl_width = plane->crtc_width;

	win_data->ovl_height = plane->crtc_height;

	win_data->fb_pitch = plane->pitch;

	win_data->fb_width = plane->fb_width;

	win_data->fb_height = plane->fb_height;

	win_data->dma_addr = plane->dma_addr[0] + offset;

	win_data->bpp = plane->bpp;

	win_data->pixel_format = plane->pixel_format;

	win_data->buf_offsize = (plane->fb_width - plane->crtc_width) *

				(plane->bpp >> 3);

	win_data->buf_offsize =

		plane->pitch - (plane->crtc_width * (plane->bpp >> 3));

	win_data->line_size = plane->crtc_width * (plane->bpp >> 3);



	DRM_DEBUG_KMS("offset_x = %d, offset_y = %d\n",
@@ -704,7 +706,7 @@ static void fimd_win_commit(struct exynos_drm_crtc *crtc, int zpos) 
	writel(val, ctx->regs + VIDWx_BUF_START(win, 0));



	/* buffer end address */

	size = win_data->fb_width * win_data->ovl_height * (win_data->bpp >> 3);

	size = win_data->fb_pitch * win_data->ovl_height * (win_data->bpp >> 3);

	val = (unsigned long)(win_data->dma_addr + size);

	writel(val, ctx->regs + VIDWx_BUF_END(win, 0));

drivers/gpu/drm/exynos/exynos_mixer.c

+10 −7
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ struct hdmi_win_data { 
	unsigned int		fb_x;

	unsigned int		fb_y;

	unsigned int		fb_width;

	unsigned int		fb_pitch;

	unsigned int		fb_height;

	unsigned int		src_width;

	unsigned int		src_height;
@@ -438,7 +439,7 @@ static void vp_video_buffer(struct mixer_context *ctx, int win) 
	} else {

		luma_addr[0] = win_data->dma_addr;

		chroma_addr[0] = win_data->dma_addr

			+ (win_data->fb_width * win_data->fb_height);

			+ (win_data->fb_pitch * win_data->fb_height);

	}



	if (win_data->scan_flags & DRM_MODE_FLAG_INTERLACE) {
@@ -447,8 +448,8 @@ static void vp_video_buffer(struct mixer_context *ctx, int win) 
			luma_addr[1] = luma_addr[0] + 0x40;

			chroma_addr[1] = chroma_addr[0] + 0x40;

		} else {

			luma_addr[1] = luma_addr[0] + win_data->fb_width;

			chroma_addr[1] = chroma_addr[0] + win_data->fb_width;

			luma_addr[1] = luma_addr[0] + win_data->fb_pitch;

			chroma_addr[1] = chroma_addr[0] + win_data->fb_pitch;

		}

	} else {

		ctx->interlace = false;
@@ -469,10 +470,10 @@ static void vp_video_buffer(struct mixer_context *ctx, int win) 
	vp_reg_writemask(res, VP_MODE, val, VP_MODE_FMT_MASK);



	/* setting size of input image */

	vp_reg_write(res, VP_IMG_SIZE_Y, VP_IMG_HSIZE(win_data->fb_width) |

	vp_reg_write(res, VP_IMG_SIZE_Y, VP_IMG_HSIZE(win_data->fb_pitch) |

		VP_IMG_VSIZE(win_data->fb_height));

	/* chroma height has to reduced by 2 to avoid chroma distorions */

	vp_reg_write(res, VP_IMG_SIZE_C, VP_IMG_HSIZE(win_data->fb_width) |

	vp_reg_write(res, VP_IMG_SIZE_C, VP_IMG_HSIZE(win_data->fb_pitch) |

		VP_IMG_VSIZE(win_data->fb_height / 2));



	vp_reg_write(res, VP_SRC_WIDTH, win_data->src_width);
@@ -559,7 +560,7 @@ static void mixer_graph_buffer(struct mixer_context *ctx, int win) 
	/* converting dma address base and source offset */

	dma_addr = win_data->dma_addr

		+ (win_data->fb_x * win_data->bpp >> 3)

		+ (win_data->fb_y * win_data->fb_width * win_data->bpp >> 3);

		+ (win_data->fb_y * win_data->fb_pitch);

	src_x_offset = 0;

	src_y_offset = 0;
@@ -576,7 +577,8 @@ static void mixer_graph_buffer(struct mixer_context *ctx, int win) 
		MXR_GRP_CFG_FORMAT_VAL(fmt), MXR_GRP_CFG_FORMAT_MASK);



	/* setup geometry */

	mixer_reg_write(res, MXR_GRAPHIC_SPAN(win), win_data->fb_width);

	mixer_reg_write(res, MXR_GRAPHIC_SPAN(win),

			win_data->fb_pitch / (win_data->bpp >> 3));



	/* setup display size */

	if (ctx->mxr_ver == MXR_VER_128_0_0_184 &&
@@ -961,6 +963,7 @@ static void mixer_win_mode_set(struct exynos_drm_crtc *crtc, 
	win_data->fb_y = plane->fb_y;

	win_data->fb_width = plane->fb_width;

	win_data->fb_height = plane->fb_height;

	win_data->fb_pitch = plane->pitch;

	win_data->src_width = plane->src_width;

	win_data->src_height = plane->src_height;

drivers/gpu/drm/i915/i915_gem_execbuffer.c

+1 −1
Original line number Diff line number Diff line
@@ -1487,7 +1487,7 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data, 
		goto err;

	}



	if (i915_needs_cmd_parser(ring)) {

	if (i915_needs_cmd_parser(ring) && args->batch_len) {

		batch_obj = i915_gem_execbuffer_parse(ring,

						      &shadow_exec_entry,

						      eb,