Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 3a4986955c0d9806e96a9d738ef7c40cb0cdaba3

Authored by Kyle McMartin
Committed by Linus Torvalds
1 parent 71e4eda8ce
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

Revert "intel_agp: fix stolen mem range on G33" 

This reverts commit f443675affe3f16dd428e46f0f7fd3f4d703eeab, which
breaks horribly if you aren't running an unreleased xf86-video-intel
driver out of git.

Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>
Cc: Dave Airlie <airlied@linux.ie>
Cc: Zhenyu Wang <zhenyu.z.wang@intel.com>
Acked-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 0 additions and 5 deletions Side-by-side Diff

drivers/char/agp/intel-agp.c
Diff comments   View file @ 3a49869
... ... @@ -506,11 +506,6 @@
506 506 break;
507 507 }
508 508 } else {
509   - /* G33's GTT stolen memory is separate from gfx data
510   - * stolen memory.
511   - */
512   - if (IS_G33)
513   - size = 0;
514 509 switch (gmch_ctrl & I855_GMCH_GMS_MASK) {
515 510 case I855_GMCH_GMS_STOLEN_1M:
516 511 gtt_entries = MB(1) - KB(size);