Commit ce156c8a authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-fixes-2022-07-29' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes 



One fix to fix simpledrm mode_valid return value, and one for page
migration in nouveau

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

From: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20220729094514.sfzhc3gqjgwgal62@penduick
parents f16a2f59 66cee909

drivers/gpu/drm/nouveau/nouveau_dmem.c

+5 −1
Original line number Diff line number Diff line
@@ -680,7 +680,11 @@ nouveau_dmem_migrate_vma(struct nouveau_drm *drm, 
		goto out_free_dma;



	for (i = 0; i < npages; i += max) {

		args.end = start + (max << PAGE_SHIFT);

		if (args.start + (max << PAGE_SHIFT) > end)

			args.end = end;

		else

			args.end = args.start + (max << PAGE_SHIFT);



		ret = migrate_vma_setup(&args);

		if (ret)

			goto out_free_pfns;

drivers/gpu/drm/tiny/simpledrm.c

+1 −1
Original line number Diff line number Diff line
@@ -627,7 +627,7 @@ static const struct drm_connector_funcs simpledrm_connector_funcs = { 
	.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,

};



static int

static enum drm_mode_status

simpledrm_simple_display_pipe_mode_valid(struct drm_simple_display_pipe *pipe,

				    const struct drm_display_mode *mode)

{