Rev 5354 | Rev 6084 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 5354 | Rev 5367 | ||
|---|---|---|---|
| Line 283... | Line 283... | ||
| 283 | cursor_t *cursor; |
283 | cursor_t *cursor; |
| 284 | u32 ifl; |
284 | u32 ifl; |
| 285 | int ret; |
285 | int ret; |
| Line -... | Line 286... | ||
| - | 286 | ||
| 286 | 287 | mutex_lock(&dev->struct_mutex); |
|
| Line 287... | Line 288... | ||
| 287 | mutex_lock(&dev->mode_config.mutex); |
288 | mutex_lock(&dev->mode_config.mutex); |
| 288 | 289 | ||
| 289 | ret = choose_config(dev, &connector, &crtc); |
290 | ret = choose_config(dev, &connector, &crtc); |
| Line 355... | Line 356... | ||
| 355 | }; |
356 | }; |
| 356 | }; |
357 | }; |
| 357 | 358 | ||
| Line 358... | Line 359... | ||
| 358 | mutex_unlock(&dev->mode_config.mutex); |
359 | mutex_unlock(&dev->mode_config.mutex); |
| - | 360 | mutex_unlock(&dev->struct_mutex); |
|
| Line 359... | Line 361... | ||
| 359 | 361 | ||
| Line 360... | Line 362... | ||
| 360 | set_mode(dev, os_display->connector, os_display->crtc, usermode, false); |
362 | set_mode(dev, os_display->connector, os_display->crtc, usermode, false); |
| 361 | 363 | ||
| Line 803... | Line 805... | ||
| 803 | 805 | ||
| Line 804... | Line 806... | ||
| 804 | if( mask_seqno[slot] == os_display->mask_seqno) |
806 | if( mask_seqno[slot] == os_display->mask_seqno) |
| 805 | return 0; |
807 | return 0; |
| Line -... | Line 808... | ||
| - | 808 | ||
| - | 809 | memset(mask->bo_map,0,mask->width * mask->height); |
|
| 806 | 810 | ||
| 807 | GetWindowRect(&win); |
811 | GetWindowRect(&win); |
| 808 | win.right+= 1; |
812 | win.right+= 1; |
| Line 809... | Line 813... | ||
| 809 | win.bottom+= 1; |
813 | win.bottom+= 1; |
| Line 845... | Line 849... | ||
| 845 | drm_gem_object_unreference_unlocked(obj); |
849 | drm_gem_object_unreference_unlocked(obj); |
| 846 | return -EINVAL; |
850 | return -EINVAL; |
| 847 | } |
851 | } |
| 848 | 852 | ||
| Line 849... | Line 853... | ||
| 849 | #if 0 |
853 | #if 1 |
| 850 | if(warn_count < 1000) |
854 | if(warn_count < 1000) |
| 851 | { |
855 | { |
| 852 | printf("left %d top %d right %d bottom %d\n", |
856 | printf("left %d top %d right %d bottom %d\n", |
| 853 | ml, mt, mr, mb); |
857 | ml, mt, mr, mb); |
| 854 | warn_count++; |
858 | warn_count++; |