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

Commit cfb3c0ab authored by Daniel Vetter's avatar Daniel Vetter
Browse files

Merge patches merged by Jani while I was on vacation. 



Jani apparently didn't rebase onto latest drm-intel-next so a merge is
in order.

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parents 34882298 57127efa

drivers/gpu/drm/i915/i915_debugfs.c

+5 −5
Original line number Diff line number Diff line
@@ -2356,17 +2356,17 @@ static int i915_display_info(struct seq_file *m, void *unused) 
		bool active;

		int x, y;



		seq_printf(m, "CRTC %d: pipe: %c, active: %s\n",

		seq_printf(m, "CRTC %d: pipe: %c, active=%s (size=%dx%d)\n",

			   crtc->base.base.id, pipe_name(crtc->pipe),

			   yesno(crtc->active));

			   yesno(crtc->active), crtc->config.pipe_src_w, crtc->config.pipe_src_h);

		if (crtc->active) {

			intel_crtc_info(m, crtc);



			active = cursor_position(dev, crtc->pipe, &x, &y);

			seq_printf(m, "\tcursor visible? %s, position (%d, %d), addr 0x%08x, active? %s\n",

			seq_printf(m, "\tcursor visible? %s, position (%d, %d), size %dx%d, addr 0x%08x, active? %s\n",

				   yesno(crtc->cursor_base),

				   x, y, crtc->cursor_addr,

				   yesno(active));

				   x, y, crtc->cursor_width, crtc->cursor_height,

				   crtc->cursor_addr, yesno(active));

		}



		seq_printf(m, "\tunderrun reporting: cpu=%s pch=%s \n",

drivers/gpu/drm/i915/i915_drv.c

+2 −0
Original line number Diff line number Diff line
@@ -520,6 +520,8 @@ static int i915_drm_freeze(struct drm_device *dev) 
			return error;

		}



		flush_delayed_work(&dev_priv->rps.delayed_resume_work);



		intel_runtime_pm_disable_interrupts(dev);

		dev_priv->enable_hotplug_processing = false;

drivers/gpu/drm/i915/i915_drv.h

