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

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



 * drm/cma-helper: Set VM_DONTEXPAND
 * drm/atomic: Fix error handling in drm_atomic_set_mode_for_crtc()

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

From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/Yg4mzQALMX69UmA3@linux-uq9g
parents 6379bd44 439cf34c

drivers/gpu/drm/drm_atomic_uapi.c

+8 −6
Original line number Diff line number Diff line
@@ -76,15 +76,17 @@ int drm_atomic_set_mode_for_crtc(struct drm_crtc_state *state, 
	state->mode_blob = NULL;



	if (mode) {

		struct drm_property_blob *blob;



		drm_mode_convert_to_umode(&umode, mode);

		state->mode_blob =

			drm_property_create_blob(state->crtc->dev,

						 sizeof(umode),

						 &umode);

		if (IS_ERR(state->mode_blob))

			return PTR_ERR(state->mode_blob);

		blob = drm_property_create_blob(crtc->dev,

						sizeof(umode), &umode);

		if (IS_ERR(blob))

			return PTR_ERR(blob);



		drm_mode_copy(&state->mode, mode);



		state->mode_blob = blob;

		state->enable = true;

		drm_dbg_atomic(crtc->dev,

			       "Set [MODE:%s] for [CRTC:%d:%s] state %p\n",

drivers/gpu/drm/drm_gem_cma_helper.c

+1 −0
Original line number Diff line number Diff line
@@ -512,6 +512,7 @@ int drm_gem_cma_mmap(struct drm_gem_cma_object *cma_obj, struct vm_area_struct * 
	 */

	vma->vm_pgoff -= drm_vma_node_start(&obj->vma_node);

	vma->vm_flags &= ~VM_PFNMAP;

	vma->vm_flags |= VM_DONTEXPAND;



	if (cma_obj->map_noncoherent) {

		vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);