From patchwork Tue Aug 6 19:00:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timo Aaltonen X-Patchwork-Id: 1143034 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ubuntu.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4633qh32xBz9sP9; Wed, 7 Aug 2019 05:00:32 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1hv4h7-0000UR-0i; Tue, 06 Aug 2019 19:00:25 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.86_2) (envelope-from ) id 1hv4h4-0000Tq-IY for kernel-team@lists.ubuntu.com; Tue, 06 Aug 2019 19:00:22 +0000 Received: from kryptik.nebulazone.fi ([83.145.237.38] helo=deckard.off) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1hv4h4-0004cS-5t for kernel-team@lists.ubuntu.com; Tue, 06 Aug 2019 19:00:22 +0000 From: Timo Aaltonen To: kernel-team@lists.ubuntu.com Subject: [PATCH 0/3] [SRU][Bionic] drm/i915: Fix softpin on 32bit Date: Tue, 6 Aug 2019 22:00:18 +0300 Message-Id: <20190806190021.6566-1-tjaalton@ubuntu.com> X-Mailer: git-send-email 2.17.1 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1815172 We've been carrying a commit reverting softpin support from mesa in bionic, because softpin support was broken on 4.15 and 4.18. The patches to fix it were sent to stable@ but not all of them got applied to 4.15.x because there were minor conflicts. The patch for drm/i915/gvt was added to make the other one cherry-pick cleanly. The reason to get these backported is so that we can drop the revert from mesa, because it actually broke Ice Lake which apparently requires softpin support in the DRI driver. Chris Wilson (2): drm/i915: Mark up GTT sizes as u64 drm/i915: Compare user's 64b GTT offset even on 32b Zhi Wang (1): drm/i915/gvt: Use I915_GTT_PAGE_SIZE drivers/gpu/drm/i915/gvt/cmd_parser.c | 13 ++--- drivers/gpu/drm/i915/gvt/execlist.c | 2 +- drivers/gpu/drm/i915/gvt/gtt.c | 51 ++++++++++--------- drivers/gpu/drm/i915/gvt/gtt.h | 6 +-- drivers/gpu/drm/i915/gvt/reg.h | 3 +- drivers/gpu/drm/i915/gvt/scheduler.c | 12 ++--- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 2 +- drivers/gpu/drm/i915/i915_gem_gtt.c | 2 +- drivers/gpu/drm/i915/i915_gem_gtt.h | 8 +-- drivers/gpu/drm/i915/selftests/huge_pages.c | 2 +- drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 6 +-- 11 files changed, 55 insertions(+), 52 deletions(-) Acked-by: Khalid Elmously Acked-by: Connor Kuehl