+3 −2
Original line number Diff line number Diff line
@@ -600,11 +600,12 @@ struct intel_context { 


struct i915_fbc {

	unsigned long size;

	unsigned threshold;

	unsigned int fb_id;

	enum plane plane;

	int y;



	struct drm_mm_node *compressed_fb;

	struct drm_mm_node compressed_fb;

	struct drm_mm_node *compressed_llb;



	struct intel_fbc_work {
@@ -2487,7 +2488,7 @@ static inline void i915_gem_chipset_flush(struct drm_device *dev) 


/* i915_gem_stolen.c */

int i915_gem_init_stolen(struct drm_device *dev);

int i915_gem_stolen_setup_compression(struct drm_device *dev, int size);

int i915_gem_stolen_setup_compression(struct drm_device *dev, int size, int fb_cpp);

void i915_gem_stolen_cleanup_compression(struct drm_device *dev);

void i915_gem_cleanup_stolen(struct drm_device *dev);

struct drm_i915_gem_object *

drivers/gpu/drm/i915/i915_gem_stolen.c

+58 −25
Original line number Diff line number Diff line
@@ -103,30 +103,68 @@ static unsigned long i915_stolen_to_physical(struct drm_device *dev) 
	return base;

}



static int i915_setup_compression(struct drm_device *dev, int size)

static int find_compression_threshold(struct drm_device *dev,

				      struct drm_mm_node *node,

				      int size,

				      int fb_cpp)

{

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct drm_mm_node *compressed_fb, *uninitialized_var(compressed_llb);

	int compression_threshold = 1;

	int ret;



	compressed_fb = kzalloc(sizeof(*compressed_fb), GFP_KERNEL);

	if (!compressed_fb)

		goto err_llb;

	/* HACK: This code depends on what we will do in *_enable_fbc. If that

	 * code changes, this code needs to change as well.

	 *

	 * The enable_fbc code will attempt to use one of our 2 compression

	 * thresholds, therefore, in that case, we only have 1 resort.

	 */



	/* Try to over-allocate to reduce reallocations and fragmentation */

	ret = drm_mm_insert_node(&dev_priv->mm.stolen, compressed_fb,

	/* Try to over-allocate to reduce reallocations and fragmentation. */

	ret = drm_mm_insert_node(&dev_priv->mm.stolen, node,

				 size <<= 1, 4096, DRM_MM_SEARCH_DEFAULT);

	if (ret)

		ret = drm_mm_insert_node(&dev_priv->mm.stolen, compressed_fb,

	if (ret == 0)

		return compression_threshold;



again:

	/* HW's ability to limit the CFB is 1:4 */

	if (compression_threshold > 4 ||

	    (fb_cpp == 2 && compression_threshold == 2))

		return 0;



	ret = drm_mm_insert_node(&dev_priv->mm.stolen, node,

				 size >>= 1, 4096,

				 DRM_MM_SEARCH_DEFAULT);

	if (ret)

	if (ret && INTEL_INFO(dev)->gen <= 4) {

		return 0;

	} else if (ret) {

		compression_threshold <<= 1;

		goto again;

	} else {

		return compression_threshold;

	}

}



static int i915_setup_compression(struct drm_device *dev, int size, int fb_cpp)

{

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct drm_mm_node *uninitialized_var(compressed_llb);

	int ret;



	ret = find_compression_threshold(dev, &dev_priv->fbc.compressed_fb,

					 size, fb_cpp);

	if (!ret)

		goto err_llb;

	else if (ret > 1) {

		DRM_INFO("Reducing the compressed framebuffer size. This may lead to less power savings than a non-reduced-size. Try to increase stolen memory size if available in BIOS.\n");



	}



	dev_priv->fbc.threshold = ret;



	if (HAS_PCH_SPLIT(dev))

		I915_WRITE(ILK_DPFC_CB_BASE, compressed_fb->start);

		I915_WRITE(ILK_DPFC_CB_BASE, dev_priv->fbc.compressed_fb.start);

	else if (IS_GM45(dev)) {

		I915_WRITE(DPFC_CB_BASE, compressed_fb->start);

		I915_WRITE(DPFC_CB_BASE, dev_priv->fbc.compressed_fb.start);

	} else {

		compressed_llb = kzalloc(sizeof(*compressed_llb), GFP_KERNEL);

		if (!compressed_llb)
@@ -140,13 +178,12 @@ static int i915_setup_compression(struct drm_device *dev, int size) 
		dev_priv->fbc.compressed_llb = compressed_llb;



		I915_WRITE(FBC_CFB_BASE,

			   dev_priv->mm.stolen_base + compressed_fb->start);

			   dev_priv->mm.stolen_base + dev_priv->fbc.compressed_fb.start);

		I915_WRITE(FBC_LL_BASE,

			   dev_priv->mm.stolen_base + compressed_llb->start);

	}



	dev_priv->fbc.compressed_fb = compressed_fb;

	dev_priv->fbc.size = size;

	dev_priv->fbc.size = size / dev_priv->fbc.threshold;



	DRM_DEBUG_KMS("reserved %d bytes of contiguous stolen space for FBC\n",

		      size);
@@ -155,14 +192,13 @@ static int i915_setup_compression(struct drm_device *dev, int size) 


err_fb:

	kfree(compressed_llb);

	drm_mm_remove_node(compressed_fb);

	drm_mm_remove_node(&dev_priv->fbc.compressed_fb);

err_llb:

	kfree(compressed_fb);

	pr_info_once("drm: not enough stolen space for compressed buffer (need %d more bytes), disabling. Hint: you may be able to increase stolen memory size in the BIOS to avoid this.\n", size);

	return -ENOSPC;

}



int i915_gem_stolen_setup_compression(struct drm_device *dev, int size)

int i915_gem_stolen_setup_compression(struct drm_device *dev, int size, int fb_cpp)

{

	struct drm_i915_private *dev_priv = dev->dev_private;
@@ -175,7 +211,7 @@ int i915_gem_stolen_setup_compression(struct drm_device *dev, int size) 
	/* Release any current block */

	i915_gem_stolen_cleanup_compression(dev);



	return i915_setup_compression(dev, size);

	return i915_setup_compression(dev, size, fb_cpp);

}



void i915_gem_stolen_cleanup_compression(struct drm_device *dev)
@@ -185,10 +221,7 @@ void i915_gem_stolen_cleanup_compression(struct drm_device *dev) 
	if (dev_priv->fbc.size == 0)

		return;



	if (dev_priv->fbc.compressed_fb) {

		drm_mm_remove_node(dev_priv->fbc.compressed_fb);

		kfree(dev_priv->fbc.compressed_fb);

	}

	drm_mm_remove_node(&dev_priv->fbc.compressed_fb);



	if (dev_priv->fbc.compressed_llb) {

		drm_mm_remove_node(dev_priv->fbc.compressed_llb);

drivers/gpu/drm/i915/intel_display.c

+8 −6
Original line number Diff line number Diff line
@@ -2690,6 +2690,7 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y, 
	enum pipe pipe = intel_crtc->pipe;

	struct drm_framebuffer *old_fb;

	struct drm_i915_gem_object *obj = to_intel_framebuffer(fb)->obj;

	struct drm_i915_gem_object *old_obj;

	int ret;



	if (intel_crtc_has_pending_flip(crtc)) {
@@ -2711,11 +2712,12 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y, 
	}



	old_fb = crtc->primary->fb;

	old_obj = old_fb ? to_intel_framebuffer(old_fb)->obj : NULL;



	mutex_lock(&dev->struct_mutex);

	ret = intel_pin_and_fence_fb_obj(dev, obj, NULL);

	if (ret == 0)

		i915_gem_track_fb(to_intel_framebuffer(old_fb)->obj, obj,

		i915_gem_track_fb(old_obj, obj,

				  INTEL_FRONTBUFFER_PRIMARY(pipe));

	mutex_unlock(&dev->struct_mutex);

	if (ret != 0) {
@@ -6207,8 +6209,8 @@ static void i9xx_get_plane_config(struct intel_crtc *crtc, 
	aligned_height = intel_align_height(dev, crtc->base.primary->fb->height,

					    plane_config->tiled);



	plane_config->size = ALIGN(crtc->base.primary->fb->pitches[0] *

				   aligned_height, PAGE_SIZE);

	plane_config->size = PAGE_ALIGN(crtc->base.primary->fb->pitches[0] *

					aligned_height);



	DRM_DEBUG_KMS("pipe/plane %d/%d with fb: size=%dx%d@%d, offset=%x, pitch %d, size 0x%x\n",

		      pipe, plane, crtc->base.primary->fb->width,
@@ -7227,8 +7229,8 @@ static void ironlake_get_plane_config(struct intel_crtc *crtc, 
	aligned_height = intel_align_height(dev, crtc->base.primary->fb->height,

					    plane_config->tiled);



	plane_config->size = ALIGN(crtc->base.primary->fb->pitches[0] *

				   aligned_height, PAGE_SIZE);

	plane_config->size = PAGE_ALIGN(crtc->base.primary->fb->pitches[0] *

					aligned_height);



	DRM_DEBUG_KMS("pipe/plane %d/%d with fb: size=%dx%d@%d, offset=%x, pitch %d, size 0x%x\n",

		      pipe, plane, crtc->base.primary->fb->width,
@@ -8316,7 +8318,7 @@ static u32 
intel_framebuffer_size_for_mode(struct drm_display_mode *mode, int bpp)

{

	u32 pitch = intel_framebuffer_pitch_for_width(mode->hdisplay, bpp);

	return ALIGN(pitch * mode->vdisplay, PAGE_SIZE);

	return PAGE_ALIGN(pitch * mode->vdisplay);

}



static struct drm_framebuffer *