Rev 6103 | Rev 6283 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 6103 | Rev 6131 | ||
|---|---|---|---|
| Line 372... | Line 372... | ||
| 372 | DRM_DEBUG_KMS("CONNECTOR %s ID: %d no active encoders\n", |
372 | DRM_DEBUG_KMS("CONNECTOR %s ID: %d no active encoders\n", |
| 373 | connector->name, connector->base.id); |
373 | connector->name, connector->base.id); |
| 374 | return -EINVAL; |
374 | return -EINVAL; |
| 375 | }; |
375 | }; |
| 376 | } |
376 | connector->encoder = encoder; |
| - | 377 | } |
|
| 377 | 378 | ||
| Line 378... | Line 379... | ||
| 378 | crtc = encoder->crtc; |
379 | crtc = encoder->crtc; |
| 379 | if(crtc == NULL) |
380 | if(crtc == NULL) |
| 380 | crtc = get_possible_crtc(dev, encoder); |
381 | crtc = get_possible_crtc(dev, encoder); |
| Line 381... | Line 382... | ||
| 381 | 382 | ||
| 382 | if(crtc != NULL) |
383 | if(crtc != NULL) |
| - | 384 | { |
|
| 383 | { |
385 | DRM_DEBUG_KMS("%s connector: %p encode: %p crtc: %p\n",__FUNCTION__, |
| 384 | encoder->crtc = crtc; |
386 | connector, encoder, crtc); |
| 385 | return 0; |
387 | return 0; |
| 386 | } |
388 | } |
| 387 | else |
389 | else |
| 388 | DRM_DEBUG_KMS("No CRTC for encoder %d\n", encoder->base.id); |
390 | DRM_DEBUG_KMS("No CRTC for encoder %d\n", encoder->base.id); |
| Line 821... | Line 823... | ||
| 821 | *bits++ = 0; |
823 | *bits++ = 0; |
| 822 | 824 | ||
| Line 823... | Line 825... | ||
| 823 | FreeKernelSpace(mapped); |
825 | FreeKernelSpace(mapped); |
| Line 824... | Line -... | ||
| 824 | - | ||
| 825 | // release old cursor |
- | |
| 826 | 826 | ||
| Line 827... | Line 827... | ||
| 827 | KernelFree(cursor->data); |
827 | KernelFree(cursor->data); |
| Line 828... | Line 828... | ||
| 828 | 828 | ||
| Line 1151... | Line 1151... | ||
| 1151 | if( mask->width == 0 || |
1151 | if( mask->width == 0 || |
| 1152 | mask->height== 0 ) |
1152 | mask->height== 0 ) |
| 1153 | return 1; |
1153 | return 1; |
| Line -... | Line 1154... | ||
| - | 1154 | ||
| - | 1155 | ret = i915_mutex_lock_interruptible(dev); |
|
| - | 1156 | if (ret) |
|
| - | 1157 | return ret; |
|
| 1154 | 1158 | ||
| 1155 | obj = drm_gem_object_lookup(dev, file, mask->handle); |
1159 | obj = drm_gem_object_lookup(dev, file, mask->handle); |
| - | 1160 | if (obj == NULL) |
|
| 1156 | if (obj == NULL) |
1161 | { |
| - | 1162 | ret = -ENOENT; |
|
| - | 1163 | goto unlock; |
|
| Line 1157... | Line 1164... | ||
| 1157 | return -ENOENT; |
1164 | } |
| - | 1165 | ||
| 1158 | 1166 | if (!obj->filp) |
|
| 1159 | if (!obj->filp) { |
1167 | { |
| 1160 | drm_gem_object_unreference_unlocked(obj); |
1168 | ret = -ENOENT; |
| Line 1161... | Line 1169... | ||
| 1161 | return -EINVAL; |
1169 | goto out; |
| 1162 | } |
1170 | } |
| 1163 | 1171 | ||
| Line 1177... | Line 1185... | ||
| 1177 | u8* src_offset; |
1185 | u8* src_offset; |
| 1178 | u8* dst_offset; |
1186 | u8* dst_offset; |
| 1179 | u32 ifl; |
1187 | u32 ifl; |
| 1180 | 1188 | ||
| Line 1181... | Line -... | ||
| 1181 | ret = i915_mutex_lock_interruptible(dev); |
- | |
| 1182 | if (ret) |
- | |
| 1183 | goto err1; |
- | |
| 1184 | - | ||
| 1185 | i915_gem_object_set_to_cpu_domain(to_intel_bo(obj), true); |
1189 | i915_gem_object_set_to_cpu_domain(to_intel_bo(obj), true); |
| Line 1186... | Line 1190... | ||
| 1186 | 1190 | ||
| 1187 | src_offset = os_display->win_map; |
1191 | src_offset = os_display->win_map; |
| 1188 | src_offset+= mt*os_display->width + ml; |
1192 | src_offset+= mt*os_display->width + ml; |
| Line 1299... | Line 1303... | ||
| 1299 | i915_gem_object_set_to_gtt_domain(to_intel_bo(obj), false); |
1303 | i915_gem_object_set_to_gtt_domain(to_intel_bo(obj), false); |
| 1300 | } |
1304 | } |
| 1301 | #endif |
1305 | #endif |
| Line 1302... | Line -... | ||
| 1302 | - | ||
| 1303 | err2: |
- | |
| 1304 | mutex_unlock(&dev->struct_mutex); |
1306 | |
| 1305 | err1: |
1307 | out: |
| Line -... | Line 1308... | ||
| - | 1308 | drm_gem_object_unreference(obj); |
|
| - | 1309 | ||
| - | 1310 | unlock: |
|
| 1306 | drm_gem_object_unreference(obj); |
1311 | mutex_unlock(&dev->struct_mutex); |
| 1307 | 1312 | ||