Commit 67f35a41 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-fixes-2023-10-05' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes 



Short summary of fixes pull:

 * test: Fix kunit release
 * panel-orientation: Add quirk for One Mix 25
 * nouveau:
   * Report IB limit via getparams
   * Replace some magic numbers with constants
   * Clean up

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20231005092632.GA17332@linux-uq9g
parents 62af7387 d59e75ee

drivers/gpu/drm/drm_panel_orientation_quirks.c

+16 −0
Original line number Diff line number Diff line
@@ -38,6 +38,14 @@ static const struct drm_dmi_panel_orientation_data gpd_micropc = { 
	.orientation = DRM_MODE_PANEL_ORIENTATION_RIGHT_UP,

};



static const struct drm_dmi_panel_orientation_data gpd_onemix2s = {

	.width = 1200,

	.height = 1920,

	.bios_dates = (const char * const []){ "05/21/2018", "10/26/2018",

		"03/04/2019", NULL },

	.orientation = DRM_MODE_PANEL_ORIENTATION_RIGHT_UP,

};



static const struct drm_dmi_panel_orientation_data gpd_pocket = {

	.width = 1200,

	.height = 1920,
@@ -401,6 +409,14 @@ static const struct dmi_system_id orientation_data[] = { 
		  DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "LTH17"),

		},

		.driver_data = (void *)&lcd800x1280_rightside_up,

	}, {	/* One Mix 2S (generic strings, also match on bios date) */

		.matches = {

		  DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Default string"),

		  DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Default string"),

		  DMI_EXACT_MATCH(DMI_BOARD_VENDOR, "Default string"),

		  DMI_EXACT_MATCH(DMI_BOARD_NAME, "Default string"),

		},

		.driver_data = (void *)&gpd_onemix2s,

	},

	{}

};

drivers/gpu/drm/nouveau/nouveau_abi16.c

+21 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 


#include "nouveau_drv.h"

#include "nouveau_dma.h"

#include "nouveau_exec.h"

#include "nouveau_gem.h"

#include "nouveau_chan.h"

#include "nouveau_abi16.h"
@@ -183,6 +184,20 @@ nouveau_abi16_fini(struct nouveau_abi16 *abi16) 
	cli->abi16 = NULL;

}



static inline int

getparam_dma_ib_max(struct nvif_device *device)

{

	const struct nvif_mclass dmas[] = {

		{ NV03_CHANNEL_DMA, 0 },

		{ NV10_CHANNEL_DMA, 0 },

		{ NV17_CHANNEL_DMA, 0 },

		{ NV40_CHANNEL_DMA, 0 },

		{}

	};



	return nvif_mclass(&device->object, dmas) < 0 ? NV50_DMA_IB_MAX : 0;

}



int

nouveau_abi16_ioctl_getparam(ABI16_IOCTL_ARGS)

{
@@ -247,6 +262,12 @@ nouveau_abi16_ioctl_getparam(ABI16_IOCTL_ARGS) 
	case NOUVEAU_GETPARAM_GRAPH_UNITS:

		getparam->value = nvkm_gr_units(gr);

		break;

	case NOUVEAU_GETPARAM_EXEC_PUSH_MAX: {

		int ib_max = getparam_dma_ib_max(device);



		getparam->value = nouveau_exec_push_max_from_ib_max(ib_max);

		break;

	}

	default:

		NV_PRINTK(dbg, cli, "unknown parameter %lld\n", getparam->param);

		return -EINVAL;

drivers/gpu/drm/nouveau/nouveau_chan.c

+7 −8
Original line number Diff line number Diff line
@@ -257,10 +257,7 @@ static int 
nouveau_channel_ctor(struct nouveau_drm *drm, struct nvif_device *device, bool priv, u64 runm,

		     struct nouveau_channel **pchan)

{

	static const struct {

		s32 oclass;

		int version;

	} hosts[] = {

	const struct nvif_mclass hosts[] = {

		{  AMPERE_CHANNEL_GPFIFO_B, 0 },

		{  AMPERE_CHANNEL_GPFIFO_A, 0 },

		{  TURING_CHANNEL_GPFIFO_A, 0 },
@@ -443,9 +440,11 @@ nouveau_channel_init(struct nouveau_channel *chan, u32 vram, u32 gart) 
	}



	/* initialise dma tracking parameters */

	switch (chan->user.oclass & 0x00ff) {

	case 0x006b:

	case 0x006e:

	switch (chan->user.oclass) {

	case NV03_CHANNEL_DMA:

	case NV10_CHANNEL_DMA:

	case NV17_CHANNEL_DMA:

	case NV40_CHANNEL_DMA:

		chan->user_put = 0x40;

		chan->user_get = 0x44;

		chan->dma.max = (0x10000 / 4) - 2;
@@ -455,7 +454,7 @@ nouveau_channel_init(struct nouveau_channel *chan, u32 vram, u32 gart) 
		chan->user_get = 0x44;

		chan->user_get_hi = 0x60;

		chan->dma.ib_base =  0x10000 / 4;

		chan->dma.ib_max  = (0x02000 / 8) - 1;

		chan->dma.ib_max  = NV50_DMA_IB_MAX;

		chan->dma.ib_put  = 0;

		chan->dma.ib_free = chan->dma.ib_max - chan->dma.ib_put;

		chan->dma.max = chan->dma.ib_base;

drivers/gpu/drm/nouveau/nouveau_dma.h

+3 −0
Original line number Diff line number Diff line
@@ -49,6 +49,9 @@ void nv50_dma_push(struct nouveau_channel *, u64 addr, u32 length, 
/* Maximum push buffer size. */

#define NV50_DMA_PUSH_MAX_LENGTH 0x7fffff



/* Maximum IBs per ring. */

#define NV50_DMA_IB_MAX ((0x02000 / 8) - 1)



/* Object handles - for stuff that's doesn't use handle == oclass. */

enum {

	NvDmaFB		= 0x80000002,

drivers/gpu/drm/nouveau/nouveau_exec.c

+4 −3
Original line number Diff line number Diff line
@@ -379,7 +379,7 @@ nouveau_exec_ioctl_exec(struct drm_device *dev, 
	struct nouveau_channel *chan = NULL;

	struct nouveau_exec_job_args args = {};

	struct drm_nouveau_exec *req = data;

	int ret = 0;

	int push_max, ret = 0;



	if (unlikely(!abi16))

		return -ENOMEM;
@@ -404,9 +404,10 @@ nouveau_exec_ioctl_exec(struct drm_device *dev, 
	if (!chan->dma.ib_max)

		return nouveau_abi16_put(abi16, -ENOSYS);



	if (unlikely(req->push_count > NOUVEAU_GEM_MAX_PUSH)) {

	push_max = nouveau_exec_push_max_from_ib_max(chan->dma.ib_max);

	if (unlikely(req->push_count > push_max)) {

		NV_PRINTK(err, cli, "pushbuf push count exceeds limit: %d max %d\n",

			 req->push_count, NOUVEAU_GEM_MAX_PUSH);

			  req->push_count, push_max);

		return nouveau_abi16_put(abi16, -EINVAL);

	}