Spaceraven/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

drm: 3.19-rc3

Browse Source 
git-svn-id: svn://kolibrios.org@5367 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Sergey Semyonov (Serge) 2015-01-10 16:53:44 +00:00
parent 5396a8fef8
commit 461dfb6196
16 changed files with 105 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/video/drm/drm_crtc.c
View File

@ -3996,7 +3996,7 @@ EXPORT_SYMBOL(drm_mode_connector_set_tile_property);
* connector's edid property. * connector's edid property.
* *
* Returns: * Returns:
* Zero on success, errno on failure. * Zero on success, negative errno on failure.
*/ */
int drm_mode_connector_update_edid_property(struct drm_connector *connector, int drm_mode_connector_update_edid_property(struct drm_connector *connector,
const struct edid *edid) const struct edid *edid)

18
drivers/video/drm/i915/i915_dma.c
View File

@ -275,7 +275,13 @@ static int i915_load_modeset_init(struct drm_device *dev)
if (ret) if (ret)
DRM_INFO("failed to find VBIOS tables\n"); DRM_INFO("failed to find VBIOS tables\n");
/* If we have > 1 VGA cards, then we need to arbitrate access
* to the common VGA resources.
*
* If we are a secondary display controller (!PCI_DISPLAY_CLASS_VGA),
* then we do not take part in VGA arbitration and the
* vga_client_register() fails with -ENODEV.
*/
/* Initialise stolen first so that we may reserve preallocated /* Initialise stolen first so that we may reserve preallocated
* objects for the BIOS to KMS transition. * objects for the BIOS to KMS transition.
@ -578,7 +584,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
* so there is no point in running more than one instance of the * so there is no point in running more than one instance of the
* workqueue at any time. Use an ordered one. * workqueue at any time. Use an ordered one.
*/ */
dev_priv->wq = alloc_ordered_workqueue("i915", 0); dev_priv->wq = (struct workqueue_struct *)alloc_ordered_workqueue("i915", 0);
if (dev_priv->wq == NULL) { if (dev_priv->wq == NULL) {
DRM_ERROR("Failed to create our workqueue.\n"); DRM_ERROR("Failed to create our workqueue.\n");
ret = -ENOMEM; ret = -ENOMEM;
@ -638,7 +644,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
if (IS_GEN5(dev)) if (IS_GEN5(dev))
intel_gpu_ips_init(dev_priv); intel_gpu_ips_init(dev_priv);
intel_runtime_pm_enable(dev_priv); // intel_runtime_pm_enable(dev_priv);
main_device = dev; main_device = dev;
@ -672,12 +678,6 @@ int i915_driver_unload(struct drm_device *dev)
intel_gpu_ips_teardown(); intel_gpu_ips_teardown();
/* The i915.ko module is still not prepared to be loaded when
* the power well is not enabled, so just enable it in case
* we're going to unload/reload. */
intel_display_set_init_power(dev_priv, true);
intel_power_domains_remove(dev_priv);
i915_teardown_sysfs(dev); i915_teardown_sysfs(dev);
if (dev_priv->mm.inactive_shrinker.scan_objects) if (dev_priv->mm.inactive_shrinker.scan_objects)

2
drivers/video/drm/i915/i915_drv.c
View File

@ -842,7 +842,7 @@ int i915_reset(struct drm_device *dev)
* of re-init after reset. * of re-init after reset.
*/ */
if (INTEL_INFO(dev)->gen > 5) if (INTEL_INFO(dev)->gen > 5)
intel_reset_gt_powersave(dev); intel_enable_gt_powersave(dev);
} else { } else {
mutex_unlock(&dev->struct_mutex); mutex_unlock(&dev->struct_mutex);
} }

17
drivers/video/drm/i915/i915_gem.c
View File

