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

Commit 7c0059dd authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'linux-4.14' of git://github.com/skeggsb/linux into drm-next 

Not a lot that's ready to be included this round for Nouveau.  GP108
modesetting support, and misc other fixes.

* 'linux-4.14' of git://github.com/skeggsb/linux:
  drm/nouveau/kms/nv50: perform null check on msto[i] rathern than msto
  drm/nouveau/pci/msi: disable MSI on big-endian platforms by default
  drm/nouveau: silence suspend/resume debugging messages
  drm/nouveau/kms/nv04-nv4x: fix exposed format list
  drm/nouveau/kms/nv10-nv40: add NV21 support to overlay
  drm/nouveau/kms/nv04-nv40: improve overlay error detection, fix pitch setting
  drm/nouveau/kms/nv04-nv40: prevent undisplayable framebuffers from creation
  drm/nouveau/mpeg: print more debug info when rejecting dma objects
  drm/nouveau/fb/gf100-: zero mmu debug buffers
  drm/nouveau/bar/gf100: add config option to limit BAR2 to 16MiB
  initial support (display-only) for GP108
  drm/nouveau/falcon: use a more reasonable msgqueue timeout value
  drm/nouveau/disp: Silence DCB warnings.
  drm/nouveau/bios: Demote missing fp table message to NV_DEBUG.
  drm/nouveau/pmu/gt215-: abstract detection of whether reset is needed
  drm/nouveau/pmu/gt215: fix reset
  drm/nouveau/mc/gf100: add pmu to reset mask
  drm/nouveau/disp/gf119-: avoid creating non-existent heads
  drm/nouveau/therm/gm200: Added
  drm/nouveau/therm: fix spelling mistake on array thresolds
parents 6b9dfb59 27a451e8

drivers/gpu/drm/nouveau/dispnv04/crtc.c

+35 −1
Original line number Diff line number Diff line
@@ -1096,6 +1096,38 @@ static const struct drm_crtc_helper_funcs nv04_crtc_helper_funcs = { 
	.disable = nv_crtc_disable,

};



static const uint32_t modeset_formats[] = {

        DRM_FORMAT_XRGB8888,

        DRM_FORMAT_RGB565,

        DRM_FORMAT_XRGB1555,

};



static struct drm_plane *

create_primary_plane(struct drm_device *dev)

{

        struct drm_plane *primary;

        int ret;



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

        if (primary == NULL) {

                DRM_DEBUG_KMS("Failed to allocate primary plane\n");

                return NULL;

        }



        /* possible_crtc's will be filled in later by crtc_init */

        ret = drm_universal_plane_init(dev, primary, 0,

                                       &drm_primary_helper_funcs,

                                       modeset_formats,

                                       ARRAY_SIZE(modeset_formats), NULL,

                                       DRM_PLANE_TYPE_PRIMARY, NULL);

        if (ret) {

                kfree(primary);

                primary = NULL;

        }



        return primary;

}



int

nv04_crtc_create(struct drm_device *dev, int crtc_num)

