linux-next: manual merge of the drm-intel tree with Linus' tree

Stephen Rothwell
2015-07-09T01:02:59Z

[-- Attachment #1: Type: text/plain, Size: 1329 bytes --]

Hi all,

Today's linux-next merge of the drm-intel tree got a conflict in:

drivers/gpu/drm/i915/i915_gem_gtt.c

between commit:

00245266b4be ("drm/i915/ppgtt: Break loop in gen8_ppgtt_clear_range failure path")

from Linus' tree and commit:

567047be2a7e ("drm/i915/gtt: Use macros to access dma mapped pages")

from the drm-intel tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au

diff --cc drivers/gpu/drm/i915/i915_gem_gtt.c
index dcc6a88c560e,ed65f24867b4..000000000000
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@@ -513,10 -583,9 +583,9 @@@ static void gen8_ppgtt_clear_range(stru
while (num_entries) {
struct i915_page_directory *pd;
struct i915_page_table *pt;
- struct page *page_table;

if (WARN_ON(!ppgtt->pdp.page_directory[pdpe]))
- continue;
+ break;

pd = ppgtt->pdp.page_directory[pdpe];

@@@ -525,11 -594,9 +594,9 @@@

pt = pd->page_table[pde];

- if (WARN_ON(!pt->page))
+ if (WARN_ON(!px_page(pt)))
- continue;
+ break;

- page_table = pt->page;
-
last_pte = pte + num_entries;
if (last_pte > GEN8_PTES)
last_pte = GEN8_PTES;

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]