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

Commit 96a03fce authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'drm-kdb-next' into drm-core-next 

* drm-kdb-next:
  drm/nouveau/kms: Avoid a hang entering KDB with VT accel on.
  radeon, kdb, kms: Save and restore the LUT on atomic KMS enter/exit
  drm, kdb, kms: Add an enter argument to mode_set_base_atomic() API
  drm/nouveau/kms: Implement KDB debug hooks for nouveau KMS.
  drm/radeon/kms: Implement KDB debug hooks for radeon KMS.
parents 0c8eb0dc a424d761

drivers/gpu/drm/drm_fb_helper.c

+3 −2
Original line number Diff line number Diff line
@@ -263,7 +263,8 @@ int drm_fb_helper_debug_enter(struct fb_info *info) 
			funcs->mode_set_base_atomic(mode_set->crtc,

						    mode_set->fb,

						    mode_set->x,

						    mode_set->y);

						    mode_set->y,

						    1);



		}

	}
@@ -309,7 +310,7 @@ int drm_fb_helper_debug_leave(struct fb_info *info) 
		}



		funcs->mode_set_base_atomic(mode_set->crtc, fb, crtc->x,

					    crtc->y);

					    crtc->y, 0);

	}



	return 0;

drivers/gpu/drm/i915/intel_display.c

+2 −2
Original line number Diff line number Diff line
@@ -1492,7 +1492,7 @@ intel_pin_and_fence_fb_obj(struct drm_device *dev, 
/* Assume fb object is pinned & idle & fenced and just update base pointers */

static int

intel_pipe_set_base_atomic(struct drm_crtc *crtc, struct drm_framebuffer *fb,

			   int x, int y)

			   int x, int y, int enter)

