From patchwork Wed Jan 3 23:23:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Axtens X-Patchwork-Id: 855312 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=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 3zBn8C6HP1z9s72; Thu, 4 Jan 2018 10:24:43 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1eWsOl-0005PI-M1; Wed, 03 Jan 2018 23:24:39 +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 1eWsOk-0005Ov-FE for kernel-team@lists.canonical.com; Wed, 03 Jan 2018 23:24:38 +0000 Received: from mail-pf0-f200.google.com ([209.85.192.200]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1eWsOk-0003kQ-3q for kernel-team@lists.canonical.com; Wed, 03 Jan 2018 23:24:38 +0000 Received: by mail-pf0-f200.google.com with SMTP id p89so1422374pfk.5 for ; Wed, 03 Jan 2018 15:24:38 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=MDIE5hH6xMKLYYoHMEnOS7zW7cYPgrzp4NtjWpSZnwE=; b=OEzUP0IXDjGbQGzkHonOfb5SkhSYd/beaKSLQInxw0sLH2q4y9tbI3FX14Y9Pchoy/ zmgpZh6gxZVFnnZno79j6JOh7uYYOVIiTQ5Il7ZGLexDRDUuq8JTtePWqpGG5BkYf8G2 rB4s/aOEJ6EjtFiHRlExNV4zMytkO8kmPv1izsyom5HUOPJgHPmBYBW8gK2PcHsshARD 2q/NKxjqWuWtp+OM/J2pevqse/tFqYxraBNQAfy8X7NP7fJGpUfOkSXAwElWBEEn6U6q 56Tmm9uPA3RktKFSMo0kyb5wKh3d04kNH3n4UiRMN0OT6bO6taIDeld9t14eQSWNxi5T 87HQ== X-Gm-Message-State: AKGB3mI7OtioFMO7/wtTYhP7tYzkwccNZfzQMfQ5WbryGx32mgd6W6SM vbi6DaCnA9m1l8s7bfeLJW4xV43467zUV7Ymnh8WNewnZmuaocrzN7oWOA5vKFycnsAFFu71HJA H9TTCqxbLoI+sUKgooCvYgVbh8cLENvK7A9C+554rizgzpoES X-Received: by 10.98.57.131 with SMTP id u3mr2844702pfj.7.1515021876751; Wed, 03 Jan 2018 15:24:36 -0800 (PST) X-Google-Smtp-Source: ACJfBosWAdFLBHJuxelPrqufUXMrRKhVdeUs2FKEpSpv+TDPGMhFKEtBMSHqt/Fsfxphhcx7QsnEXQ== X-Received: by 10.98.57.131 with SMTP id u3mr2844689pfj.7.1515021876565; Wed, 03 Jan 2018 15:24:36 -0800 (PST) Received: from localhost.localdomain ([2001:67c:1562:8007::aac:4356]) by smtp.gmail.com with ESMTPSA id c79sm4609958pfj.49.2018.01.03.15.24.32 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Jan 2018 15:24:36 -0800 (PST) From: Daniel Axtens X-Google-Original-From: Daniel Axtens To: kernel-team@lists.canonical.com Subject: [RESEND][SRU][A][PATCH 1/1] UBUNTU: SAUCE: drm: hibmc: Initialize the hibmc_bo_driver.io_mem_pfn Date: Thu, 4 Jan 2018 10:23:56 +1100 Message-Id: <20180103232356.4466-2-dja@axtens.net> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180103232356.4466-1-dja@axtens.net> References: <20180103232356.4466-1-dja@axtens.net> 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" From: Michal Srb BugLink: https://bugs.launchpad.net/bugs/1738334 The io_mem_pfn field was added in ea642c3216cb2a60d1c0e760ae47ee85c9c16447 and is used unconditionally. Most drivers were updated to set it to the default implementation ttm_bo_default_io_mem_pfn, but hibmc was not. This fixes crash in ttm_bo_vm_fault when hibmc driver is used. Signed-off-by: Michal Srb (cherry-picked from https://lists.freedesktop.org/archives/dri-devel/2017-November/159002.html) [upstream fix at https://lists.freedesktop.org/archives/dri-devel/2017-December/161184.html is quite intrusive - this is the minimal fix] Signed-off-by: Daniel Axtens Acked-by: Paolo Pisati --- drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c index ac457c779caa..1a6c2a34771a 100644 --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c @@ -243,6 +243,7 @@ struct ttm_bo_driver hibmc_bo_driver = { .verify_access = hibmc_bo_verify_access, .io_mem_reserve = &hibmc_ttm_io_mem_reserve, .io_mem_free = NULL, + .io_mem_pfn = ttm_bo_default_io_mem_pfn, }; int hibmc_mm_init(struct hibmc_drm_private *hibmc)