diff mbox series

[5.11,048/254] drm/radeon: fix AGP dependency

Message ID	20210329075634.752160830@linuxfoundation.org
State	Superseded
Headers	show Return-Path: <stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, =?utf-8?q?Christian_K=C3=B6nig?= <christian.koenig@amd.com>, Alex Deucher <alexander.deucher@amd.com>, Sasha Levin <sashal@kernel.org> Subject: [PATCH 5.11 048/254] drm/radeon: fix AGP dependency Date: Mon, 29 Mar 2021 09:56:04 +0200 Message-Id: <20210329075634.752160830@linuxfoundation.org> In-Reply-To: <20210329075633.135869143@linuxfoundation.org> References: <20210329075633.135869143@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	None \| expand [5.11,002/254] mt76: mt7915: only modify tx buffer list after allocating tx token id [5.11,003/254] net: stmmac: fix dma physical address of descriptor when display ring [5.11,004/254] net: fec: ptp: avoid register access when ipg clock is disabled [5.11,005/254] powerpc/4xx: Fix build errors from mfdcr() [5.11,006/254] atm: eni: dont release is never initialized [5.11,007/254] atm: lanai: dont run lanai_dev_close if not open [5.11,008/254] Revert "r8152: adjust the settings about MAC clock speed down for RTL8153" [5.11,009/254] ALSA: hda: ignore invalid NHLT table [5.11,010/254] ixgbe: Fix memleak in ixgbe_configure_clsu32 [5.11,011/254] scsi: ufs: ufs-qcom: Disable interrupt in reset path [5.11,012/254] blk-cgroup: Fix the recursive blkg rwstat [5.11,013/254] net: tehuti: fix error return code in bdx_probe() [5.11,014/254] net: intel: iavf: fix error return code of iavf_init_get_resources() [5.11,015/254] sun/niu: fix wrong RXMAC_BC_FRM_CNT_COUNT count [5.11,016/254] gianfar: fix jumbo packets+napi+rx overrun crash [5.11,017/254] cifs: ask for more credit on async read/write code paths [5.11,018/254] gfs2: fix use-after-free in trans_drain [5.11,019/254] cpufreq: blacklist Arm Vexpress platforms in cpufreq-dt-platdev [5.11,020/254] gpiolib: acpi: Add missing IRQF_ONESHOT [5.11,021/254] nfs: fix PNFS_FLEXFILE_LAYOUT Kconfig default [5.11,022/254] NFS: Correct size calculation for create reply length [5.11,023/254] net: hisilicon: hns: fix error return code of hns_nic_clear_all_rx_fetch() [5.11,024/254] net: wan: fix error return code of uhdlc_init() [5.11,025/254] net: davicom: Use platform_get_irq_optional() [5.11,026/254] net: enetc: set MAC RX FIFO to recommended value [5.11,027/254] atm: uPD98402: fix incorrect allocation [5.11,028/254] atm: idt77252: fix null-ptr-dereference [5.11,029/254] cifs: change noisy error message to FYI [5.11,030/254] irqchip/ingenic: Add support for the JZ4760 [5.11,031/254] kbuild: add image_name to no-sync-config-targets [5.11,032/254] kbuild: dummy-tools: fix inverted tests for gcc [5.11,033/254] umem: fix error return code in mm_pci_probe() [5.11,034/254] sparc64: Fix opcode filtering in handling of no fault loads [5.11,035/254] habanalabs: Call put_pid() when releasing control device [5.11,036/254] habanalabs: Disable file operations after device is removed [5.11,037/254] staging: rtl8192e: fix kconfig dependency on CRYPTO [5.11,038/254] u64_stats,lockdep: Fix u64_stats_init() vs lockdep [5.11,039/254] kselftest: arm64: Fix exit code of sve-ptrace [5.11,040/254] regulator: qcom-rpmh: Correct the pmic5_hfsmps515 buck [5.11,041/254] regulator: qcom-rpmh: Use correct buck for S1C regulator [5.11,042/254] block: Fix REQ_OP_ZONE_RESET_ALL handling [5.11,043/254] drm/amd/display: Enable pflip interrupt upon pipe enable [5.11,044/254] drm/amd/display: Revert dram_clock_change_latency for DCN2.1 [5.11,045/254] drm/amd/display: Enabled pipe harvesting in dcn30 [5.11,046/254] drm/amdgpu/display: Use wm_table.entries for dcn301 calculate_wm [5.11,047/254] drm/amdgpu: fb BO should be ttm_bo_type_device [5.11,048/254] drm/radeon: fix AGP dependency [5.11,049/254] nvme: simplify error logic in nvme_validate_ns() [5.11,050/254] nvme: add NVME_REQ_CANCELLED flag in nvme_cancel_request() [5.11,051/254] nvme-fc: set NVME_REQ_CANCELLED in nvme_fc_terminate_exchange() [5.11,052/254] nvme-fc: return NVME_SC_HOST_ABORTED_CMD when a command has been aborted [5.11,053/254] nvme-core: check ctrl css before setting up zns [5.11,054/254] nvme-rdma: Fix a use after free in nvmet_rdma_write_data_done [5.11,055/254] nvme-pci: add the DISABLE_WRITE_ZEROES quirk for a Samsung PM1725a [5.11,056/254] nfs: we dont support removing system.nfs4_acl [5.11,057/254] block: Suppress uevent for hidden device when removed [5.11,058/254] io_uring: cancel deferred requests in try_cancel [5.11,059/254] mm/fork: clear PASID for new mm [5.11,060/254] ia64: fix ia64_syscall_get_set_arguments() for break-based syscalls [5.11,061/254] ia64: fix ptrace(PTRACE_SYSCALL_INFO_EXIT) sign [5.11,062/254] static_call: Pull some static_call declarations to the type headers [5.11,063/254] static_call: Allow module use without exposing static_call_key [5.11,064/254] static_call: Fix the module key fixup [5.11,065/254] static_call: Fix static_call_set_init() [5.11,066/254] KVM: x86: Protect userspace MSR filter with SRCU, and set atomically-ish [5.11,067/254] btrfs: do not initialize dev stats if we have no dev_root [5.11,068/254] btrfs: do not initialize dev replace for bad dev root [5.11,069/254] btrfs: fix check_data_csum() error message for direct I/O [5.11,070/254] btrfs: initialize device::fs_info always [5.11,071/254] btrfs: fix sleep while in non-sleep context during qgroup removal [5.11,072/254] btrfs: fix subvolume/snapshot deletion not triggered on mount [5.11,073/254] selinux: dont log MAC_POLICY_LOAD record on failed policy load [5.11,074/254] selinux: fix variable scope issue in live sidtab conversion [5.11,075/254] netsec: restore phy power state after controller reset [5.11,076/254] platform/x86: intel-vbtn: Stop reporting SW_DOCK events [5.11,077/254] psample: Fix user API breakage [5.11,078/254] z3fold: prevent reclaim/free race for headless pages [5.11,079/254] squashfs: fix inode lookup sanity checks [5.11,080/254] squashfs: fix xattr id and id lookup sanity checks [5.11,081/254] hugetlb_cgroup: fix imbalanced css_get and css_put pair for shared mappings [5.11,082/254] kasan: fix per-page tags for non-page_alloc pages [5.11,083/254] gcov: fix clang-11+ support [5.11,084/254] mm/highmem: fix CONFIG_DEBUG_KMAP_LOCAL_FORCE_MAP [5.11,085/254] ACPI: video: Add missing callback back for Sony VPCEH3U1E [5.11,086/254] ACPICA: Always create namespace nodes using acpi_ns_create_node() [5.11,087/254] arm64: stacktrace: dont trace arch_stack_walk() [5.11,088/254] arm64: dts: ls1046a: mark crypto engine dma coherent [5.11,089/254] arm64: dts: ls1012a: mark crypto engine dma coherent [5.11,090/254] arm64: dts: ls1043a: mark crypto engine dma coherent [5.11,091/254] ARM: dts: at91: sam9x60: fix mux-mask for PA7 so it can be set to A, B and C [5.11,092/254] ARM: dts: at91: sam9x60: fix mux-mask to match products datasheet [5.11,093/254] ARM: dts: at91-sama5d27_som1: fix phy address to 7 [5.11,094/254] integrity: double check iint_cache was initialized [5.11,095/254] drm/nouveau/kms/nve4-nv108: Limit cursors to 128x128 [5.11,096/254] drm/etnaviv: Use FOLL_FORCE for userptr [5.11,097/254] drm/amd/pm: workaround for audio noise issue [5.11,098/254] drm/amdgpu/display: restore AUX_DPHY_TX_CONTROL for DCN2.x [5.11,099/254] drm/amdgpu: fix the hibernation suspend with s0ix [5.11,100/254] drm/amdgpu: Add additional Sienna Cichlid PCI ID [5.11,101/254] drm/i915/dsc: fix DSS CTL register usage for ICL DSI transcoders [5.11,102/254] drm/i915: Fix the GT fence revocation runtime PM logic [5.11,103/254] dm verity: fix DM_VERITY_OPTS_MAX value [5.11,104/254] dm: dont report "detected capacity change" on device creation [5.11,105/254] dm ioctl: fix out of bounds array access when no devices [5.11,106/254] bus: omap_l3_noc: mark l3 irqs as IRQF_NO_THREAD [5.11,107/254] soc: ti: omap-prm: Fix reboot issue with invalid pcie reset map for dra7 [5.11,108/254] ARM: OMAP2+: Fix smartreflex init regression after dropping legacy data [5.11,109/254] soc: ti: omap-prm: Fix occasional abort on reset deassert for dra7 iva [5.11,110/254] veth: Store queue_mapping independently of XDP prog presence [5.11,111/254] bpf: Dont allow vmlinux BTF to be used in map_create and prog_load. [5.11,112/254] bpf: Change inode_storages lookup_elem return value from NULL to -EBADF [5.11,113/254] libbpf: Fix INSTALL flag order [5.11,114/254] net/mlx5e: RX, Mind the MPWQE gaps when calculating offsets [5.11,115/254] net/mlx5e: Set PTP channel pointer explicitly to NULL [5.11,116/254] net/mlx5e: When changing XDP program without reset, take refs for XSK RQs [5.11,117/254] net/mlx5e: Revert parameters on errors when changing PTP state without reset [5.11,118/254] net/mlx5e: Dont match on Geneve options in case option masks are all zero [5.11,119/254] net/mlx5e: E-switch, Fix rate calculation division [5.11,120/254] ipv6: fix suspecious RCU usage warning [5.11,121/254] drop_monitor: Perform cleanup upon probe registration failure [5.11,122/254] macvlan: macvlan_count_rx() needs to be aware of preemption [5.11,123/254] net: sched: validate stab values [5.11,124/254] net: dsa: bcm_sf2: Qualify phydev->dev_flags based on port [5.11,125/254] igc: reinit_locked() should be called with rtnl_lock [5.11,126/254] igc: Fix Pause Frame Advertising [5.11,127/254] igc: Fix Supported Pause Frame Link Setting [5.11,128/254] igc: Fix igc_ptp_rx_pktstamp() [5.11,129/254] e1000e: add rtnl_lock() to e1000_reset_task [5.11,130/254] e1000e: Fix error handling in e1000_set_d0_lplu_state_82571 [5.11,131/254] kunit: tool: Disable PAGE_POISONING under --alltests [5.11,132/254] net/qlcnic: Fix a use after free in qlcnic_83xx_get_minidump_template [5.11,133/254] net: phy: broadcom: Add power down exit reset state delay [5.11,134/254] ice: fix napi work done reporting in xsk path [5.11,135/254] ftgmac100: Restart MAC HW once [5.11,136/254] clk: qcom: gcc-sc7180: Use floor ops for the correct sdcc1 clk [5.11,137/254] net: ipa: terminate message handler arrays [5.11,138/254] net: qrtr: fix a kernel-infoleak in qrtr_recvmsg() [5.11,139/254] flow_dissector: fix byteorder of dissected ICMP ID [5.11,140/254] selftests/bpf: Set gopt opt_class to 0 if get tunnel opt failed [5.11,141/254] netfilter: ctnetlink: fix dump of the expect mask attribute [5.11,142/254] net: hdlc_x25: Prevent racing between "x25_close" and "x25_xmit"/"x25_rx" [5.11,143/254] net: phylink: Fix phylink_err() function name error in phylink_major_config [5.11,144/254] tipc: better validate user input in tipc_nl_retrieve_key() [5.11,145/254] tcp: relookup sock for RST+ACK packets handled by obsolete req sock [5.11,146/254] mptcp: fix ADD_ADDR HMAC in case port is specified [5.11,147/254] can: isotp: isotp_setsockopt(): only allow to set low level TX flags for CAN-FD [5.11,148/254] can: isotp: TX-path: ensure that CAN frame flags are initialized [5.11,149/254] can: peak_usb: add forgotten supported devices [5.11,150/254] can: flexcan: flexcan_chip_freeze(): fix chip freeze for missing bitrate [5.11,151/254] can: kvaser_pciefd: Always disable bus load reporting [5.11,152/254] can: c_can_pci: c_can_pci_remove(): fix use-after-free [5.11,153/254] can: c_can: move runtime PM enable/disable to c_can_platform [5.11,154/254] can: m_can: m_can_do_rx_poll(): fix extraneous msg loss warning [5.11,155/254] can: m_can: m_can_rx_peripheral(): fix RX being blocked by errors [5.11,156/254] mac80211: fix rate mask reset [5.11,157/254] mac80211: Allow HE operation to be longer than expected. [5.11,158/254] selftests/net: fix warnings on reuseaddr_ports_exhausted [5.11,159/254] nfp: flower: fix unsupported pre_tunnel flows [5.11,160/254] nfp: flower: add ipv6 bit to pre_tunnel control message [5.11,161/254] nfp: flower: fix pre_tun mask id allocation [5.11,162/254] ftrace: Fix modify_ftrace_direct. [5.11,163/254] drm/msm/dsi: fix check-before-set in the 7nm dsi_pll code [5.11,164/254] ionic: linearize tso skb with too many frags [5.11,165/254] net/sched: cls_flower: fix only mask bit check in the validate_ct_state [5.11,166/254] netfilter: nftables: report EOPNOTSUPP on unsupported flowtable flags [5.11,167/254] netfilter: nftables: allow to update flowtable flags [5.11,168/254] netfilter: flowtable: Make sure GC works periodically in idle system [5.11,169/254] libbpf: Fix error path in bpf_object__elf_init() [5.11,170/254] libbpf: Use SOCK_CLOEXEC when opening the netlink socket [5.11,171/254] ARM: dts: imx6ull: fix ubi filesystem mount failed [5.11,172/254] ipv6: weaken the v4mapped source check [5.11,173/254] octeontx2-af: Formatting debugfs entry rsrc_alloc. [5.11,174/254] octeontx2-af: Remove TOS field from MKEX TX [5.11,175/254] octeontx2-af: Fix irq free in rvu teardown [5.11,176/254] octeontx2-pf: Clear RSS enable flag on interace down [5.11,177/254] octeontx2-af: fix infinite loop in unmapping NPC counter [5.11,178/254] net: check all name nodes in __dev_alloc_name [5.11,179/254] net: cdc-phonet: fix data-interface release on probe failure [5.11,180/254] igb: check timestamp validity [5.11,181/254] sctp: move sk_route_caps check and set into sctp_outq_flush_transports [5.11,182/254] r8152: limit the RX buffer size of RTL8153A for USB 2.0 [5.11,183/254] net: stmmac: dwmac-sun8i: Provide TX and RX fifo sizes [5.11,184/254] selinux: vsock: Set SID for socket returned by accept() [5.11,185/254] selftests: forwarding: vxlan_bridge_1d: Fix vxlan ecn decapsulate value [5.11,186/254] libbpf: Fix BTF dump of pointer-to-array-of-struct [5.11,187/254] bpf: Fix umd memory leak in copy_process() [5.11,188/254] can: isotp: tx-path: zero initialize outgoing CAN frames [5.11,189/254] platform/x86: dell-wmi-sysman: Fix crash caused by calling kset_unregister twice [5.11,190/254] platform/x86: dell-wmi-sysman: Fix possible NULL pointer deref on exit [5.11,191/254] platform/x86: dell-wmi-sysman: Make it safe to call exit_foo_attributes() multiple... [5.11,192/254] platform/x86: dell-wmi-sysman: Fix release_attributes_data() getting called twice ... [5.11,193/254] platform/x86: dell-wmi-sysman: Cleanup sysman_init() error-exit handling [5.11,194/254] platform/x86: dell-wmi-sysman: Make sysman_init() return -ENODEV of the interfaces... [5.11,195/254] drm/msm: fix shutdown hook in case GPU components failed to bind [5.11,196/254] drm/msm: Fix suspend/resume on i.MX5 [5.11,197/254] arm64: kdump: update ppos when reading elfcorehdr [5.11,198/254] PM: runtime: Defer suspending suppliers [5.11,199/254] net/mlx5: Add back multicast stats for uplink representor [5.11,200/254] net/mlx5e: Allow to match on MPLS parameters only for MPLS over UDP [5.11,201/254] net/mlx5e: Offload tuple rewrite for non-CT flows [5.11,202/254] net/mlx5e: Fix error path for ethtool set-priv-flag [5.11,203/254] mfd: intel_quark_i2c_gpio: Revert "Constify static struct resources" [5.11,204/254] PM: EM: postpone creating the debugfs dir till fs_initcall [5.11,205/254] platform/x86: intel_pmt_crashlog: Fix incorrect macros [5.11,206/254] net: bridge: dont notify switchdev for local FDB addresses [5.11,207/254] octeontx2-af: Fix memory leak of object buf [5.11,208/254] xen/x86: make XEN_BALLOON_MEMORY_HOTPLUG_LIMIT depend on MEMORY_HOTPLUG [5.11,209/254] RDMA/cxgb4: Fix adapter LE hash errors while destroying ipv6 listening server [5.11,210/254] mm: memblock: fix section mismatch warning again [5.11,211/254] bpf: Dont do bpf_cgroup_storage_set() for kuprobe/tp programs [5.11,212/254] net: Consolidate common blackhole dst ops [5.11,213/254] net, bpf: Fix ip6ip6 crash with collect_md populated skbs [5.11,214/254] igb: avoid premature Rx buffer reuse [5.11,215/254] net: axienet: Fix probe error cleanup [5.11,216/254] net: phy: introduce phydev->port [5.11,217/254] net: phy: broadcom: Avoid forward for bcm54xx_config_clock_delay() [5.11,218/254] net: phy: broadcom: Set proper 1000BaseX/SGMII interface mode for BCM54616S [5.11,219/254] net: phy: broadcom: Fix RGMII delays for BCM50160 and BCM50610M [5.11,220/254] Revert "netfilter: x_tables: Switch synchronization to RCU" [5.11,221/254] netfilter: x_tables: Use correct memory barriers. [5.11,222/254] bpf: Fix fexit trampoline. [5.11,223/254] bpf: Use NOP_ATOMIC5 instead of emit_nops(&prog, 5) for BPF_TRAMP_F_CALL_ORIG [5.11,224/254] platform/x86: dell-wmi-sysman: Cleanup create_attributes_level_sysfs_files() [5.11,225/254] arm64/mm: define arch_get_mappable_range() [5.11,226/254] arm64: mm: correct the inside linear map range during hotplug check [5.11,227/254] dm table: Fix zoned model check and zone sectors check [5.11,228/254] mm/mmu_notifiers: ensure range_end() is paired with range_start() [5.11,229/254] Revert "netfilter: x_tables: Update remaining dereference to RCU" [5.11,230/254] ACPI: scan: Rearrange memory allocation in acpi_device_add() [5.11,231/254] ACPI: scan: Use unique number for instance_no [5.11,232/254] perf auxtrace: Fix auxtrace queue conflict [5.11,233/254] perf synthetic events: Avoid write of uninitialized memory when generating PERF_RE... [5.11,234/254] io_uring: fix provide_buffers sign extension [5.11,235/254] block: recalculate segment count for multi-segment discards correctly [5.11,236/254] scsi: Revert "qla2xxx: Make sure that aborted commands are freed" [5.11,237/254] scsi: qedi: Fix error return code of qedi_alloc_global_queues() [5.11,238/254] scsi: mpt3sas: Fix error return code of mpt3sas_base_attach() [5.11,239/254] smb3: fix cached file size problems in duplicate extents (reflink) [5.11,240/254] cifs: Adjust key sizes and key generation routines for AES256 encryption [5.11,241/254] locking/mutex: Fix non debug version of mutex_lock_io_nested() [5.11,242/254] x86/mem_encrypt: Correct physical address calculation in __set_clr_pte_enc() [5.11,243/254] fs/cachefiles: Remove wait_bit_key layout dependency [5.11,244/254] ch_ktls: fix enum-conversion warning [5.11,245/254] can: dev: Move device back to init netns on owning netns delete [5.11,246/254] r8169: fix DMA being used after buffer free if WoL is enabled [5.11,247/254] net: dsa: b53: VLAN filtering is global to all users [5.11,248/254] mac80211: fix double free in ibss_leave [5.11,249/254] ext4: add reclaim checks to xattr code [5.11,250/254] fs/ext4: fix integer overflow in s_log_groups_per_flex [5.11,251/254] Revert "xen: fix p2m size in dom0 for disabled memory hotplug case" [5.11,252/254] nvme: fix the nsid value to print in nvme_validate_or_alloc_ns [5.11,253/254] can: peak_usb: Revert "can: peak_usb: add forgotten supported devices" [5.11,254/254] selftest/bpf: Add a test to check trampoline freeing logic.

Commit Message

Greg KH March 29, 2021, 7:56 a.m. UTC

From: Christian König <christian.koenig@amd.com>

[ Upstream commit cba2afb65cb05c3d197d17323fee4e3c9edef9cd ]

When AGP is compiled as module radeon must be compiled as module as
well.

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 drivers/gpu/drm/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff mbox series

Patch

diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
index af6c6d214d91..f0c0ccdc8a10 100644
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@ -232,6 +232,7 @@  source "drivers/gpu/drm/arm/Kconfig"
 config DRM_RADEON
 	tristate "ATI Radeon"
 	depends on DRM && PCI && MMU
+	depends on AGP || !AGP
 	select FW_LOADER
         select DRM_KMS_HELPER
         select DRM_TTM