{

	struct drm_device *dev = crtc->dev;

	struct drm_i915_private *dev_priv = dev->dev_private;
@@ -1614,7 +1614,7 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y, 
			   atomic_read(&obj_priv->pending_flip) == 0);

	}



	ret = intel_pipe_set_base_atomic(crtc, crtc->fb, x, y);

	ret = intel_pipe_set_base_atomic(crtc, crtc->fb, x, y, 0);

	if (ret) {

		i915_gem_object_unpin(to_intel_framebuffer(crtc->fb)->obj);

		mutex_unlock(&dev->struct_mutex);

drivers/gpu/drm/nouveau/nouveau_fbcon.c

+6 −0
Original line number Diff line number Diff line
@@ -104,6 +104,8 @@ static struct fb_ops nouveau_fbcon_ops = { 
	.fb_pan_display = drm_fb_helper_pan_display,

	.fb_blank = drm_fb_helper_blank,

	.fb_setcmap = drm_fb_helper_setcmap,

	.fb_debug_enter = drm_fb_helper_debug_enter,

	.fb_debug_leave = drm_fb_helper_debug_leave,

};



static struct fb_ops nv04_fbcon_ops = {
@@ -117,6 +119,8 @@ static struct fb_ops nv04_fbcon_ops = { 
	.fb_pan_display = drm_fb_helper_pan_display,

	.fb_blank = drm_fb_helper_blank,

	.fb_setcmap = drm_fb_helper_setcmap,

	.fb_debug_enter = drm_fb_helper_debug_enter,

	.fb_debug_leave = drm_fb_helper_debug_leave,

};



static struct fb_ops nv50_fbcon_ops = {
@@ -130,6 +134,8 @@ static struct fb_ops nv50_fbcon_ops = { 
	.fb_pan_display = drm_fb_helper_pan_display,

	.fb_blank = drm_fb_helper_blank,

	.fb_setcmap = drm_fb_helper_setcmap,

	.fb_debug_enter = drm_fb_helper_debug_enter,

	.fb_debug_leave = drm_fb_helper_debug_leave,

};



static void nouveau_fbcon_gamma_set(struct drm_crtc *crtc, u16 red, u16 green,

drivers/gpu/drm/nouveau/nv04_crtc.c

+47 −8
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#include "nouveau_fb.h"

#include "nouveau_hw.h"

#include "nvreg.h"

#include "nouveau_fbcon.h"



static int

nv04_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y,
@@ -769,8 +770,9 @@ nv_crtc_gamma_set(struct drm_crtc *crtc, u16 *r, u16 *g, u16 *b, uint32_t start, 
}



static int

nv04_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y,

			struct drm_framebuffer *old_fb)

nv04_crtc_do_mode_set_base(struct drm_crtc *crtc,

			   struct drm_framebuffer *passed_fb,

			   int x, int y, bool atomic)

{

	struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);

	struct drm_device *dev = crtc->dev;
@@ -781,14 +783,27 @@ nv04_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y, 
	int arb_burst, arb_lwm;

	int ret;



	/* If atomic, we want to switch to the fb we were passed, so

	 * now we update pointers to do that.  (We don't pin; just

	 * assume we're already pinned and update the base address.)

	 */

	if (atomic) {

		drm_fb = passed_fb;

		fb = nouveau_framebuffer(passed_fb);

	}

	else {

		/* If not atomic, we can go ahead and pin, and unpin the

		 * old fb we were passed.

		 */

		ret = nouveau_bo_pin(fb->nvbo, TTM_PL_FLAG_VRAM);

		if (ret)

			return ret;



	if (old_fb) {

		struct nouveau_framebuffer *ofb = nouveau_framebuffer(old_fb);

		if (passed_fb) {

			struct nouveau_framebuffer *ofb = nouveau_framebuffer(passed_fb);

			nouveau_bo_unpin(ofb->nvbo);

		}

	}



	nv_crtc->fb.offset = fb->nvbo->bo.offset;
@@ -835,6 +850,29 @@ nv04_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y, 
	return 0;

}



static int

nv04_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y,

			struct drm_framebuffer *old_fb)

{

	return nv04_crtc_do_mode_set_base(crtc, old_fb, x, y, false);

}



static int

nv04_crtc_mode_set_base_atomic(struct drm_crtc *crtc,

			       struct drm_framebuffer *fb,

			       int x, int y, int enter)

{

	struct drm_nouveau_private *dev_priv = crtc->dev->dev_private;

	struct drm_device *dev = dev_priv->dev;



	if (enter)

		nouveau_fbcon_save_disable_accel(dev);

	else

		nouveau_fbcon_restore_accel(dev);



	return nv04_crtc_do_mode_set_base(crtc, fb, x, y, true);

}



static void nv04_cursor_upload(struct drm_device *dev, struct nouveau_bo *src,

			       struct nouveau_bo *dst)

{
@@ -963,6 +1001,7 @@ static const struct drm_crtc_helper_funcs nv04_crtc_helper_funcs = { 
	.mode_fixup = nv_crtc_mode_fixup,

	.mode_set = nv_crtc_mode_set,

	.mode_set_base = nv04_crtc_mode_set_base,

	.mode_set_base_atomic = nv04_crtc_mode_set_base_atomic,

	.load_lut = nv_crtc_gamma_load,

};

drivers/gpu/drm/nouveau/nv50_crtc.c

+36 −13
Original line number Diff line number Diff line
@@ -487,8 +487,9 @@ nv50_crtc_mode_fixup(struct drm_crtc *crtc, struct drm_display_mode *mode, 
}



static int

nv50_crtc_do_mode_set_base(struct drm_crtc *crtc, int x, int y,

			   struct drm_framebuffer *old_fb, bool update)

nv50_crtc_do_mode_set_base(struct drm_crtc *crtc,

			   struct drm_framebuffer *passed_fb,

			   int x, int y, bool update, bool atomic)

{

	struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);

	struct drm_device *dev = nv_crtc->base.dev;
@@ -500,6 +501,28 @@ nv50_crtc_do_mode_set_base(struct drm_crtc *crtc, int x, int y, 


	NV_DEBUG_KMS(dev, "index %d\n", nv_crtc->index);



	/* If atomic, we want to switch to the fb we were passed, so

	 * now we update pointers to do that.  (We don't pin; just

	 * assume we're already pinned and update the base address.)

	 */

	if (atomic) {

		drm_fb = passed_fb;

		fb = nouveau_framebuffer(passed_fb);

	}

	else {

		/* If not atomic, we can go ahead and pin, and unpin the

		 * old fb we were passed.

		 */

		ret = nouveau_bo_pin(fb->nvbo, TTM_PL_FLAG_VRAM);

		if (ret)

			return ret;



		if (passed_fb) {

			struct nouveau_framebuffer *ofb = nouveau_framebuffer(passed_fb);

			nouveau_bo_unpin(ofb->nvbo);

		}

	}



	switch (drm_fb->depth) {

	case  8:

		format = NV50_EVO_CRTC_FB_DEPTH_8;
@@ -522,15 +545,6 @@ nv50_crtc_do_mode_set_base(struct drm_crtc *crtc, int x, int y, 
		 return -EINVAL;

	}



	ret = nouveau_bo_pin(fb->nvbo, TTM_PL_FLAG_VRAM);

	if (ret)

		return ret;



	if (old_fb) {

		struct nouveau_framebuffer *ofb = nouveau_framebuffer(old_fb);

		nouveau_bo_unpin(ofb->nvbo);

	}



	nv_crtc->fb.offset = fb->nvbo->bo.offset - dev_priv->vm_vram_base;

	nv_crtc->fb.tile_flags = fb->nvbo->tile_flags;

	nv_crtc->fb.cpp = drm_fb->bits_per_pixel / 8;
@@ -681,14 +695,22 @@ nv50_crtc_mode_set(struct drm_crtc *crtc, struct drm_display_mode *mode, 
	nv_crtc->set_dither(nv_crtc, nv_connector->use_dithering, false);

	nv_crtc->set_scale(nv_crtc, nv_connector->scaling_mode, false);



	return nv50_crtc_do_mode_set_base(crtc, x, y, old_fb, false);

	return nv50_crtc_do_mode_set_base(crtc, old_fb, x, y, false, false);

}



static int

nv50_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y,

			struct drm_framebuffer *old_fb)

{

	return nv50_crtc_do_mode_set_base(crtc, x, y, old_fb, true);

	return nv50_crtc_do_mode_set_base(crtc, old_fb, x, y, true, false);

}



static int

nv50_crtc_mode_set_base_atomic(struct drm_crtc *crtc,

			       struct drm_framebuffer *fb,

			       int x, int y, int enter)

{

	return nv50_crtc_do_mode_set_base(crtc, fb, x, y, true, true);

}



static const struct drm_crtc_helper_funcs nv50_crtc_helper_funcs = {
@@ -698,6 +720,7 @@ static const struct drm_crtc_helper_funcs nv50_crtc_helper_funcs = { 
	.mode_fixup = nv50_crtc_mode_fixup,

	.mode_set = nv50_crtc_mode_set,

	.mode_set_base = nv50_crtc_mode_set_base,

	.mode_set_base_atomic = nv50_crtc_mode_set_base_atomic,

	.load_lut = nv50_crtc_lut_load,

};