Commit 78fed39a authored Dec 17, 2021 by Dave Airlie

Merge tag 'drm-misc-fixes-2021-12-16-1' of...

Merge tag 'drm-misc-fixes-2021-12-16-1' of ssh://git.freedesktop.org/git/drm/drm-misc

 into drm-fixes

One null pointer dereference fix for ast, a pixel clock unit fix for
simpledrm and a user-space regression revert for fb-helper

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

From: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20211216082603.pm6yzlckmxvwnqyv@houat

parents c9f0322c fea3fdf9

drivers/gpu/drm/ast/ast_mode.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -1121,7 +1121,10 @@ static void ast_crtc_reset(struct drm_crtc *crtc)
		if (crtc->state)
		crtc->funcs->atomic_destroy_state(crtc, crtc->state);

		if (ast_state)
		__drm_atomic_helper_crtc_reset(crtc, &ast_state->base);
		else
		__drm_atomic_helper_crtc_reset(crtc, NULL);
		}

		static struct drm_crtc_state *

drivers/gpu/drm/drm_fb_helper.c

+7 −1

Original line number	Diff line number	Diff line
		@@ -1743,7 +1743,13 @@ void drm_fb_helper_fill_info(struct fb_info *info,
		sizes->fb_width, sizes->fb_height);

		info->par = fb_helper;
		snprintf(info->fix.id, sizeof(info->fix.id), "%s",
		/*
		* The DRM drivers fbdev emulation device name can be confusing if the
		* driver name also has a "drm" suffix on it. Leading to names such as
		* "simpledrmdrmfb" in /proc/fb. Unfortunately, it's an uAPI and can't
		* be changed due user-space tools (e.g: pm-utils) matching against it.
		*/
		snprintf(info->fix.id, sizeof(info->fix.id), "%sdrmfb",
		fb_helper->dev->driver->name);

		}

drivers/gpu/drm/tiny/simpledrm.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -458,7 +458,7 @@ static struct drm_display_mode simpledrm_mode(unsigned int width,
		{
		struct drm_display_mode mode = { SIMPLEDRM_MODE(width, height) };

		mode.clock = 60 /* Hz / mode.hdisplay * mode.vdisplay;
		mode.clock = mode.hdisplay * mode.vdisplay * 60 / 1000 /* kHz */;
		drm_mode_set_name(&mode);

		return mode;