Commit 591a495d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drm-fixes-2021-10-15-1' of git://anongit.freedesktop.org/drm/drm 

Pull drm fixes from Dave Airlie:
 "It has a few scattered msm and i915 fixes, a few core fixes and a
  mediatek feature revert.

  I've had to pick a bunch of patches into this, as the drm-misc-fixes
  tree had a bunch of vc4 patches I wasn't comfortable with sending to
  you at least as part of this, they were delayed due to your reverts.
  If it's really useful as fixes I'll do a separate pull.

  Summary:

  Core:
   - clamp fbdev size
   - edid cap blocks read to avoid out of bounds

  panel:
   - fix missing crc32 dependency

  msm:
   - Fix a new crash on dev file close if the dev file was opened when
     GPU is not loaded (such as missing fw in initrd)
   - Switch to single drm_sched_entity per priority level per drm_file
     to unbreak multi-context userspace
   - Serialize GMU access to fix GMU OOB errors
   - Various error path fixes
   - A couple integer overflow fixes
   - Fix mdp5 cursor plane WARNs

  i915:
   - Fix ACPI object leak
   - Fix context leak in user proto-context creation
   - Fix missing i915_sw_fence_fini call

  hyperv:
   - hide hw pointer

  nouveau:
   - fix engine selection bit

  r128:
   - fix UML build

  rcar-du:
   - unconncted LVDS regression fix

  mediatek:
   - revert CMDQ refinement patches"

* tag 'drm-fixes-2021-10-15-1' of git://anongit.freedesktop.org/drm/drm: (34 commits)
  drm/panel: olimex-lcd-olinuxino: select CRC32
  drm/r128: fix build for UML
  drm/nouveau/fifo: Reinstate the correct engine bit programming
  drm/hyperv: Fix double mouse pointers
  drm/fbdev: Clamp fbdev surface size if too large
  drm/edid: In connector_bad_edid() cap num_of_ext by num_blocks read
  drm/i915: Free the returned object of acpi_evaluate_dsm()
  drm/i915: Fix bug in user proto-context creation that leaked contexts
  drm: rcar-du: Don't create encoder for unconnected LVDS outputs
  drm/msm/dsi: fix off by one in dsi_bus_clk_enable error handling
  drm/msm/dsi: Fix an error code in msm_dsi_modeset_init()
  drm/msm/dsi: dsi_phy_14nm: Take ready-bit into account in poll_for_ready
  drm/msm/dsi/phy: fix clock names in 28nm_8960 phy
  drm/msm/dpu: Fix address of SM8150 PINGPONG5 IRQ register
  drm/msm: Do not run snapshot on non-DPU devices
  drm/msm/a3xx: fix error handling in a3xx_gpu_init()
  drm/msm/a4xx: fix error handling in a4xx_gpu_init()
  drm/msm: Fix null pointer dereference on pointer edp
  drm/msm/mdp5: fix cursor-related warnings
  drm/msm: Avoid potential overflow in timeout_to_jiffies()
  ...
parents 86a44e90 a14bc107

drivers/gpu/drm/drm_edid.c

+12 −3
Original line number Diff line number Diff line
@@ -1834,11 +1834,20 @@ static void connector_bad_edid(struct drm_connector *connector, 
			       u8 *edid, int num_blocks)

