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

Commit 311548f1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drm-fixes-for-v4.12-rc7' of git://people.freedesktop.org/~airlied/linux 

Pull drm fixes from Dave Airlie:
 "A varied bunch of fixes, one for an API regression with connectors.

  Otherwise amdgpu and i915 have a bunch of varied fixes, the shrinker
  ones being the most important"

* tag 'drm-fixes-for-v4.12-rc7' of git://people.freedesktop.org/~airlied/linux:
  drm: Fix GETCONNECTOR regression
  drm/radeon: add a quirk for Toshiba Satellite L20-183
  drm/radeon: add a PX quirk for another K53TK variant
  drm/amdgpu: adjust default display clock
  drm/amdgpu/atom: fix ps allocation size for EnableDispPowerGating
  drm/amdgpu: add Polaris12 DID
  drm/i915: Don't enable backlight at setup time.
  drm/i915: Plumb the correct acquire ctx into intel_crtc_disable_noatomic()
  drm/i915: Fix deadlock witha the pipe A quirk during resume
  drm/i915: Remove __GFP_NORETRY from our buffer allocator
  drm/i915: Encourage our shrinker more when our shmemfs allocations fails
  drm/i915: Differentiate between sw write location into ring and last hw read
parents 7139a06b 33ce7563

drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c

+4 −0
Original line number Diff line number Diff line
@@ -693,6 +693,10 @@ int amdgpu_atombios_get_clock_info(struct amdgpu_device *adev) 
			DRM_INFO("Changing default dispclk from %dMhz to 600Mhz\n",

				 adev->clock.default_dispclk / 100);

			adev->clock.default_dispclk = 60000;

		} else if (adev->clock.default_dispclk <= 60000) {

			DRM_INFO("Changing default dispclk from %dMhz to 625Mhz\n",

				 adev->clock.default_dispclk / 100);

			adev->clock.default_dispclk = 62500;

		}

		adev->clock.dp_extclk =

			le16_to_cpu(firmware_info->info_21.usUniphyDPModeExtClkFreq);

drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c

