mirror of
https://github.com/torvalds/linux.git
synced 2024-09-26 18:03:17 +00:00
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
This commit is contained in:
commit
fafc9929c6
|
@ -24,6 +24,7 @@ config DRM_KMS_HELPER
|
||||||
depends on DRM
|
depends on DRM
|
||||||
select FB
|
select FB
|
||||||
select FRAMEBUFFER_CONSOLE if !EXPERT
|
select FRAMEBUFFER_CONSOLE if !EXPERT
|
||||||
|
select FRAMEBUFFER_CONSOLE_DETECT_PRIMARY if FRAMEBUFFER_CONSOLE
|
||||||
help
|
help
|
||||||
FB and CRTC helpers for KMS drivers.
|
FB and CRTC helpers for KMS drivers.
|
||||||
|
|
||||||
|
|
|
@ -342,9 +342,22 @@ int drm_fb_helper_debug_leave(struct fb_info *info)
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(drm_fb_helper_debug_leave);
|
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)
|
bool drm_fb_helper_force_kernel_mode(void)
|
||||||
{
|
{
|
||||||
int i = 0;
|
|
||||||
bool ret, error = false;
|
bool ret, error = false;
|
||||||
struct drm_fb_helper *helper;
|
struct drm_fb_helper *helper;
|
||||||
|
|
||||||
|
@ -352,12 +365,12 @@ bool drm_fb_helper_force_kernel_mode(void)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
list_for_each_entry(helper, &kernel_fb_helper_list, kernel_fb_list) {
|
list_for_each_entry(helper, &kernel_fb_helper_list, kernel_fb_list) {
|
||||||
for (i = 0; i < helper->crtc_count; i++) {
|
if (helper->dev->switch_power_state == DRM_SWITCH_POWER_OFF)
|
||||||
struct drm_mode_set *mode_set = &helper->crtc_info[i].mode_set;
|
continue;
|
||||||
ret = drm_crtc_helper_set_config(mode_set);
|
|
||||||
if (ret)
|
ret = drm_fb_helper_restore_fbdev_mode(helper);
|
||||||
error = true;
|
if (ret)
|
||||||
}
|
error = true;
|
||||||
}
|
}
|
||||||
return error;
|
return error;
|
||||||
}
|
}
|
||||||
|
|
|
@ -2207,7 +2207,7 @@ void i915_driver_lastclose(struct drm_device * dev)
|
||||||
drm_i915_private_t *dev_priv = dev->dev_private;
|
drm_i915_private_t *dev_priv = dev->dev_private;
|
||||||
|
|
||||||
if (!dev_priv || drm_core_check_feature(dev, DRIVER_MODESET)) {
|
if (!dev_priv || drm_core_check_feature(dev, DRIVER_MODESET)) {
|
||||||
drm_fb_helper_restore();
|
intel_fb_restore_mode(dev);
|
||||||
vga_switcheroo_process_delayed_switch();
|
vga_switcheroo_process_delayed_switch();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
@ -338,4 +338,5 @@ extern int intel_overlay_attrs(struct drm_device *dev, void *data,
|
||||||
struct drm_file *file_priv);
|
struct drm_file *file_priv);
|
||||||
|
|
||||||
extern void intel_fb_output_poll_changed(struct drm_device *dev);
|
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__ */
|
#endif /* __INTEL_DRV_H__ */
|
||||||
|
|
|
@ -264,3 +264,13 @@ void intel_fb_output_poll_changed(struct drm_device *dev)
|
||||||
drm_i915_private_t *dev_priv = dev->dev_private;
|
drm_i915_private_t *dev_priv = dev->dev_private;
|
||||||
drm_fb_helper_hotplug_event(&dev_priv->fbdev->helper);
|
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");
|
||||||
|
}
|
||||||
|
|
|
@ -221,6 +221,19 @@ int radeon_info_ioctl(struct drm_device *dev, void *data, struct drm_file *filp)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
case RADEON_INFO_NUM_TILE_PIPES:
|
||||||
|
if (rdev->family >= CHIP_CAYMAN)
|
||||||
|
value = rdev->config.cayman.max_tile_pipes;
|
||||||
|
else if (rdev->family >= CHIP_CEDAR)
|
||||||
|
value = rdev->config.evergreen.max_tile_pipes;
|
||||||
|
else if (rdev->family >= CHIP_RV770)
|
||||||
|
value = rdev->config.rv770.max_tile_pipes;
|
||||||
|
else if (rdev->family >= CHIP_R600)
|
||||||
|
value = rdev->config.r600.max_tile_pipes;
|
||||||
|
else {
|
||||||
|
return -EINVAL;
|
||||||
|
}
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
DRM_DEBUG_KMS("Invalid request %d\n", info->request);
|
DRM_DEBUG_KMS("Invalid request %d\n", info->request);
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
|
@ -708,6 +708,7 @@ r600 0x9400
|
||||||
0x00028D0C DB_RENDER_CONTROL
|
0x00028D0C DB_RENDER_CONTROL
|
||||||
0x00028D10 DB_RENDER_OVERRIDE
|
0x00028D10 DB_RENDER_OVERRIDE
|
||||||
0x0002880C DB_SHADER_CONTROL
|
0x0002880C DB_SHADER_CONTROL
|
||||||
|
0x00028D28 DB_SRESULTS_COMPARE_STATE0
|
||||||
0x00028D2C DB_SRESULTS_COMPARE_STATE1
|
0x00028D2C DB_SRESULTS_COMPARE_STATE1
|
||||||
0x00028430 DB_STENCILREFMASK
|
0x00028430 DB_STENCILREFMASK
|
||||||
0x00028434 DB_STENCILREFMASK_BF
|
0x00028434 DB_STENCILREFMASK_BF
|
||||||
|
|
|
@ -118,6 +118,7 @@ int drm_fb_helper_setcolreg(unsigned regno,
|
||||||
unsigned transp,
|
unsigned transp,
|
||||||
struct fb_info *info);
|
struct fb_info *info);
|
||||||
|
|
||||||
|
bool drm_fb_helper_restore_fbdev_mode(struct drm_fb_helper *fb_helper);
|
||||||
void drm_fb_helper_restore(void);
|
void drm_fb_helper_restore(void);
|
||||||
void drm_fb_helper_fill_var(struct fb_info *info, struct drm_fb_helper *fb_helper,
|
void drm_fb_helper_fill_var(struct fb_info *info, struct drm_fb_helper *fb_helper,
|
||||||
uint32_t fb_width, uint32_t fb_height);
|
uint32_t fb_width, uint32_t fb_height);
|
||||||
|
|
|
@ -909,6 +909,7 @@ struct drm_radeon_cs {
|
||||||
#define RADEON_INFO_WANT_CMASK 0x08 /* get access to CMASK on r300 */
|
#define RADEON_INFO_WANT_CMASK 0x08 /* get access to CMASK on r300 */
|
||||||
#define RADEON_INFO_CLOCK_CRYSTAL_FREQ 0x09 /* clock crystal frequency */
|
#define RADEON_INFO_CLOCK_CRYSTAL_FREQ 0x09 /* clock crystal frequency */
|
||||||
#define RADEON_INFO_NUM_BACKENDS 0x0a /* DB/backends for r600+ - need for OQ */
|
#define RADEON_INFO_NUM_BACKENDS 0x0a /* DB/backends for r600+ - need for OQ */
|
||||||
|
#define RADEON_INFO_NUM_TILE_PIPES 0x0b /* tile pipes for r600+ */
|
||||||
|
|
||||||
struct drm_radeon_info {
|
struct drm_radeon_info {
|
||||||
uint32_t request;
|
uint32_t request;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user