{
@@ -1114,7 +1146,9 @@ nv04_crtc_create(struct drm_device *dev, int crtc_num) 
	nv_crtc->save = nv_crtc_save;

	nv_crtc->restore = nv_crtc_restore;



	drm_crtc_init(dev, &nv_crtc->base, &nv04_crtc_funcs);

	drm_crtc_init_with_planes(dev, &nv_crtc->base,

                                  create_primary_plane(dev), NULL,

                                  &nv04_crtc_funcs, NULL);

	drm_crtc_helper_add(&nv_crtc->base, &nv04_crtc_helper_funcs);

	drm_mode_crtc_set_gamma_size(&nv_crtc->base, 256);

drivers/gpu/drm/nouveau/dispnv04/overlay.c

+40 −31
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ static uint32_t formats[] = { 
	DRM_FORMAT_YUYV,

	DRM_FORMAT_UYVY,

	DRM_FORMAT_NV12,

	DRM_FORMAT_NV21,

};



/* Sine can be approximated with
@@ -89,6 +90,26 @@ cos_mul(int degrees, int factor) 
	return sin_mul((degrees + 90) % 360, factor);

}



static int

verify_scaling(const struct drm_framebuffer *fb, uint8_t shift,

               uint32_t src_x, uint32_t src_y, uint32_t src_w, uint32_t src_h,

               uint32_t crtc_w, uint32_t crtc_h)

{

	if (crtc_w < (src_w >> shift) || crtc_h < (src_h >> shift)) {

		DRM_DEBUG_KMS("Unsuitable framebuffer scaling: %dx%d -> %dx%d\n",

			      src_w, src_h, crtc_w, crtc_h);

		return -ERANGE;

	}



	if (src_x != 0 || src_y != 0) {

		DRM_DEBUG_KMS("Unsuitable framebuffer offset: %d,%d\n",

                              src_x, src_y);

		return -ERANGE;

	}



	return 0;

}



static int

nv10_update_plane(struct drm_plane *plane, struct drm_crtc *crtc,

		  struct drm_framebuffer *fb, int crtc_x, int crtc_y,
@@ -107,7 +128,9 @@ nv10_update_plane(struct drm_plane *plane, struct drm_crtc *crtc, 
	bool flip = nv_plane->flip;

	int soff = NV_PCRTC0_SIZE * nv_crtc->index;

	int soff2 = NV_PCRTC0_SIZE * !nv_crtc->index;

	int format, ret;

	unsigned shift = drm->client.device.info.chipset >= 0x30 ? 1 : 3;

	unsigned format = 0;

	int ret;



	/* Source parameters given in 16.16 fixed point, ignore fractional. */

	src_x >>= 16;
@@ -115,18 +138,9 @@ nv10_update_plane(struct drm_plane *plane, struct drm_crtc *crtc, 
	src_w >>= 16;

	src_h >>= 16;



	format = ALIGN(src_w * 4, 0x100);



	if (format > 0xffff)

		return -ERANGE;



	if (drm->client.device.info.chipset >= 0x30) {

		if (crtc_w < (src_w >> 1) || crtc_h < (src_h >> 1))

			return -ERANGE;

	} else {

		if (crtc_w < (src_w >> 3) || crtc_h < (src_h >> 3))

			return -ERANGE;

	}

	ret = verify_scaling(fb, shift, 0, 0, src_w, src_h, crtc_w, crtc_h);

	if (ret)

		return ret;



	ret = nouveau_bo_pin(nv_fb->nvbo, TTM_PL_FLAG_VRAM, false);

	if (ret)
@@ -146,21 +160,23 @@ nv10_update_plane(struct drm_plane *plane, struct drm_crtc *crtc, 
	nvif_wr32(dev, NV_PVIDEO_POINT_OUT(flip), crtc_y << 16 | crtc_x);

	nvif_wr32(dev, NV_PVIDEO_SIZE_OUT(flip), crtc_h << 16 | crtc_w);



	if (fb->format->format != DRM_FORMAT_UYVY)

	if (fb->format->format == DRM_FORMAT_YUYV ||

	    fb->format->format == DRM_FORMAT_NV12)

		format |= NV_PVIDEO_FORMAT_COLOR_LE_CR8YB8CB8YA8;

	if (fb->format->format == DRM_FORMAT_NV12)

	if (fb->format->format == DRM_FORMAT_NV12 ||

	    fb->format->format == DRM_FORMAT_NV21)

		format |= NV_PVIDEO_FORMAT_PLANAR;

	if (nv_plane->iturbt_709)

		format |= NV_PVIDEO_FORMAT_MATRIX_ITURBT709;

	if (nv_plane->colorkey & (1 << 24))

		format |= NV_PVIDEO_FORMAT_DISPLAY_COLOR_KEY;



	if (fb->format->format == DRM_FORMAT_NV12) {

	if (format & NV_PVIDEO_FORMAT_PLANAR) {

		nvif_wr32(dev, NV_PVIDEO_UVPLANE_BASE(flip), 0);

		nvif_wr32(dev, NV_PVIDEO_UVPLANE_OFFSET_BUFF(flip),

			nv_fb->nvbo->bo.offset + fb->offsets[1]);

	}

	nvif_wr32(dev, NV_PVIDEO_FORMAT(flip), format);

	nvif_wr32(dev, NV_PVIDEO_FORMAT(flip), format | fb->pitches[0]);

	nvif_wr32(dev, NV_PVIDEO_STOP, 0);

	/* TODO: wait for vblank? */

	nvif_wr32(dev, NV_PVIDEO_BUFFER, flip ? 0x10 : 0x1);
@@ -357,7 +373,7 @@ nv04_update_plane(struct drm_plane *plane, struct drm_crtc *crtc, 
	struct nouveau_bo *cur = nv_plane->cur;

	uint32_t overlay = 1;

	int brightness = (nv_plane->brightness - 512) * 62 / 512;

	int pitch, ret, i;

	int ret, i;



	/* Source parameters given in 16.16 fixed point, ignore fractional. */

	src_x >>= 16;
@@ -365,17 +381,9 @@ nv04_update_plane(struct drm_plane *plane, struct drm_crtc *crtc, 
	src_w >>= 16;

	src_h >>= 16;



	pitch = ALIGN(src_w * 4, 0x100);



	if (pitch > 0xffff)

		return -ERANGE;



	/* TODO: Compute an offset? Not sure how to do this for YUYV. */

	if (src_x != 0 || src_y != 0)

		return -ERANGE;



	if (crtc_w < src_w || crtc_h < src_h)

		return -ERANGE;

	ret = verify_scaling(fb, 0, src_x, src_y, src_w, src_h, crtc_w, crtc_h);

	if (ret)

		return ret;



	ret = nouveau_bo_pin(nv_fb->nvbo, TTM_PL_FLAG_VRAM, false);

	if (ret)
@@ -390,7 +398,8 @@ nv04_update_plane(struct drm_plane *plane, struct drm_crtc *crtc, 
	for (i = 0; i < 2; i++) {

		nvif_wr32(dev, NV_PVIDEO_BUFF0_START_ADDRESS + 4 * i,

			  nv_fb->nvbo->bo.offset);

		nvif_wr32(dev, NV_PVIDEO_BUFF0_PITCH_LENGTH + 4 * i, pitch);

		nvif_wr32(dev, NV_PVIDEO_BUFF0_PITCH_LENGTH + 4 * i,

			  fb->pitches[0]);

		nvif_wr32(dev, NV_PVIDEO_BUFF0_OFFSET + 4 * i, 0);

	}

	nvif_wr32(dev, NV_PVIDEO_WINDOW_START, crtc_y << 16 | crtc_x);

drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/conn.h

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ enum dcb_connector_type { 
	DCB_CONNECTOR_HDMI_C = 0x63,

	DCB_CONNECTOR_DMS59_DP0 = 0x64,

	DCB_CONNECTOR_DMS59_DP1 = 0x65,

	DCB_CONNECTOR_WFD	= 0x70,

	DCB_CONNECTOR_NONE = 0xff

};

drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/dcb.h

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ enum dcb_output_type { 
	DCB_OUTPUT_TMDS		= 0x2,

	DCB_OUTPUT_LVDS		= 0x3,

	DCB_OUTPUT_DP		= 0x6,

	DCB_OUTPUT_WFD		= 0x8,

	DCB_OUTPUT_EOL		= 0xe,

	DCB_OUTPUT_UNUSED	= 0xf,

	DCB_OUTPUT_ANY = -1,

drivers/gpu/drm/nouveau/include/nvkm/subdev/therm.h

+1 −0
Original line number Diff line number Diff line
@@ -96,4 +96,5 @@ int g84_therm_new(struct nvkm_device *, int, struct nvkm_therm **); 
int gt215_therm_new(struct nvkm_device *, int, struct nvkm_therm **);

int gf119_therm_new(struct nvkm_device *, int, struct nvkm_therm **);

int gm107_therm_new(struct nvkm_device *, int, struct nvkm_therm **);

int gm200_therm_new(struct nvkm_device *, int, struct nvkm_therm **);

#endif