+1 −0
Original line number Diff line number Diff line
@@ -449,6 +449,7 @@ static const struct pci_device_id pciidlist[] = { 
	{0x1002, 0x6986, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS12},

	{0x1002, 0x6987, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS12},

	{0x1002, 0x6995, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS12},

	{0x1002, 0x6997, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS12},

	{0x1002, 0x699F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS12},

	/* Vega 10 */

	{0x1002, 0x6860, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGA10|AMD_EXP_HW_SUPPORT},

drivers/gpu/drm/amd/amdgpu/atombios_crtc.c

+2 −2
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ void amdgpu_atombios_crtc_powergate(struct drm_crtc *crtc, int state) 
	struct drm_device *dev = crtc->dev;

	struct amdgpu_device *adev = dev->dev_private;

	int index = GetIndexIntoMasterTable(COMMAND, EnableDispPowerGating);

	ENABLE_DISP_POWER_GATING_PARAMETERS_V2_1 args;

	ENABLE_DISP_POWER_GATING_PS_ALLOCATION args;



	memset(&args, 0, sizeof(args));
@@ -178,7 +178,7 @@ void amdgpu_atombios_crtc_powergate(struct drm_crtc *crtc, int state) 
void amdgpu_atombios_crtc_powergate_init(struct amdgpu_device *adev)

{

	int index = GetIndexIntoMasterTable(COMMAND, EnableDispPowerGating);

	ENABLE_DISP_POWER_GATING_PARAMETERS_V2_1 args;

	ENABLE_DISP_POWER_GATING_PS_ALLOCATION args;



	memset(&args, 0, sizeof(args));

drivers/gpu/drm/drm_connector.c

+20 −18
Original line number Diff line number Diff line
@@ -1229,21 +1229,6 @@ int drm_mode_getconnector(struct drm_device *dev, void *data, 
	if (!connector)

		return -ENOENT;



	drm_modeset_lock(&dev->mode_config.connection_mutex, NULL);

	encoder = drm_connector_get_encoder(connector);

	if (encoder)

		out_resp->encoder_id = encoder->base.id;

	else

		out_resp->encoder_id = 0;



	ret = drm_mode_object_get_properties(&connector->base, file_priv->atomic,

			(uint32_t __user *)(unsigned long)(out_resp->props_ptr),

			(uint64_t __user *)(unsigned long)(out_resp->prop_values_ptr),

			&out_resp->count_props);

	drm_modeset_unlock(&dev->mode_config.connection_mutex);

	if (ret)

		goto out_unref;



	for (i = 0; i < DRM_CONNECTOR_MAX_ENCODER; i++)

		if (connector->encoder_ids[i] != 0)

			encoders_count++;
@@ -1256,7 +1241,7 @@ int drm_mode_getconnector(struct drm_device *dev, void *data, 
				if (put_user(connector->encoder_ids[i],

					     encoder_ptr + copied)) {

					ret = -EFAULT;

					goto out_unref;

					goto out;

				}

				copied++;

			}
@@ -1300,15 +1285,32 @@ int drm_mode_getconnector(struct drm_device *dev, void *data, 
			if (copy_to_user(mode_ptr + copied,

					 &u_mode, sizeof(u_mode))) {

				ret = -EFAULT;

				mutex_unlock(&dev->mode_config.mutex);



				goto out;

			}

			copied++;

		}

	}

	out_resp->count_modes = mode_count;

out:

	mutex_unlock(&dev->mode_config.mutex);

out_unref:



	drm_modeset_lock(&dev->mode_config.connection_mutex, NULL);

	encoder = drm_connector_get_encoder(connector);

	if (encoder)

		out_resp->encoder_id = encoder->base.id;

	else

		out_resp->encoder_id = 0;



	/* Only grab properties after probing, to make sure EDID and other

	 * properties reflect the latest status. */

	ret = drm_mode_object_get_properties(&connector->base, file_priv->atomic,

			(uint32_t __user *)(unsigned long)(out_resp->props_ptr),

			(uint64_t __user *)(unsigned long)(out_resp->prop_values_ptr),

			&out_resp->count_props);

	drm_modeset_unlock(&dev->mode_config.connection_mutex);



out:

	drm_connector_put(connector);



	return ret;

drivers/gpu/drm/i915/i915_gem.c

+42 −21
Original line number Diff line number Diff line
@@ -2285,8 +2285,8 @@ i915_gem_object_get_pages_gtt(struct drm_i915_gem_object *obj) 
	struct page *page;

	unsigned long last_pfn = 0;	/* suppress gcc warning */

	unsigned int max_segment;

	gfp_t noreclaim;

	int ret;

	gfp_t gfp;



	/* Assert that the object is not currently in any GPU domain. As it

	 * wasn't in the GTT, there shouldn't be any way it could have been in
@@ -2315,22 +2315,31 @@ i915_gem_object_get_pages_gtt(struct drm_i915_gem_object *obj) 
	 * Fail silently without starting the shrinker

	 */

	mapping = obj->base.filp->f_mapping;

	gfp = mapping_gfp_constraint(mapping, ~(__GFP_IO | __GFP_RECLAIM));

	gfp |= __GFP_NORETRY | __GFP_NOWARN;

	noreclaim = mapping_gfp_constraint(mapping,

					   ~(__GFP_IO | __GFP_RECLAIM));

	noreclaim |= __GFP_NORETRY | __GFP_NOWARN;



	sg = st->sgl;

	st->nents = 0;

	for (i = 0; i < page_count; i++) {

		const unsigned int shrink[] = {

			I915_SHRINK_BOUND | I915_SHRINK_UNBOUND | I915_SHRINK_PURGEABLE,

			0,

		}, *s = shrink;

		gfp_t gfp = noreclaim;



		do {

			page = shmem_read_mapping_page_gfp(mapping, i, gfp);

		if (unlikely(IS_ERR(page))) {

			i915_gem_shrink(dev_priv,

					page_count,

					I915_SHRINK_BOUND |

					I915_SHRINK_UNBOUND |

					I915_SHRINK_PURGEABLE);

			page = shmem_read_mapping_page_gfp(mapping, i, gfp);

			if (likely(!IS_ERR(page)))

				break;



			if (!*s) {

				ret = PTR_ERR(page);

				goto err_sg;

			}

		if (unlikely(IS_ERR(page))) {

			gfp_t reclaim;



			i915_gem_shrink(dev_priv, 2 * page_count, *s++);

			cond_resched();



			/* We've tried hard to allocate the memory by reaping

			 * our own buffer, now let the real VM do its job and
@@ -2340,15 +2349,26 @@ i915_gem_object_get_pages_gtt(struct drm_i915_gem_object *obj) 
			 * defer the oom here by reporting the ENOMEM back

			 * to userspace.

			 */

			reclaim = mapping_gfp_mask(mapping);

			reclaim |= __GFP_NORETRY; /* reclaim, but no oom */

			if (!*s) {

				/* reclaim and warn, but no oom */

				gfp = mapping_gfp_mask(mapping);



			page = shmem_read_mapping_page_gfp(mapping, i, reclaim);

			if (IS_ERR(page)) {

				ret = PTR_ERR(page);

				goto err_sg;

			}

				/* Our bo are always dirty and so we require

				 * kswapd to reclaim our pages (direct reclaim

				 * does not effectively begin pageout of our

				 * buffers on its own). However, direct reclaim

				 * only waits for kswapd when under allocation

				 * congestion. So as a result __GFP_RECLAIM is

				 * unreliable and fails to actually reclaim our

				 * dirty pages -- unless you try over and over

				 * again with !__GFP_NORETRY. However, we still

				 * want to fail this allocation rather than

				 * trigger the out-of-memory killer and for

				 * this we want the future __GFP_MAYFAIL.

				 */

			}

		} while (1);



		if (!i ||

		    sg->length >= max_segment ||

		    page_to_pfn(page) != last_pfn + 1) {
@@ -4222,6 +4242,7 @@ i915_gem_object_create(struct drm_i915_private *dev_priv, u64 size) 


	mapping = obj->base.filp->f_mapping;

	mapping_set_gfp_mask(mapping, mask);

	GEM_BUG_ON(!(mapping_gfp_mask(mapping) & __GFP_RECLAIM));



	i915_gem_object_init(obj, &i915_gem_object_ops);