{

	int i;

	u8 num_of_ext = edid[0x7e];

	u8 last_block;



	/*

	 * 0x7e in the EDID is the number of extension blocks. The EDID

	 * is 1 (base block) + num_ext_blocks big. That means we can think

	 * of 0x7e in the EDID of the _index_ of the last block in the

	 * combined chunk of memory.

	 */

	last_block = edid[0x7e];



	/* Calculate real checksum for the last edid extension block data */

	if (last_block < num_blocks)

		connector->real_edid_checksum =

		drm_edid_block_checksum(edid + num_of_ext * EDID_LENGTH);

			drm_edid_block_checksum(edid + last_block * EDID_LENGTH);



	if (connector->bad_edid_counter++ && !drm_debug_enabled(DRM_UT_KMS))

		return;

drivers/gpu/drm/drm_fb_helper.c

+6 −0
Original line number Diff line number Diff line
@@ -1506,6 +1506,7 @@ static int drm_fb_helper_single_fb_probe(struct drm_fb_helper *fb_helper, 
{

	struct drm_client_dev *client = &fb_helper->client;

	struct drm_device *dev = fb_helper->dev;

	struct drm_mode_config *config = &dev->mode_config;

	int ret = 0;

	int crtc_count = 0;

	struct drm_connector_list_iter conn_iter;
@@ -1663,6 +1664,11 @@ static int drm_fb_helper_single_fb_probe(struct drm_fb_helper *fb_helper, 
	/* Handle our overallocation */

	sizes.surface_height *= drm_fbdev_overalloc;

	sizes.surface_height /= 100;

	if (sizes.surface_height > config->max_height) {

		drm_dbg_kms(dev, "Fbdev over-allocation too large; clamping height to %d\n",

			    config->max_height);

		sizes.surface_height = config->max_height;

	}



	/* push down into drivers */

	ret = (*fb_helper->funcs->fb_probe)(fb_helper, &sizes);

drivers/gpu/drm/hyperv/hyperv_drm.h

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ int hyperv_mode_config_init(struct hyperv_drm_device *hv); 
int hyperv_update_vram_location(struct hv_device *hdev, phys_addr_t vram_pp);

int hyperv_update_situation(struct hv_device *hdev, u8 active, u32 bpp,

			    u32 w, u32 h, u32 pitch);

int hyperv_hide_hw_ptr(struct hv_device *hdev);

int hyperv_update_dirt(struct hv_device *hdev, struct drm_rect *rect);

int hyperv_connect_vsp(struct hv_device *hdev);

drivers/gpu/drm/hyperv/hyperv_drm_modeset.c

+1 −0
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ static void hyperv_pipe_enable(struct drm_simple_display_pipe *pipe, 
	struct hyperv_drm_device *hv = to_hv(pipe->crtc.dev);

	struct drm_shadow_plane_state *shadow_plane_state = to_drm_shadow_plane_state(plane_state);



	hyperv_hide_hw_ptr(hv->hdev);

	hyperv_update_situation(hv->hdev, 1,  hv->screen_depth,

				crtc_state->mode.hdisplay,

				crtc_state->mode.vdisplay,

drivers/gpu/drm/hyperv/hyperv_drm_proto.c

+53 −1
Original line number Diff line number Diff line
@@ -299,6 +299,55 @@ int hyperv_update_situation(struct hv_device *hdev, u8 active, u32 bpp, 
	return 0;

}



/*

 * Hyper-V supports a hardware cursor feature. It's not used by Linux VM,

 * but the Hyper-V host still draws a point as an extra mouse pointer,

 * which is unwanted, especially when Xorg is running.

 *

 * The hyperv_fb driver uses synthvid_send_ptr() to hide the unwanted

 * pointer, by setting msg.ptr_pos.is_visible = 1 and setting the

 * msg.ptr_shape.data. Note: setting msg.ptr_pos.is_visible to 0 doesn't

 * work in tests.

 *

 * Copy synthvid_send_ptr() to hyperv_drm and rename it to

 * hyperv_hide_hw_ptr(). Note: hyperv_hide_hw_ptr() is also called in the

 * handler of the SYNTHVID_FEATURE_CHANGE event, otherwise the host still

 * draws an extra unwanted mouse pointer after the VM Connection window is

 * closed and reopened.

 */

int hyperv_hide_hw_ptr(struct hv_device *hdev)

{

	struct synthvid_msg msg;



	memset(&msg, 0, sizeof(struct synthvid_msg));

	msg.vid_hdr.type = SYNTHVID_POINTER_POSITION;

	msg.vid_hdr.size = sizeof(struct synthvid_msg_hdr) +

		sizeof(struct synthvid_pointer_position);

	msg.ptr_pos.is_visible = 1;

	msg.ptr_pos.video_output = 0;

	msg.ptr_pos.image_x = 0;

	msg.ptr_pos.image_y = 0;

	hyperv_sendpacket(hdev, &msg);



	memset(&msg, 0, sizeof(struct synthvid_msg));

	msg.vid_hdr.type = SYNTHVID_POINTER_SHAPE;

	msg.vid_hdr.size = sizeof(struct synthvid_msg_hdr) +

		sizeof(struct synthvid_pointer_shape);

	msg.ptr_shape.part_idx = SYNTHVID_CURSOR_COMPLETE;

	msg.ptr_shape.is_argb = 1;

	msg.ptr_shape.width = 1;

	msg.ptr_shape.height = 1;

	msg.ptr_shape.hot_x = 0;

	msg.ptr_shape.hot_y = 0;

	msg.ptr_shape.data[0] = 0;

	msg.ptr_shape.data[1] = 1;

	msg.ptr_shape.data[2] = 1;

	msg.ptr_shape.data[3] = 1;

	hyperv_sendpacket(hdev, &msg);



	return 0;

}



int hyperv_update_dirt(struct hv_device *hdev, struct drm_rect *rect)

{

	struct hyperv_drm_device *hv = hv_get_drvdata(hdev);
@@ -392,8 +441,11 @@ static void hyperv_receive_sub(struct hv_device *hdev) 
		return;

	}



	if (msg->vid_hdr.type == SYNTHVID_FEATURE_CHANGE)

	if (msg->vid_hdr.type == SYNTHVID_FEATURE_CHANGE) {

		hv->dirt_needed = msg->feature_chg.is_dirt_needed;

		if (hv->dirt_needed)

			hyperv_hide_hw_ptr(hv->hdev);

	}

}



static void hyperv_receive(void *ctx)