Subversion Repositories Kolibri OS

Rev

Rev 4560 | Rev 5354 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 4560 Rev 5060
Line 85... Line 85...
85 
 * access through main memory.
 85 
 * access through main memory.
86 
 */
 86 
 */
87 
void
 87 
void
88 
i915_gem_detect_bit_6_swizzle(struct drm_device *dev)
 88 
i915_gem_detect_bit_6_swizzle(struct drm_device *dev)
89 
{
 89 
{
90 
	drm_i915_private_t *dev_priv = dev->dev_private;
 90 
	struct drm_i915_private *dev_priv = dev->dev_private;
91 
	uint32_t swizzle_x = I915_BIT_6_SWIZZLE_UNKNOWN;
 91 
	uint32_t swizzle_x = I915_BIT_6_SWIZZLE_UNKNOWN;
92 
	uint32_t swizzle_y = I915_BIT_6_SWIZZLE_UNKNOWN;
 92 
	uint32_t swizzle_y = I915_BIT_6_SWIZZLE_UNKNOWN;
Line 93... Line 93...
93 
 
 93 
 
94 
	if (IS_VALLEYVIEW(dev)) {
 94 
	if (IS_VALLEYVIEW(dev)) {
Line 292... Line 292...
292 
int
 292 
int
293 
i915_gem_set_tiling(struct drm_device *dev, void *data,
 293 
i915_gem_set_tiling(struct drm_device *dev, void *data,
294 
		   struct drm_file *file)
 294 
		   struct drm_file *file)
295 
{
 295 
{
296 
	struct drm_i915_gem_set_tiling *args = data;
 296 
	struct drm_i915_gem_set_tiling *args = data;
297 
	drm_i915_private_t *dev_priv = dev->dev_private;
 297 
	struct drm_i915_private *dev_priv = dev->dev_private;
298 
	struct drm_i915_gem_object *obj;
 298 
	struct drm_i915_gem_object *obj;
299 
	int ret = 0;
 299 
	int ret = 0;
Line 300... Line 300...
300 
 
 300 
 
301 
	obj = to_intel_bo(drm_gem_object_lookup(dev, file, args->handle));
 301 
	obj = to_intel_bo(drm_gem_object_lookup(dev, file, args->handle));
Line 306... Line 306...
306 
			    args->stride, obj->base.size, args->tiling_mode)) {
 306 
			    args->stride, obj->base.size, args->tiling_mode)) {
307 
		drm_gem_object_unreference_unlocked(&obj->base);
 307 
		drm_gem_object_unreference_unlocked(&obj->base);
308 
		return -EINVAL;
 308 
		return -EINVAL;
309 
	}
 309 
	}
Line 310... Line 310...
310 
 
 310 
 
311 
	if (obj->pin_count || obj->framebuffer_references) {
 311 
	if (i915_gem_obj_is_pinned(obj) || obj->framebuffer_references) {
312 
		drm_gem_object_unreference_unlocked(&obj->base);
 312 
		drm_gem_object_unreference_unlocked(&obj->base);
313 
		return -EBUSY;
 313 
		return -EBUSY;
Line 314... Line 314...
314 
	}
 314 
	}
Line 413... Line 413...
413 
int
 413 
int
414 
i915_gem_get_tiling(struct drm_device *dev, void *data,
 414 
i915_gem_get_tiling(struct drm_device *dev, void *data,
415 
		   struct drm_file *file)
 415 
		   struct drm_file *file)
416 
{
 416 
{
417 
	struct drm_i915_gem_get_tiling *args = data;
 417 
	struct drm_i915_gem_get_tiling *args = data;
418 
	drm_i915_private_t *dev_priv = dev->dev_private;
 418 
	struct drm_i915_private *dev_priv = dev->dev_private;
419 
	struct drm_i915_gem_object *obj;
 419 
	struct drm_i915_gem_object *obj;
Line 420... Line 420...
420 
 
 420 
 
421 
	obj = to_intel_bo(drm_gem_object_lookup(dev, file, args->handle));
 421 
	obj = to_intel_bo(drm_gem_object_lookup(dev, file, args->handle));
422 
	if (&obj->base == NULL)
 422 
	if (&obj->base == NULL)