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

Commit c8b392e9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 

* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm/radeon/kms: add missing frac fb div flag for dce4+
  drm/radeon/kms: do not reject X16 and Y16X16 floating-point formats on r300
  drm/nouveau: fix suspend/resume on GPUs that don't have PM support
  drm/nouveau: flips/flipd need to always set 'evict' for move_accel_cleanup()
  drm/nv40: fix tiling-related setup for a number of chipsets
  drm/nouveau: fix non-EDIDful native mode selection
  drm/nouveau: Fix detection of DDC-based LVDS on DCB15 boards.
  drm/nv04-nv40: Fix NULL dereference when we fail to find an LVDS native mode.
  drm/nv10: Fix crash when allocating a BO larger than half the available VRAM.
parents dd8240bd e138018e

drivers/gpu/drm/nouveau/nouveau_bios.c

+1 −1
Original line number Diff line number Diff line
@@ -6228,7 +6228,7 @@ parse_dcb15_entry(struct drm_device *dev, struct dcb_table *dcb, 
		entry->tvconf.has_component_output = false;

		break;

	case OUTPUT_LVDS:

		if ((conn & 0x00003f00) != 0x10)

		if ((conn & 0x00003f00) >> 8 != 0x10)

			entry->lvdsconf.use_straps_for_mode = true;

		entry->lvdsconf.use_power_scripts = true;

		break;

drivers/gpu/drm/nouveau/nouveau_bo.c

+7 −6
Original line number Diff line number Diff line
@@ -128,6 +128,7 @@ nouveau_bo_new(struct drm_device *dev, struct nouveau_channel *chan, 
		}

	}



	nvbo->bo.mem.num_pages = size >> PAGE_SHIFT;

	nouveau_bo_placement_set(nvbo, flags, 0);



	nvbo->channel = chan;
@@ -166,17 +167,17 @@ static void 
set_placement_range(struct nouveau_bo *nvbo, uint32_t type)

{

	struct drm_nouveau_private *dev_priv = nouveau_bdev(nvbo->bo.bdev);

	int vram_pages = dev_priv->vram_size >> PAGE_SHIFT;



	if (dev_priv->card_type == NV_10 &&

	    nvbo->tile_mode && (type & TTM_PL_FLAG_VRAM)) {

	    nvbo->tile_mode && (type & TTM_PL_FLAG_VRAM) &&

	    nvbo->bo.mem.num_pages < vram_pages / 2) {

		/*

		 * Make sure that the color and depth buffers are handled

		 * by independent memory controller units. Up to a 9x

		 * speed up when alpha-blending and depth-test are enabled

		 * at the same time.

		 */

		int vram_pages = dev_priv->vram_size >> PAGE_SHIFT;



		if (nvbo->tile_flags & NOUVEAU_GEM_TILE_ZETA) {

			nvbo->placement.fpfn = vram_pages / 2;

			nvbo->placement.lpfn = ~0;
@@ -785,7 +786,7 @@ nouveau_bo_move_flipd(struct ttm_buffer_object *bo, bool evict, bool intr, 
	if (ret)

		goto out;



	ret = ttm_bo_move_ttm(bo, evict, no_wait_reserve, no_wait_gpu, new_mem);

	ret = ttm_bo_move_ttm(bo, true, no_wait_reserve, no_wait_gpu, new_mem);

out:

	ttm_bo_mem_put(bo, &tmp_mem);

	return ret;
@@ -811,11 +812,11 @@ nouveau_bo_move_flips(struct ttm_buffer_object *bo, bool evict, bool intr, 
	if (ret)

		return ret;



	ret = ttm_bo_move_ttm(bo, evict, no_wait_reserve, no_wait_gpu, &tmp_mem);

	ret = ttm_bo_move_ttm(bo, true, no_wait_reserve, no_wait_gpu, &tmp_mem);

	if (ret)

		goto out;



	ret = nouveau_bo_move_m2mf(bo, evict, intr, no_wait_reserve, no_wait_gpu, new_mem);

	ret = nouveau_bo_move_m2mf(bo, true, intr, no_wait_reserve, no_wait_gpu, new_mem);

	if (ret)

		goto out;

drivers/gpu/drm/nouveau/nouveau_connector.c

+1 −0
Original line number Diff line number Diff line
@@ -507,6 +507,7 @@ nouveau_connector_native_mode(struct drm_connector *connector) 
	int high_w = 0, high_h = 0, high_v = 0;



	list_for_each_entry(mode, &nv_connector->base.probed_modes, head) {

		mode->vrefresh = drm_mode_vrefresh(mode);

		if (helper->mode_valid(connector, mode) != MODE_OK ||

		    (mode->flags & DRM_MODE_FLAG_INTERLACE))

			continue;

drivers/gpu/drm/nouveau/nouveau_pm.c

+1 −1
Original line number Diff line number Diff line
@@ -543,7 +543,7 @@ nouveau_pm_resume(struct drm_device *dev) 
	struct nouveau_pm_engine *pm = &dev_priv->engine.pm;

	struct nouveau_pm_level *perflvl;



	if (pm->cur == &pm->boot)

	if (!pm->cur || pm->cur == &pm->boot)

		return;



	perflvl = pm->cur;

drivers/gpu/drm/nouveau/nv04_dfp.c

+3 −9
Original line number Diff line number Diff line
@@ -342,8 +342,8 @@ static void nv04_dfp_mode_set(struct drm_encoder *encoder, 
	if (nv_encoder->dcb->type == OUTPUT_LVDS) {

		bool duallink, dummy;



		nouveau_bios_parse_lvds_table(dev, nv_connector->native_mode->

					      clock, &duallink, &dummy);

		nouveau_bios_parse_lvds_table(dev, output_mode->clock,

					      &duallink, &dummy);

		if (duallink)

			regp->fp_control |= (8 << 28);

	} else
@@ -518,8 +518,6 @@ static void nv04_lvds_dpms(struct drm_encoder *encoder, int mode) 
		return;



	if (nv_encoder->dcb->lvdsconf.use_power_scripts) {

		struct nouveau_connector *nv_connector = nouveau_encoder_connector_get(nv_encoder);



		/* when removing an output, crtc may not be set, but PANEL_OFF

		 * must still be run

		 */
@@ -527,12 +525,8 @@ static void nv04_lvds_dpms(struct drm_encoder *encoder, int mode) 
			   nv04_dfp_get_bound_head(dev, nv_encoder->dcb);



		if (mode == DRM_MODE_DPMS_ON) {

			if (!nv_connector->native_mode) {

				NV_ERROR(dev, "Not turning on LVDS without native mode\n");

				return;

			}

			call_lvds_script(dev, nv_encoder->dcb, head,

					 LVDS_PANEL_ON, nv_connector->native_mode->clock);

					 LVDS_PANEL_ON, nv_encoder->mode.clock);

		} else

			/* pxclk of 0 is fine for PANEL_OFF, and for a

			 * disconnected LVDS encoder there is no native_mode