From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 782C8C07E9B for ; Mon, 19 Jul 2021 13:06:44 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 47CB66112D for ; Mon, 19 Jul 2021 13:06:44 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 47CB66112D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linuxfoundation.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CD9616E0EE; Mon, 19 Jul 2021 13:06:43 +0000 (UTC) Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7824D6E0EE for ; Mon, 19 Jul 2021 13:06:43 +0000 (UTC) Received: by mail.kernel.org (Postfix) with ESMTPSA id D2CFA6113E; Mon, 19 Jul 2021 13:06:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626700003; bh=nr8HGravfZjB+PXQCbfaSt2dUO4OUUO1FLT7v55nIeg=; h=Subject:To:Cc:From:Date:From; b=AK6evD49mKFYrC5iWhQD8ROVunuFWgoWlDWEkYoSHIgHoiMD07qWWezGFwEZXYKuS 8F0w8h8ete/iBwHUoPbfB0SugkaQCwqCvaItiJlpnCAvH6gjtdTYa3zdofm0+ohyiO 6qtnZzwmS4Eyj9ykXB4qMb/Kbglr2NbGGpBRDbCY= Subject: Patch "Revert "drm/ast: Remove reference to struct drm_device.pdev"" has been added to the 5.10-stable tree To: airlied@redhat.com, dri-devel@lists.freedesktop.org, gregkh@linuxfoundation.org, kuohsiang_chou@aspeedtech.com, lkp@intel.com, michael.j.ruhl@intel.com, tzimmermann@suse.de, xtfeng@gmail.com From: Date: Mon, 19 Jul 2021 15:06:24 +0200 Message-ID: <16266999845452@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit X-stable: commit X-Patchwork-Hint: ignore X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: stable-commits@vger.kernel.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" This is a note to let you know that I've just added the patch titled Revert "drm/ast: Remove reference to struct drm_device.pdev" to the 5.10-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: revert-drm-ast-remove-reference-to-struct-drm_device.pdev.patch and it can be found in the queue-5.10 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >From cb1b21b946f3fc0ac01547c1a4f04927ad0090bd Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 19 Jul 2021 15:01:49 +0200 Subject: Revert "drm/ast: Remove reference to struct drm_device.pdev" From: Greg Kroah-Hartman This reverts commit fcb041ca5c7787b096aafc899e45f93583e66cbd which is commit 0ecb51824e838372e01330752503ddf9c0430ef7 upstream. Turns out this was incomplete, as it is missing a dependancy, so drop it from the tree. Link: https://lore.kernel.org/r/CAJn8CcHHKSo7GF29Z1ufXJJpMUzn6+fdvwiqe9=JvgpcfvnbHQ@mail.gmail.com Reported-by: Xiaotian Feng Cc: Thomas Zimmermann Cc: Michael J. Ruhl Cc: KuoHsiang Chou Cc: kernel test robot Cc: Thomas Zimmermann Cc: Dave Airlie Cc: dri-devel@lists.freedesktop.org Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/ast/ast_main.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) --- a/drivers/gpu/drm/ast/ast_main.c +++ b/drivers/gpu/drm/ast/ast_main.c @@ -406,6 +406,7 @@ struct ast_private *ast_device_create(st return ast; dev = &ast->base; + dev->pdev = pdev; pci_set_drvdata(pdev, dev); ast->regs = pcim_iomap(pdev, 1, 0); @@ -447,8 +448,8 @@ struct ast_private *ast_device_create(st /* map reserved buffer */ ast->dp501_fw_buf = NULL; - if (dev->vram_mm->vram_size < pci_resource_len(pdev, 0)) { - ast->dp501_fw_buf = pci_iomap_range(pdev, 0, dev->vram_mm->vram_size, 0); + if (dev->vram_mm->vram_size < pci_resource_len(dev->pdev, 0)) { + ast->dp501_fw_buf = pci_iomap_range(dev->pdev, 0, dev->vram_mm->vram_size, 0); if (!ast->dp501_fw_buf) drm_info(dev, "failed to map reserved buffer!\n"); } Patches currently in stable-queue which might be from gregkh@linuxfoundation.org are queue-5.10/tracing-do-not-reference-char-as-a-string-in-histograms.patch queue-5.10/scsi-zfcp-report-port-fc_security-as-unknown-early-during-remote-cable-pull.patch queue-5.10/cifs-handle-reconnect-of-tcon-when-there-is-no-cached-dfs-referral.patch queue-5.10/kvm-mmio-fix-use-after-free-read-in-kvm_vm_ioctl_unregister_coalesced_mmio.patch queue-5.10/drm-dp_mst-add-missing-drm-parameters-to-recently-added-call-to-drm_dbg_kms.patch queue-5.10/fbmem-do-not-delete-the-mode-that-is-still-in-use.patch queue-5.10/drm-i915-gtt-drop-the-page-table-optimisation.patch queue-5.10/drm-dp_mst-avoid-to-mess-up-payload-table-by-ports-in-stale-topology.patch queue-5.10/kvm-x86-mmu-do-not-apply-hpa-memory-encryption-mask-to-gpas.patch queue-5.10/revert-drm-ast-remove-reference-to-struct-drm_device.pdev.patch queue-5.10/kvm-x86-disable-hardware-breakpoints-unconditionally-before-kvm_x86-run.patch queue-5.10/drm-dp_mst-do-not-set-proposed-vcpi-directly.patch queue-5.10/kvm-nsvm-check-the-value-written-to-msr_vm_hsave_pa.patch queue-5.10/kvm-x86-use-guest-maxphyaddr-from-cpuid.0x8000_0008-iff-tdp-is-enabled.patch queue-5.10/cgroup-verify-that-source-is-a-string.patch queue-5.10/drm-i915-gt-fix-edeadlk-handling-regression.patch queue-5.10/drm-ingenic-fix-non-osd-mode.patch queue-5.10/drm-ingenic-switch-ipu-plane-to-type-overlay.patch queue-5.10/scsi-core-fix-bad-pointer-dereference-when-ehandler-kthread-is-invalid.patch