@ -220,7 +220,7 @@ i915_gem_get_aperture_ioctl(struct drm_device *dev, void *data,
void *i915_gem_object_alloc(struct drm_device *dev) void *i915_gem_object_alloc(struct drm_device *dev)
{ {
struct drm_i915_private *dev_priv = dev->dev_private; struct drm_i915_private *dev_priv = dev->dev_private;
return kmalloc(sizeof(struct drm_i915_gem_object), 0); return kzalloc(sizeof(struct drm_i915_gem_object), 0);
} }
void i915_gem_object_free(struct drm_i915_gem_object *obj) void i915_gem_object_free(struct drm_i915_gem_object *obj)
@ -1480,7 +1480,7 @@ unpin:
i915_gem_object_unpin_pages(obj); i915_gem_object_unpin_pages(obj);
*offset = mem; *offset = (uint32_t)mem;
out: out:
drm_gem_object_unreference(&obj->base); drm_gem_object_unreference(&obj->base);
@ -1646,7 +1646,6 @@ i915_gem_object_get_pages_gtt(struct drm_i915_gem_object *obj)
page_count = obj->base.size / PAGE_SIZE; page_count = obj->base.size / PAGE_SIZE;
if (sg_alloc_table(st, page_count, GFP_KERNEL)) { if (sg_alloc_table(st, page_count, GFP_KERNEL)) {
kfree(st); kfree(st);
FAIL();
return -ENOMEM; return -ENOMEM;
} }
@ -1662,7 +1661,6 @@ i915_gem_object_get_pages_gtt(struct drm_i915_gem_object *obj)
if (IS_ERR(page)) { if (IS_ERR(page)) {
dbgprintf("%s invalid page %p\n", __FUNCTION__, page); dbgprintf("%s invalid page %p\n", __FUNCTION__, page);
goto err_pages; goto err_pages;
} }
#ifdef CONFIG_SWIOTLB #ifdef CONFIG_SWIOTLB
if (swiotlb_nr_tbl()) { if (swiotlb_nr_tbl()) {
@ -1688,6 +1686,11 @@ i915_gem_object_get_pages_gtt(struct drm_i915_gem_object *obj)
sg_mark_end(sg); sg_mark_end(sg);
obj->pages = st; obj->pages = st;
if (obj->tiling_mode != I915_TILING_NONE &&
dev_priv->quirks & QUIRK_PIN_SWIZZLED_PAGES)
i915_gem_object_pin_pages(obj);
return 0; return 0;
err_pages: err_pages:
@ -1696,7 +1699,7 @@ err_pages:
page_cache_release(sg_page_iter_page(&sg_iter)); page_cache_release(sg_page_iter_page(&sg_iter));
sg_free_table(st); sg_free_table(st);
kfree(st); kfree(st);
FAIL();
return PTR_ERR(page); return PTR_ERR(page);
} }
@ -2511,9 +2514,11 @@ int i915_vma_unbind(struct i915_vma *vma)
struct drm_i915_gem_object *obj = vma->obj; struct drm_i915_gem_object *obj = vma->obj;
struct drm_i915_private *dev_priv = obj->base.dev->dev_private; struct drm_i915_private *dev_priv = obj->base.dev->dev_private;
int ret; int ret;
if(obj == get_fb_obj()) if(obj == get_fb_obj())
{
WARN(1,"attempt to unbind fb object\n");
return 0; return 0;
};
if (list_empty(&vma->vma_link)) if (list_empty(&vma->vma_link))
return 0; return 0;

7
drivers/video/drm/i915/i915_gem_execbuffer.c
View File

@ -1382,9 +1382,10 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data,
batch_obj, batch_obj,
args->batch_start_offset, args->batch_start_offset,
file->is_master); file->is_master);
if (ret) if (ret) {
if (ret != -EACCES)
goto err; goto err;
} else {
/* /*
* XXX: Actually do this when enabling batch copy... * XXX: Actually do this when enabling batch copy...
* *
@ -1394,6 +1395,8 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data,
* want that set when the command parser is enabled. * want that set when the command parser is enabled.
*/ */
} }
}
#endif #endif
/* snb/ivb/vlv conflate the "batch in ppgtt" bit with the "non-secure /* snb/ivb/vlv conflate the "batch in ppgtt" bit with the "non-secure
* batch" bit. Hence we need to pin secure batches into the global gtt. * batch" bit. Hence we need to pin secure batches into the global gtt.

18
drivers/video/drm/i915/i915_gem_stolen.c
View File

@ -127,10 +127,27 @@ static unsigned long i915_stolen_to_physical(struct drm_device *dev)
r = devm_request_mem_region(dev->dev, base, dev_priv->gtt.stolen_size, r = devm_request_mem_region(dev->dev, base, dev_priv->gtt.stolen_size,
"Graphics Stolen Memory"); "Graphics Stolen Memory");
if (r == NULL) { if (r == NULL) {
/*
* One more attempt but this time requesting region from
* base + 1, as we have seen that this resolves the region
* conflict with the PCI Bus.
* This is a BIOS w/a: Some BIOS wrap stolen in the root
* PCI bus, but have an off-by-one error. Hence retry the
* reservation starting from 1 instead of 0.
*/
r = devm_request_mem_region(dev->dev, base + 1,
dev_priv->gtt.stolen_size - 1,
"Graphics Stolen Memory");
/*
* GEN3 firmware likes to smash pci bridges into the stolen
* range. Apparently this works.
*/
if (r == NULL && !IS_GEN3(dev)) {
DRM_ERROR("conflict detected with stolen region: [0x%08x - 0x%08x]\n", DRM_ERROR("conflict detected with stolen region: [0x%08x - 0x%08x]\n",
base, base + (uint32_t)dev_priv->gtt.stolen_size); base, base + (uint32_t)dev_priv->gtt.stolen_size);
base = 0; base = 0;
} }
}
#endif #endif
return base; return base;
} }
@ -226,6 +243,7 @@ err_fb:
kfree(compressed_llb); kfree(compressed_llb);
drm_mm_remove_node(&dev_priv->fbc.compressed_fb); drm_mm_remove_node(&dev_priv->fbc.compressed_fb);
err_llb: err_llb:
pr_info_once("drm: not enough stolen space for compressed buffer (need %d more bytes), disabling. Hint: you may be able to increase stolen memory size in the BIOS to avoid this.\n", size);
return -ENOSPC; return -ENOSPC;
} }

