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

Commit 7119dbdf authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-fixes-2017-06-15' of... 

Merge tag 'drm-intel-fixes-2017-06-15' of git://anongit.freedesktop.org/git/drm-intel into drm-fixes

drm/i915 fixes for v4.12-rc6

* tag 'drm-intel-fixes-2017-06-15' of git://anongit.freedesktop.org/git/drm-intel:
  drm/i915: Fix GVT-g PVINFO version compatibility check
  drm/i915: Fix SKL+ watermarks for 90/270 rotation
  drm/i915: Fix scaling check for 90/270 degree plane rotation
parents 91c0719c c380f681

drivers/gpu/drm/i915/i915_pvinfo.h

+2 −6
Original line number Diff line number Diff line
@@ -36,10 +36,6 @@ 
#define VGT_VERSION_MAJOR 1

#define VGT_VERSION_MINOR 0



#define INTEL_VGT_IF_VERSION_ENCODE(major, minor) ((major) << 16 | (minor))

#define INTEL_VGT_IF_VERSION \

	INTEL_VGT_IF_VERSION_ENCODE(VGT_VERSION_MAJOR, VGT_VERSION_MINOR)



/*

 * notifications from guest to vgpu device model

 */
@@ -55,8 +51,8 @@ enum vgt_g2v_type { 


struct vgt_if {

	u64 magic;		/* VGT_MAGIC */

	uint16_t version_major;

	uint16_t version_minor;

	u16 version_major;

	u16 version_minor;

	u32 vgt_id;		/* ID of vGT instance */

	u32 rsv1[12];		/* pad to offset 0x40 */

	/*

drivers/gpu/drm/i915/i915_vgpu.c

+4 −6
Original line number Diff line number Diff line
@@ -60,8 +60,8 @@ 
 */

void i915_check_vgpu(struct drm_i915_private *dev_priv)

{

	uint64_t magic;

	uint32_t version;

	u64 magic;

	u16 version_major;



	BUILD_BUG_ON(sizeof(struct vgt_if) != VGT_PVINFO_SIZE);
@@ -69,10 +69,8 @@ void i915_check_vgpu(struct drm_i915_private *dev_priv) 
	if (magic != VGT_MAGIC)

		return;



	version = INTEL_VGT_IF_VERSION_ENCODE(

		__raw_i915_read16(dev_priv, vgtif_reg(version_major)),

		__raw_i915_read16(dev_priv, vgtif_reg(version_minor)));

	if (version != INTEL_VGT_IF_VERSION) {

	version_major = __raw_i915_read16(dev_priv, vgtif_reg(version_major));

	if (version_major < VGT_VERSION_MAJOR) {

		DRM_INFO("VGT interface version mismatch!\n");

		return;

	}

drivers/gpu/drm/i915/intel_display.c

+8 −6
Original line number Diff line number Diff line
@@ -4598,7 +4598,7 @@ static void cpt_verify_modeset(struct drm_device *dev, int pipe) 


static int

skl_update_scaler(struct intel_crtc_state *crtc_state, bool force_detach,

		  unsigned scaler_user, int *scaler_id, unsigned int rotation,

		  unsigned int scaler_user, int *scaler_id,

		  int src_w, int src_h, int dst_w, int dst_h)

{

	struct intel_crtc_scaler_state *scaler_state =
@@ -4607,9 +4607,12 @@ skl_update_scaler(struct intel_crtc_state *crtc_state, bool force_detach, 
		to_intel_crtc(crtc_state->base.crtc);

	int need_scaling;



	need_scaling = drm_rotation_90_or_270(rotation) ?

		(src_h != dst_w || src_w != dst_h):

		(src_w != dst_w || src_h != dst_h);

	/*

	 * Src coordinates are already rotated by 270 degrees for

	 * the 90/270 degree plane rotation cases (to match the

	 * GTT mapping), hence no need to account for rotation here.

	 */

	need_scaling = src_w != dst_w || src_h != dst_h;



	/*

	 * if plane is being disabled or scaler is no more required or force detach
@@ -4671,7 +4674,7 @@ int skl_update_scaler_crtc(struct intel_crtc_state *state) 
	const struct drm_display_mode *adjusted_mode = &state->base.adjusted_mode;



	return skl_update_scaler(state, !state->base.active, SKL_CRTC_INDEX,

		&state->scaler_state.scaler_id, DRM_ROTATE_0,

		&state->scaler_state.scaler_id,

		state->pipe_src_w, state->pipe_src_h,

		adjusted_mode->crtc_hdisplay, adjusted_mode->crtc_vdisplay);

}
@@ -4700,7 +4703,6 @@ static int skl_update_scaler_plane(struct intel_crtc_state *crtc_state, 
	ret = skl_update_scaler(crtc_state, force_detach,

				drm_plane_index(&intel_plane->base),

				&plane_state->scaler_id,

				plane_state->base.rotation,

				drm_rect_width(&plane_state->base.src) >> 16,

				drm_rect_height(&plane_state->base.src) >> 16,

				drm_rect_width(&plane_state->base.dst),

drivers/gpu/drm/i915/intel_pm.c

+24 −12
Original line number Diff line number Diff line
@@ -3373,20 +3373,26 @@ skl_plane_downscale_amount(const struct intel_crtc_state *cstate, 


	/* n.b., src is 16.16 fixed point, dst is whole integer */

	if (plane->id == PLANE_CURSOR) {

		/*

		 * Cursors only support 0/180 degree rotation,

		 * hence no need to account for rotation here.

		 */

		src_w = pstate->base.src_w;

		src_h = pstate->base.src_h;

		dst_w = pstate->base.crtc_w;

		dst_h = pstate->base.crtc_h;

	} else {

		/*

		 * Src coordinates are already rotated by 270 degrees for

		 * the 90/270 degree plane rotation cases (to match the

		 * GTT mapping), hence no need to account for rotation here.

		 */

		src_w = drm_rect_width(&pstate->base.src);

		src_h = drm_rect_height(&pstate->base.src);

		dst_w = drm_rect_width(&pstate->base.dst);

		dst_h = drm_rect_height(&pstate->base.dst);

	}



	if (drm_rotation_90_or_270(pstate->base.rotation))

		swap(dst_w, dst_h);



	downscale_h = max(src_h / dst_h, (uint32_t)DRM_PLANE_HELPER_NO_SCALING);

	downscale_w = max(src_w / dst_w, (uint32_t)DRM_PLANE_HELPER_NO_SCALING);
@@ -3417,12 +3423,14 @@ skl_plane_relative_data_rate(const struct intel_crtc_state *cstate, 
	if (y && format != DRM_FORMAT_NV12)

		return 0;



	/*

	 * Src coordinates are already rotated by 270 degrees for

	 * the 90/270 degree plane rotation cases (to match the

	 * GTT mapping), hence no need to account for rotation here.

	 */

	width = drm_rect_width(&intel_pstate->base.src) >> 16;

	height = drm_rect_height(&intel_pstate->base.src) >> 16;



	if (drm_rotation_90_or_270(pstate->rotation))

		swap(width, height);



	/* for planar format */

	if (format == DRM_FORMAT_NV12) {

		if (y)  /* y-plane data rate */
@@ -3505,12 +3513,14 @@ skl_ddb_min_alloc(const struct drm_plane_state *pstate, 
	    fb->modifier != I915_FORMAT_MOD_Yf_TILED)

		return 8;



	/*

	 * Src coordinates are already rotated by 270 degrees for

	 * the 90/270 degree plane rotation cases (to match the

	 * GTT mapping), hence no need to account for rotation here.

	 */

	src_w = drm_rect_width(&intel_pstate->base.src) >> 16;

	src_h = drm_rect_height(&intel_pstate->base.src) >> 16;



	if (drm_rotation_90_or_270(pstate->rotation))

		swap(src_w, src_h);



	/* Halve UV plane width and height for NV12 */

	if (fb->format->format == DRM_FORMAT_NV12 && !y) {

		src_w /= 2;
@@ -3794,13 +3804,15 @@ static int skl_compute_plane_wm(const struct drm_i915_private *dev_priv, 
		width = intel_pstate->base.crtc_w;

		height = intel_pstate->base.crtc_h;

	} else {

		/*

		 * Src coordinates are already rotated by 270 degrees for

		 * the 90/270 degree plane rotation cases (to match the

		 * GTT mapping), hence no need to account for rotation here.

		 */

		width = drm_rect_width(&intel_pstate->base.src) >> 16;

		height = drm_rect_height(&intel_pstate->base.src) >> 16;

	}



	if (drm_rotation_90_or_270(pstate->rotation))

		swap(width, height);



	cpp = fb->format->cpp[0];

	plane_pixel_rate = skl_adjusted_plane_pixel_rate(cstate, intel_pstate);