Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 95681cda authored by Daniel Vetter's avatar Daniel Vetter
Browse files

Merge tag 'drm-misc-fixes-2019-01-10-1' of... 

Merge tag 'drm-misc-fixes-2019-01-10-1' of git://anongit.freedesktop.org/drm/drm-misc

 into drm-fixes

Second pull request, drm-misc-fixes for v5.0-rc2:
- Fix fb-helper to work correctly with SDL 1.2 bugs.
- Fix lockdep warning in the atomic ioctl and setproperty.

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2cf24f5c-2b1f-befa-8d08-058661146b61@linux.intel.com
parents ae5e5ae9 4089e272

drivers/gpu/drm/drm_atomic_uapi.c

+1 −2
Original line number Diff line number Diff line
@@ -1296,12 +1296,11 @@ int drm_mode_atomic_ioctl(struct drm_device *dev, 
			(arg->flags & DRM_MODE_PAGE_FLIP_EVENT))

		return -EINVAL;



	drm_modeset_acquire_init(&ctx, DRM_MODESET_ACQUIRE_INTERRUPTIBLE);



	state = drm_atomic_state_alloc(dev);

	if (!state)

		return -ENOMEM;



	drm_modeset_acquire_init(&ctx, DRM_MODESET_ACQUIRE_INTERRUPTIBLE);

	state->acquire_ctx = &ctx;

	state->allow_modeset = !!(arg->flags & DRM_MODE_ATOMIC_ALLOW_MODESET);

drivers/gpu/drm/drm_fb_helper.c

+79 −54
Original line number Diff line number Diff line
@@ -1621,6 +1621,64 @@ static bool drm_fb_pixel_format_equal(const struct fb_var_screeninfo *var_1, 
	       var_1->transp.msb_right == var_2->transp.msb_right;

}



static void drm_fb_helper_fill_pixel_fmt(struct fb_var_screeninfo *var,

					 u8 depth)

{

	switch (depth) {

	case 8:

		var->red.offset = 0;

		var->green.offset = 0;

		var->blue.offset = 0;

		var->red.length = 8; /* 8bit DAC */

		var->green.length = 8;

		var->blue.length = 8;

		var->transp.offset = 0;

		var->transp.length = 0;

		break;

	case 15:

		var->red.offset = 10;

		var->green.offset = 5;

		var->blue.offset = 0;

		var->red.length = 5;

		var->green.length = 5;

		var->blue.length = 5;

		var->transp.offset = 15;

		var->transp.length = 1;

		break;

	case 16:

		var->red.offset = 11;

		var->green.offset = 5;

		var->blue.offset = 0;

		var->red.length = 5;

		var->green.length = 6;

		var->blue.length = 5;

		var->transp.offset = 0;

		break;

	case 24:

		var->red.offset = 16;

		var->green.offset = 8;

		var->blue.offset = 0;

		var->red.length = 8;

		var->green.length = 8;

		var->blue.length = 8;

		var->transp.offset = 0;

		var->transp.length = 0;

		break;

	case 32:

		var->red.offset = 16;

		var->green.offset = 8;

		var->blue.offset = 0;

		var->red.length = 8;

		var->green.length = 8;

		var->blue.length = 8;

		var->transp.offset = 24;

		var->transp.length = 8;

		break;

	default:

		break;

	}

}



/**

 * drm_fb_helper_check_var - implementation for &fb_ops.fb_check_var

 * @var: screeninfo to check
@@ -1632,9 +1690,14 @@ int drm_fb_helper_check_var(struct fb_var_screeninfo *var, 
	struct drm_fb_helper *fb_helper = info->par;

	struct drm_framebuffer *fb = fb_helper->fb;



	if (var->pixclock != 0 || in_dbg_master())

	if (in_dbg_master())

		return -EINVAL;



	if (var->pixclock != 0) {

		DRM_DEBUG("fbdev emulation doesn't support changing the pixel clock, value of pixclock is ignored\n");

		var->pixclock = 0;

	}



	if ((drm_format_info_block_width(fb->format, 0) > 1) ||

	    (drm_format_info_block_height(fb->format, 0) > 1))

		return -EINVAL;
@@ -1654,6 +1717,20 @@ int drm_fb_helper_check_var(struct fb_var_screeninfo *var, 
		return -EINVAL;

	}



	/*

	 * Workaround for SDL 1.2, which is known to be setting all pixel format

	 * fields values to zero in some cases. We treat this situation as a

	 * kind of "use some reasonable autodetected values".

	 */

	if (!var->red.offset     && !var->green.offset    &&

	    !var->blue.offset    && !var->transp.offset   &&

	    !var->red.length     && !var->green.length    &&

	    !var->blue.length    && !var->transp.length   &&

	    !var->red.msb_right  && !var->green.msb_right &&

	    !var->blue.msb_right && !var->transp.msb_right) {

		drm_fb_helper_fill_pixel_fmt(var, fb->format->depth);

	}



	/*

	 * drm fbdev emulation doesn't support changing the pixel format at all,

	 * so reject all pixel format changing requests.
@@ -1967,59 +2044,7 @@ void drm_fb_helper_fill_var(struct fb_info *info, struct drm_fb_helper *fb_helpe 
	info->var.yoffset = 0;

	info->var.activate = FB_ACTIVATE_NOW;



	switch (fb->format->depth) {

	case 8:

		info->var.red.offset = 0;

		info->var.green.offset = 0;

		info->var.blue.offset = 0;

		info->var.red.length = 8; /* 8bit DAC */

		info->var.green.length = 8;

		info->var.blue.length = 8;

		info->var.transp.offset = 0;

		info->var.transp.length = 0;

		break;

	case 15:

		info->var.red.offset = 10;

		info->var.green.offset = 5;

		info->var.blue.offset = 0;

		info->var.red.length = 5;

		info->var.green.length = 5;

		info->var.blue.length = 5;

		info->var.transp.offset = 15;

		info->var.transp.length = 1;

		break;

	case 16:

		info->var.red.offset = 11;

		info->var.green.offset = 5;

		info->var.blue.offset = 0;

		info->var.red.length = 5;

		info->var.green.length = 6;

		info->var.blue.length = 5;

		info->var.transp.offset = 0;

		break;

	case 24:

		info->var.red.offset = 16;

		info->var.green.offset = 8;

		info->var.blue.offset = 0;

		info->var.red.length = 8;

		info->var.green.length = 8;

		info->var.blue.length = 8;

		info->var.transp.offset = 0;

		info->var.transp.length = 0;

		break;

	case 32:

		info->var.red.offset = 16;

		info->var.green.offset = 8;

		info->var.blue.offset = 0;

		info->var.red.length = 8;

		info->var.green.length = 8;

		info->var.blue.length = 8;

		info->var.transp.offset = 24;

		info->var.transp.length = 8;

		break;

	default:

		break;

	}

	drm_fb_helper_fill_pixel_fmt(&info->var, fb->format->depth);



	info->var.xres = fb_width;

	info->var.yres = fb_height;

drivers/gpu/drm/drm_mode_object.c

+2 −2
Original line number Diff line number Diff line
@@ -459,11 +459,11 @@ static int set_property_atomic(struct drm_mode_object *obj, 
	struct drm_modeset_acquire_ctx ctx;

	int ret;



	drm_modeset_acquire_init(&ctx, 0);



	state = drm_atomic_state_alloc(dev);

	if (!state)

		return -ENOMEM;



	drm_modeset_acquire_init(&ctx, 0);

	state->acquire_ctx = &ctx;

retry:

	if (prop == state->dev->mode_config.dpms_property) {