1
drivers/video/drm/i915/i915_gpu_error.c
View File

@ -1258,6 +1258,7 @@ void i915_get_extra_instdone(struct drm_device *dev, uint32_t *instdone)
WARN_ONCE(1, "Unsupported platform\n"); WARN_ONCE(1, "Unsupported platform\n");
case 7: case 7:
case 8: case 8:
case 9:
instdone[0] = I915_READ(GEN7_INSTDONE_1); instdone[0] = I915_READ(GEN7_INSTDONE_1);
instdone[1] = I915_READ(GEN7_SC_INSTDONE); instdone[1] = I915_READ(GEN7_SC_INSTDONE);
instdone[2] = I915_READ(GEN7_SAMPLER_INSTDONE); instdone[2] = I915_READ(GEN7_SAMPLER_INSTDONE);

2
drivers/video/drm/i915/i915_irq.c
View File

@ -4189,6 +4189,8 @@ void intel_irq_init(struct drm_i915_private *dev_priv)
else else
dev_priv->pm_rps_events = GEN6_PM_RPS_EVENTS; dev_priv->pm_rps_events = GEN6_PM_RPS_EVENTS;
INIT_DELAYED_WORK(&dev_priv->hotplug_reenable_work,
intel_hpd_irq_reenable_work);
if (IS_GEN2(dev_priv)) { if (IS_GEN2(dev_priv)) {

2
drivers/video/drm/i915/i915_params.c
View File

@ -42,7 +42,7 @@ struct i915_params i915 __read_mostly = {
.preliminary_hw_support = IS_ENABLED(CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT), .preliminary_hw_support = IS_ENABLED(CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT),
.disable_power_well = 1, .disable_power_well = 1,
.enable_ips = 1, .enable_ips = 1,
.fastboot = 0, .fastboot = 1,
.prefault_disable = 0, .prefault_disable = 0,
.reset = true, .reset = true,
.invert_brightness = 0, .invert_brightness = 0,

12
drivers/video/drm/i915/intel_display.c
View File

@ -2349,6 +2349,7 @@ static bool intel_alloc_plane_obj(struct intel_crtc *crtc,
if (!obj) if (!obj)
return false; return false;
obj->map_and_fenceable=true;
main_fb_obj = obj; main_fb_obj = obj;
if (plane_config->tiled) { if (plane_config->tiled) {
@ -6638,8 +6639,8 @@ static void i9xx_get_plane_config(struct intel_crtc *crtc,
aligned_height = intel_align_height(dev, crtc->base.primary->fb->height, aligned_height = intel_align_height(dev, crtc->base.primary->fb->height,
plane_config->tiled); plane_config->tiled);
plane_config->size = 16*1024*1024; plane_config->size = PAGE_ALIGN(crtc->base.primary->fb->pitches[0] *
aligned_height);
DRM_DEBUG_KMS("pipe/plane %d/%d with fb: size=%dx%d@%d, offset=%x, pitch %d, size 0x%x\n", DRM_DEBUG_KMS("pipe/plane %d/%d with fb: size=%dx%d@%d, offset=%x, pitch %d, size 0x%x\n",
pipe, plane, crtc->base.primary->fb->width, pipe, plane, crtc->base.primary->fb->width,
@ -12666,6 +12667,12 @@ static struct intel_quirk intel_quirks[] = {
/* ThinkPad T60 needs pipe A force quirk (bug #16494) */ /* ThinkPad T60 needs pipe A force quirk (bug #16494) */
{ 0x2782, 0x17aa, 0x201a, quirk_pipea_force }, { 0x2782, 0x17aa, 0x201a, quirk_pipea_force },
/* 830 needs to leave pipe A & dpll A up */
{ 0x3577, PCI_ANY_ID, PCI_ANY_ID, quirk_pipea_force },
/* 830 needs to leave pipe B & dpll B up */
{ 0x3577, PCI_ANY_ID, PCI_ANY_ID, quirk_pipeb_force },
/* Lenovo U160 cannot use SSC on LVDS */ /* Lenovo U160 cannot use SSC on LVDS */
{ 0x0046, 0x17aa, 0x3920, quirk_ssc_force_disable }, { 0x0046, 0x17aa, 0x3920, quirk_ssc_force_disable },
@ -12857,6 +12864,7 @@ void intel_modeset_init(struct drm_device *dev)
* If the fb is shared between multiple heads, we'll * If the fb is shared between multiple heads, we'll
* just get the first one. * just get the first one.
*/ */
crtc->plane_config.size = 16*1024*1024;
intel_find_plane_obj(crtc, &crtc->plane_config); intel_find_plane_obj(crtc, &crtc->plane_config);
} }
} }

5
drivers/video/drm/i915/intel_dp.c
View File

@ -1042,8 +1042,7 @@ intel_dp_aux_init(struct intel_dp *intel_dp, struct intel_connector *connector)
intel_dp->aux.dev = dev->dev; intel_dp->aux.dev = dev->dev;
intel_dp->aux.transfer = intel_dp_aux_transfer; intel_dp->aux.transfer = intel_dp_aux_transfer;
DRM_DEBUG_KMS("registering %s bus for %s\n", name, DRM_DEBUG_KMS("registering %s bus\n", name);
connector->base.kdev->kobj.name);
ret = drm_dp_aux_register(&intel_dp->aux); ret = drm_dp_aux_register(&intel_dp->aux);
if (ret < 0) { if (ret < 0) {
@ -1611,7 +1610,7 @@ static void edp_panel_vdd_schedule_off(struct intel_dp *intel_dp)
* operations. * operations.
*/ */
delay = msecs_to_jiffies(intel_dp->panel_power_cycle_delay * 5); delay = msecs_to_jiffies(intel_dp->panel_power_cycle_delay * 5);
schedule_delayed_work(&intel_dp->panel_vdd_work, delay); // schedule_delayed_work(&intel_dp->panel_vdd_work, delay);
} }
/* /*

3
drivers/video/drm/i915/intel_fbdev.c
View File

@ -185,6 +185,7 @@ static int intelfb_create(struct drm_fb_helper *helper,
mutex_lock(&dev->struct_mutex); mutex_lock(&dev->struct_mutex);
#if 0
if (intel_fb && if (intel_fb &&
(sizes->fb_width > intel_fb->base.width || (sizes->fb_width > intel_fb->base.width ||
sizes->fb_height > intel_fb->base.height)) { sizes->fb_height > intel_fb->base.height)) {
@ -195,6 +196,8 @@ static int intelfb_create(struct drm_fb_helper *helper,
drm_framebuffer_unreference(&intel_fb->base); drm_framebuffer_unreference(&intel_fb->base);
intel_fb = ifbdev->fb = NULL; intel_fb = ifbdev->fb = NULL;
} }
#endif
if (!intel_fb || WARN_ON(!intel_fb->obj)) { if (!intel_fb || WARN_ON(!intel_fb->obj)) {
DRM_DEBUG_KMS("no BIOS fb, allocating a new one\n"); DRM_DEBUG_KMS("no BIOS fb, allocating a new one\n");
ret = intelfb_alloc(helper, sizes); ret = intelfb_alloc(helper, sizes);

10
drivers/video/drm/i915/intel_sdvo.c
View File

@ -2384,6 +2384,16 @@ intel_sdvo_connector_init(struct intel_sdvo_connector *connector,
connector->base.unregister = intel_sdvo_connector_unregister; connector->base.unregister = intel_sdvo_connector_unregister;
intel_connector_attach_encoder(&connector->base, &encoder->base); intel_connector_attach_encoder(&connector->base, &encoder->base);
ret = drm_connector_register(drm_connector);
if (ret < 0)
goto err1;
return 0;
err2:
drm_connector_unregister(drm_connector);
err1:
drm_connector_cleanup(drm_connector);
return ret; return ret;
} }

6
drivers/video/drm/i915/kms_display.c
View File

@ -285,6 +285,7 @@ int init_display_kms(struct drm_device *dev, videomode_t *usermode)
u32 ifl; u32 ifl;
int ret; int ret;
mutex_lock(&dev->struct_mutex);
mutex_lock(&dev->mode_config.mutex); mutex_lock(&dev->mode_config.mutex);
ret = choose_config(dev, &connector, &crtc); ret = choose_config(dev, &connector, &crtc);
@ -357,6 +358,7 @@ int init_display_kms(struct drm_device *dev, videomode_t *usermode)
}; };
mutex_unlock(&dev->mode_config.mutex); mutex_unlock(&dev->mode_config.mutex);
mutex_unlock(&dev->struct_mutex);
set_mode(dev, os_display->connector, os_display->crtc, usermode, false); set_mode(dev, os_display->connector, os_display->crtc, usermode, false);
@ -805,6 +807,8 @@ int i915_mask_update_ex(struct drm_device *dev, void *data,
if( mask_seqno[slot] == os_display->mask_seqno) if( mask_seqno[slot] == os_display->mask_seqno)
return 0; return 0;
memset(mask->bo_map,0,mask->width * mask->height);
GetWindowRect(&win); GetWindowRect(&win);
win.right+= 1; win.right+= 1;
win.bottom+= 1; win.bottom+= 1;
@ -847,7 +851,7 @@ int i915_mask_update_ex(struct drm_device *dev, void *data,
return -EINVAL; return -EINVAL;
} }
#if 0 #if 1
if(warn_count < 1000) if(warn_count < 1000)
{ {
printf("left %d top %d right %d bottom %d\n", printf("left %d top %d right %d bottom %d\n",

42
drivers/video/drm/i915/main.c
View File

@ -249,7 +249,6 @@ u32 __attribute__((externally_visible)) drvEntry(int action, char *cmdline)
if( err != 0) if( err != 0)
dbgprintf("Set DISPLAY handler\n"); dbgprintf("Set DISPLAY handler\n");
return err; return err;
}; };
@ -284,25 +283,26 @@ u32 __attribute__((externally_visible)) drvEntry(int action, char *cmdline)
#define SRV_DRM_GEM_OPEN 25 #define SRV_DRM_GEM_OPEN 25
#define SRV_I915_GEM_PIN 26 #define SRV_I915_GEM_PIN 26
#define SRV_I915_GEM_UNPIN 27 #define SRV_I915_GEM_UNPIN 27
#define SRV_I915_GEM_SET_CACHING 28 #define SRV_I915_GEM_GET_CACHING 28
#define SRV_I915_GEM_PWRITE 29 #define SRV_I915_GEM_SET_CACHING 29
#define SRV_I915_GEM_BUSY 30 #define SRV_I915_GEM_PWRITE 30
#define SRV_I915_GEM_SET_DOMAIN 31 #define SRV_I915_GEM_BUSY 31
#define SRV_I915_GEM_MMAP 32 #define SRV_I915_GEM_SET_DOMAIN 32
#define SRV_I915_GEM_SET_TILING 33 #define SRV_I915_GEM_MMAP 33
#define SRV_I915_GEM_GET_TILING 34 #define SRV_I915_GEM_SET_TILING 34
#define SRV_I915_GEM_GET_APERTURE 35 #define SRV_I915_GEM_GET_TILING 35
#define SRV_I915_GEM_MMAP_GTT 36 #define SRV_I915_GEM_GET_APERTURE 36
#define SRV_I915_GEM_THROTTLE 37 #define SRV_I915_GEM_MMAP_GTT 37
#define SRV_I915_GEM_EXECBUFFER2 38 #define SRV_I915_GEM_THROTTLE 38
#define SRV_I915_GEM_WAIT 39 #define SRV_I915_GEM_EXECBUFFER2 39
#define SRV_I915_GEM_CONTEXT_CREATE 40 #define SRV_I915_GEM_WAIT 40
#define SRV_I915_GEM_CONTEXT_DESTROY 41 #define SRV_I915_GEM_CONTEXT_CREATE 41
#define SRV_I915_REG_READ 42 #define SRV_I915_GEM_CONTEXT_DESTROY 42
#define SRV_I915_REG_READ 43
#define SRV_FBINFO 43 #define SRV_FBINFO 44
#define SRV_MASK_UPDATE 44 #define SRV_MASK_UPDATE 45
#define SRV_MASK_UPDATE_EX 45 #define SRV_MASK_UPDATE_EX 46
#define check_input(size) \ #define check_input(size) \
if( unlikely((inp==NULL)||(io->inp_size != (size))) ) \ if( unlikely((inp==NULL)||(io->inp_size != (size))) ) \
@ -387,6 +387,10 @@ int _stdcall display_handler(ioctl_t *io)
retval = i915_gem_unpin_ioctl(main_device, inp, file); retval = i915_gem_unpin_ioctl(main_device, inp, file);
break; break;
case SRV_I915_GEM_GET_CACHING:
retval = i915_gem_get_caching_ioctl(main_device, inp, file);
break;
case SRV_I915_GEM_SET_CACHING: case SRV_I915_GEM_SET_CACHING:
retval = i915_gem_set_caching_ioctl(main_device, inp, file); retval = i915_gem_set_caching_ioctl(main_device, inp, file);
break; break;

6
drivers/video/drm/radeon/main.c
View File

@ -134,7 +134,7 @@ u32 __attribute__((externally_visible)) drvEntry(int action, char *cmdline)
if( GetService("DISPLAY") != 0 ) if( GetService("DISPLAY") != 0 )
return 0; return 0;
printf("Radeon v3.19-rc2 cmdline %s\n", cmdline); printf("Radeon v3.19-rc3 cmdline %s\n", cmdline);
if( cmdline && *cmdline ) if( cmdline && *cmdline )
parse_cmdline(cmdline, &usermode, log, &radeon_modeset); parse_cmdline(cmdline, &usermode, log, &radeon_modeset);
@ -285,9 +285,9 @@ int pci_scan_filter(u32 id, u32 busnr, u32 devfn)
if(vendor == 0x1002) if(vendor == 0x1002)
{ {
class = PciRead32(busnr, devfn, PCI_CLASS_REVISION); class = PciRead32(busnr, devfn, PCI_CLASS_REVISION);
class >>= 16; class >>= 24;
if( class == PCI_CLASS_DISPLAY_VGA) if( class ==PCI_BASE_CLASS_DISPLAY)
ret = 1; ret = 1;
} }
return ret; return ret;