← Back to branch summary

~ubuntu-branches/ubuntu/precise/libdrm/precise-updates

« back to all changes in this revision

Viewing changes to intel/intel_bufmgr_gem.c

Tags: upstream-2.4.25
Import upstream version 2.4.25

Show diffs side-by-side

added added

removed removed

Lines of Context:
intel/intel_bufmgr_gem.c
762
762
                aligned_y = y;
763
763
                height_alignment = 2;
764
764
 
765
 
                if (tiling == I915_TILING_X)
 
765
                if (IS_GEN2(bufmgr_gem) && tiling != I915_TILING_NONE)
 
766
                        height_alignment = 16;
 
767
                else if (tiling == I915_TILING_X)
766
768
                        height_alignment = 8;
767
769
                else if (tiling == I915_TILING_Y)
768
770
                        height_alignment = 32;
769
 
                /* i8xx has a interleaved 2-row tile layout */
770
 
                if (IS_GEN2(bufmgr_gem) && tiling != I915_TILING_NONE)
771
 
                        height_alignment *= 2;
772
771
                aligned_y = ALIGN(y, height_alignment);
773
772
 
774
773
                stride = x * cpp;