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

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

Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 

* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm/i915: restore only the mode of this driver on lastclose (v2)
  drm/radeon/kms: add info query for tile pipes
  drm/radeon/kms: add missing safe regs for 6xx/7xx
  drm: select FRAMEBUFFER_CONSOLE_PRIMARY if we have FRAMEBUFFER_CONSOLE
parents 0dee0e7f e8e7a2b8

drivers/gpu/drm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ config DRM_KMS_HELPER 
	depends on DRM

	select FB

	select FRAMEBUFFER_CONSOLE if !EXPERT

	select FRAMEBUFFER_CONSOLE_DETECT_PRIMARY if FRAMEBUFFER_CONSOLE

	help

	  FB and CRTC helpers for KMS drivers.

drivers/gpu/drm/drm_fb_helper.c

+20 −7
Original line number Diff line number Diff line
@@ -342,9 +342,22 @@ int drm_fb_helper_debug_leave(struct fb_info *info) 
}

EXPORT_SYMBOL(drm_fb_helper_debug_leave);



bool drm_fb_helper_restore_fbdev_mode(struct drm_fb_helper *fb_helper)

{

	bool error = false;

	int i, ret;

	for (i = 0; i < fb_helper->crtc_count; i++) {

		struct drm_mode_set *mode_set = &fb_helper->crtc_info[i].mode_set;

		ret = drm_crtc_helper_set_config(mode_set);

		if (ret)

			error = true;

	}

	return error;

}

EXPORT_SYMBOL(drm_fb_helper_restore_fbdev_mode);



bool drm_fb_helper_force_kernel_mode(void)

{

	int i = 0;

	bool ret, error = false;

	struct drm_fb_helper *helper;
@@ -352,13 +365,13 @@ bool drm_fb_helper_force_kernel_mode(void) 
		return false;



	list_for_each_entry(helper, &kernel_fb_helper_list, kernel_fb_list) {

		for (i = 0; i < helper->crtc_count; i++) {

			struct drm_mode_set *mode_set = &helper->crtc_info[i].mode_set;

			ret = drm_crtc_helper_set_config(mode_set);

		if (helper->dev->switch_power_state == DRM_SWITCH_POWER_OFF)

			continue;



		ret = drm_fb_helper_restore_fbdev_mode(helper);

		if (ret)

			error = true;

	}

	}

	return error;

}

drivers/gpu/drm/i915/i915_dma.c

+1 −1
Original line number Diff line number Diff line
@@ -2207,7 +2207,7 @@ void i915_driver_lastclose(struct drm_device * dev) 
	drm_i915_private_t *dev_priv = dev->dev_private;



	if (!dev_priv || drm_core_check_feature(dev, DRIVER_MODESET)) {

		drm_fb_helper_restore();

		intel_fb_restore_mode(dev);

		vga_switcheroo_process_delayed_switch();

		return;

	}

drivers/gpu/drm/i915/intel_drv.h

+1 −0
Original line number Diff line number Diff line
@@ -338,4 +338,5 @@ extern int intel_overlay_attrs(struct drm_device *dev, void *data, 
			       struct drm_file *file_priv);



extern void intel_fb_output_poll_changed(struct drm_device *dev);

extern void intel_fb_restore_mode(struct drm_device *dev);

#endif /* __INTEL_DRV_H__ */

drivers/gpu/drm/i915/intel_fb.c

+10 −0
Original line number Diff line number Diff line
@@ -264,3 +264,13 @@ void intel_fb_output_poll_changed(struct drm_device *dev) 
	drm_i915_private_t *dev_priv = dev->dev_private;

	drm_fb_helper_hotplug_event(&dev_priv->fbdev->helper);

}



void intel_fb_restore_mode(struct drm_device *dev)

{

	int ret;

	drm_i915_private_t *dev_priv = dev->dev_private;



	ret = drm_fb_helper_restore_fbdev_mode(&dev_priv->fbdev->helper);

	if (ret)

		DRM_DEBUG("failed to restore crtc mode\n");

}