Commit 87bff758 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch '04.01-ampere-lite' of git://github.com/skeggsb/linux into drm-fixes 



Mostly a regression fixes here, a couple of which could lead to
display hanging, and have been affecting a number of users.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Ben Skeggs <skeggsb@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/CACAvsv4Y0ZiAevSvgphLAOaZjFi75ECXqUD9ShBvRxZ6S-pb9Q@mail.gmail.com
parents 6ee1d745 ba839b75

drivers/gpu/drm/nouveau/dispnv50/base507c.c

+5 −1
Original line number Diff line number Diff line
@@ -88,7 +88,11 @@ base507c_image_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw) 
			  NVVAL(NV507C, SET_CONVERSION, OFS, 0x64));

	} else {

		PUSH_MTHD(push, NV507C, SET_PROCESSING,

			  NVDEF(NV507C, SET_PROCESSING, USE_GAIN_OFS, DISABLE));

			  NVDEF(NV507C, SET_PROCESSING, USE_GAIN_OFS, DISABLE),



					SET_CONVERSION,

			  NVVAL(NV507C, SET_CONVERSION, GAIN, 0) |

			  NVVAL(NV507C, SET_CONVERSION, OFS, 0));

	}



	PUSH_MTHD(push, NV507C, SURFACE_SET_OFFSET(0, 0), asyw->image.offset[0] >> 8);

drivers/gpu/drm/nouveau/dispnv50/base827c.c

+5 −1
Original line number Diff line number Diff line
@@ -49,7 +49,11 @@ base827c_image_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw) 
			  NVVAL(NV827C, SET_CONVERSION, OFS, 0x64));

	} else {

		PUSH_MTHD(push, NV827C, SET_PROCESSING,

			  NVDEF(NV827C, SET_PROCESSING, USE_GAIN_OFS, DISABLE));

			  NVDEF(NV827C, SET_PROCESSING, USE_GAIN_OFS, DISABLE),



					SET_CONVERSION,

			  NVVAL(NV827C, SET_CONVERSION, GAIN, 0) |

			  NVVAL(NV827C, SET_CONVERSION, OFS, 0));

	}



	PUSH_MTHD(push, NV827C, SURFACE_SET_OFFSET(0, 0), asyw->image.offset[0] >> 8,

drivers/gpu/drm/nouveau/dispnv50/disp.c

+8 −0
Original line number Diff line number Diff line
@@ -2663,6 +2663,14 @@ nv50_display_create(struct drm_device *dev) 
	else

		nouveau_display(dev)->format_modifiers = disp50xx_modifiers;



	if (disp->disp->object.oclass >= GK104_DISP) {

		dev->mode_config.cursor_width = 256;

		dev->mode_config.cursor_height = 256;

	} else {

		dev->mode_config.cursor_width = 64;

		dev->mode_config.cursor_height = 64;

	}



	/* create crtc objects to represent the hw heads */

	if (disp->disp->object.oclass >= GV100_DISP)

		crtcs = nvif_rd32(&device->object, 0x610060) & 0xff;

drivers/gpu/drm/nouveau/dispnv50/head917d.c

+27 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include "head.h"

#include "core.h"



#include "nvif/push.h"

#include <nvif/push507c.h>



#include <nvhw/class/cl917d.h>
@@ -73,6 +74,31 @@ head917d_base(struct nv50_head *head, struct nv50_head_atom *asyh) 
	return 0;

}



static int

head917d_curs_set(struct nv50_head *head, struct nv50_head_atom *asyh)

{

	struct nvif_push *push = nv50_disp(head->base.base.dev)->core->chan.push;

	const int i = head->base.index;

	int ret;



	ret = PUSH_WAIT(push, 5);

	if (ret)

		return ret;



	PUSH_MTHD(push, NV917D, HEAD_SET_CONTROL_CURSOR(i),

		  NVDEF(NV917D, HEAD_SET_CONTROL_CURSOR, ENABLE, ENABLE) |

		  NVVAL(NV917D, HEAD_SET_CONTROL_CURSOR, FORMAT, asyh->curs.format) |

		  NVVAL(NV917D, HEAD_SET_CONTROL_CURSOR, SIZE, asyh->curs.layout) |

		  NVVAL(NV917D, HEAD_SET_CONTROL_CURSOR, HOT_SPOT_X, 0) |

		  NVVAL(NV917D, HEAD_SET_CONTROL_CURSOR, HOT_SPOT_Y, 0) |

		  NVDEF(NV917D, HEAD_SET_CONTROL_CURSOR, COMPOSITION, ALPHA_BLEND),



				HEAD_SET_OFFSET_CURSOR(i), asyh->curs.offset >> 8);



	PUSH_MTHD(push, NV917D, HEAD_SET_CONTEXT_DMA_CURSOR(i), asyh->curs.handle);

	return 0;

}



int

head917d_curs_layout(struct nv50_head *head, struct nv50_wndw_atom *asyw,

		     struct nv50_head_atom *asyh)
@@ -101,7 +127,7 @@ head917d = { 
	.core_clr = head907d_core_clr,

	.curs_layout = head917d_curs_layout,

	.curs_format = head507d_curs_format,

	.curs_set = head907d_curs_set,

	.curs_set = head917d_curs_set,

	.curs_clr = head907d_curs_clr,

	.base = head917d_base,

	.ovly = head907d_ovly,

drivers/gpu/drm/nouveau/dispnv50/wndw.c

+13 −4
Original line number Diff line number Diff line
@@ -702,6 +702,11 @@ nv50_wndw_init(struct nv50_wndw *wndw) 
	nvif_notify_get(&wndw->notify);

}



static const u64 nv50_cursor_format_modifiers[] = {

	DRM_FORMAT_MOD_LINEAR,

	DRM_FORMAT_MOD_INVALID,

};



int

nv50_wndw_new_(const struct nv50_wndw_func *func, struct drm_device *dev,

	       enum drm_plane_type type, const char *name, int index,
@@ -713,6 +718,7 @@ nv50_wndw_new_(const struct nv50_wndw_func *func, struct drm_device *dev, 
	struct nvif_mmu *mmu = &drm->client.mmu;

	struct nv50_disp *disp = nv50_disp(dev);

	struct nv50_wndw *wndw;

	const u64 *format_modifiers;

	int nformat;

	int ret;
@@ -728,10 +734,13 @@ nv50_wndw_new_(const struct nv50_wndw_func *func, struct drm_device *dev, 


	for (nformat = 0; format[nformat]; nformat++);



	ret = drm_universal_plane_init(dev, &wndw->plane, heads, &nv50_wndw,

				       format, nformat,

				       nouveau_display(dev)->format_modifiers,

				       type, "%s-%d", name, index);

	if (type == DRM_PLANE_TYPE_CURSOR)

		format_modifiers = nv50_cursor_format_modifiers;

	else

		format_modifiers = nouveau_display(dev)->format_modifiers;



	ret = drm_universal_plane_init(dev, &wndw->plane, heads, &nv50_wndw, format, nformat,

				       format_modifiers, type, "%s-%d", name, index);

	if (ret) {

		kfree(*pwndw);

		*pwndw = NULL;