Commit e65c6a46 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull more drm fixes from Dave Airlie:
 "Maxime had the dog^Wmailing list server eat his homework^Wmisc pull
  request.

  Two more small fixes, one in nouveau svm code and the other in
  simpledrm.

  nouveau:
   - page migration fix

  simpledrm:
   - fix mode_valid return value"

* tag 'drm-fixes-2022-07-30' of git://anongit.freedesktop.org/drm/drm:
  nouveau/svm: Fix to migrate all requested pages
  drm/simpledrm: Fix return type of simpledrm_simple_display_pipe_mode_valid()
parents 1c8ac1c4 ce156c8a

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)

{