* Re: [RFC v1 0/3] Add VIRTIO_F_IOMMU_PLATFORM support
From: Michael S. Tsirkin @ 2017-07-21 23:48 UTC (permalink / raw)
To: Brijesh Singh
Cc: Tom Lendacky, David Airlie, Jordan Justen, dri-devel,
virtualization, Laszlo Ersek, edk2-devel
In-Reply-To: <25d78a89-59bd-157a-ccf5-70cd25e14a05@amd.com>
On Fri, Jul 21, 2017 at 06:17:15AM -0500, Brijesh Singh wrote:
>
> On 7/20/17 10:24 PM, Jason Wang wrote:
> >
> >
> > On 2017年07月20日 06:09, Brijesh Singh wrote:
> >> I have found that OVMF fails to detect the disk when iommu_platform
> >> is set from
> >> qemu cli. The failure occurs during the feature bit negotiation.
> >>
> >> Recently, EDKII introduced IOMMU protocol d1fddc4533bf. SEV patch
> >> series introduced
> >> a IoMmu protocol driver f9d129e68a45 to set a DMA access attribute
> >> and methods to
> >> allocate, free, map and unmap the DMA memory for the master bus devices
> >>
> >> In this patch series, I have tried to enable the IOMMU_PLATFORM
> >> feature for
> >> VirtioBlkDevice. I am sending this as RFC to seek feedback before I
> >> extend the support
> >> for other Virtio devices. The patch has been tested in SEV guest -
> >> mainly because
> >> IoMmuDxe driver installs the IOMMU protocol for SEV guest only. If
> >> needed, I can
> >> extend the IoMmuDxe driver to install IOMMU protocol for non SEV guests.
> >>
> >> qemu cli used for testing:
> >>
> >> # $QEMU \
> >> ...
> >> -drive file=${HDA_FILE},if=none,id=disk0,format=qcow2 \
> >> -device
> >> virtio-blk-pci,drive=disk0,disable-legacy=on,iommu_platform=true,disable-modern=off,scsi=off
> >> ...
> >>
> >> Cc: Jordan Justen <jordan.l.justen@intel.com>
> >> Cc: Laszlo Ersek <lersek@redhat.com>
> >> Cc: Jason Wang <jasowang@redhat.com>
> >> Cc: Michael S. Tsirkin <mst@redhat.com>
> >> Contributed-under: TianoCore Contribution Agreement 1.0
> >> Signed-off-by: Brijesh Singh <brijesh.singh@amd.com>
> >>
> >> Brijesh Singh (3):
> >> OvmfPkg/Include/Virtio10: Define VIRTIO_F_IOMMU_PLATFORM feature bit
> >> OvmfPkg/VirtioLib: Add IOMMU_PLATFORM support
> >> OvmfPkg/VirtioBlkDxe: Add VIRITO_F_IOMMU_PLATFORM support
> >
> > Hi, do we need change virtio-scsi driver as well?
> >
> I see that OVMF has the following virtio drivers, we need to update them
> all:
>
> VirtioBlkDxe
> VirtioGpuDxe
> VirtioNetDxe
> VirtioRngDxe
> VirtioScsiDxe
>
> I will wait for Laszlo and Jordan's initial feedback before changing
> other drivers.
I'm not sure about the GPU. Cc relevant maintainers -
can virtio GPU work from behind an IOMMU?
> > Thanks
> >
> >>
> >> OvmfPkg/Library/VirtioLib/VirtioLib.inf | 1 +
> >> OvmfPkg/VirtioBlkDxe/VirtioBlk.inf | 5 +
> >> OvmfPkg/VirtioGpuDxe/VirtioGpu.inf | 1 +
> >> OvmfPkg/VirtioNetDxe/VirtioNet.inf | 1 +
> >> OvmfPkg/VirtioRngDxe/VirtioRng.inf | 1 +
> >> OvmfPkg/VirtioScsiDxe/VirtioScsi.inf | 1 +
> >> OvmfPkg/Include/IndustryStandard/Virtio095.h | 1 +
> >> OvmfPkg/Include/IndustryStandard/Virtio10.h | 5 +
> >> OvmfPkg/Include/Library/VirtioLib.h | 20 ++++
> >> OvmfPkg/Library/VirtioLib/VirtioLib.c | 96 ++++++++++++++-
> >> OvmfPkg/VirtioBlkDxe/VirtioBlk.c | 125
> >> ++++++++++++++++++--
> >> 11 files changed, 244 insertions(+), 13 deletions(-)
> >>
> >
_______________________________________________
Virtualization mailing list
Virtualization@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
^ permalink raw reply
* Re: [PATCH v12 5/8] virtio-balloon: VIRTIO_BALLOON_F_SG
From: Michael S. Tsirkin @ 2017-07-23 1:45 UTC (permalink / raw)
To: Wei Wang
Cc: aarcange, virtio-dev, kvm, qemu-devel, amit.shah,
liliang.opensource, linux-kernel, virtualization, linux-mm,
yang.zhang.wz, quan.xu, cornelia.huck, pbonzini, akpm, mgorman
In-Reply-To: <59686EEB.8080805@intel.com>
On Fri, Jul 14, 2017 at 03:12:43PM +0800, Wei Wang wrote:
> On 07/14/2017 04:19 AM, Michael S. Tsirkin wrote:
> > On Thu, Jul 13, 2017 at 03:42:35PM +0800, Wei Wang wrote:
> > > On 07/12/2017 09:56 PM, Michael S. Tsirkin wrote:
> > > > So the way I see it, there are several issues:
> > > >
> > > > - internal wait - forces multiple APIs like kick/kick_sync
> > > > note how kick_sync can fail but your code never checks return code
> > > > - need to re-write the last descriptor - might not work
> > > > for alternative layouts which always expose descriptors
> > > > immediately
> > > Probably it wasn't clear. Please let me explain the two functions here:
> > >
> > > 1) virtqueue_add_chain_desc(vq, head_id, prev_id,..):
> > > grabs a desc from the vq and inserts it to the chain tail (which is indexed
> > > by
> > > prev_id, probably better to call it tail_id). Then, the new added desc
> > > becomes
> > > the tail (i.e. the last desc). The _F_NEXT flag is cleared for each desc
> > > when it's
> > > added to the chain, and set when another desc comes to follow later.
> > And this only works if there are multiple rings like
> > avail + descriptor ring.
> > It won't work e.g. with the proposed new layout where
> > writing out a descriptor exposes it immediately.
>
> I think it can support the 1.1 proposal, too. But before getting
> into that, I think we first need to deep dive into the implementation
> and usage of _first/next/last. The usage would need to lock the vq
> from the first to the end (otherwise, the returned info about the number
> of available desc in the vq, i.e. num_free, would be invalid):
>
> lock(vq);
> add_first();
> add_next();
> add_last();
> unlock(vq);
>
> However, I think the case isn't this simple, since we need to check more
> things
> after each add_xx() step. For example, if only one entry is available at the
> time
> we start to use the vq, that is, num_free is 0 after add_first(), we
> wouldn't be
> able to add_next and add_last. So, it would work like this:
>
> start:
> ...get free page block..
> lock(vq)
> retry:
> ret = add_first(..,&num_free,);
> if(ret == -ENOSPC) {
> goto retry;
> } else if (!num_free) {
> add_chain_head();
> unlock(vq);
> kick & wait;
> goto start;
> }
> next_one:
> ...get free page block..
> add_next(..,&num_free,);
> if (!num_free) {
> add_chain_head();
> unlock(vq);
> kick & wait;
> goto start;
> } if (num_free == 1) {
> ...get free page block..
> add_last(..);
> unlock(vq);
> kick & wait;
> goto start;
> } else {
> goto next_one;
> }
>
> The above seems unnecessary to me to have three different APIs.
> That's the reason to combine them into one virtqueue_add_chain_desc().
>
> -- or, do you have a different thought about using the three APIs?
>
>
> Implementation Reference:
>
> struct desc_iterator {
> unsigned int head;
> unsigned int tail;
> };
>
> add_first(*vq, *desc_iterator, *num_free, ..)
> {
> if (vq->vq.num_free < 1)
> return -ENOSPC;
> get_desc(&desc_id);
> desc[desc_id].flag &= ~_F_NEXT;
> desc_iterator->head = desc_id
> desc_iterator->tail = desc_iterator->head;
> *num_free = vq->vq.num_free;
> }
>
> add_next(vq, desc_iterator, *num_free,..)
> {
> get_desc(&desc_id);
> desc[desc_id].flag &= ~_F_NEXT;
> desc[desc_iterator.tail].next = desc_id;
> desc[desc_iterator->tail].flag |= _F_NEXT;
> desc_iterator->tail = desc_id;
> *num_free = vq->vq.num_free;
> }
>
> add_last(vq, desc_iterator,..)
> {
> get_desc(&desc_id);
> desc[desc_id].flag &= ~_F_NEXT;
> desc[desc_iterator.tail].next = desc_id;
> desc_iterator->tail = desc_id;
>
> add_chain_head(); // put the desc_iterator.head to the ring
> }
>
>
> Best,
> Wei
OK I thought this over. While we might need these new APIs in
the future, I think that at the moment, there's a way to implement
this feature that is significantly simpler. Just add each s/g
as a separate input buffer.
This needs zero new APIs.
I know that follow-up patches need to add a header in front
so you might be thinking: how am I going to add this
header? The answer is quite simple - add it as a separate
out header.
Host will be able to distinguish between header and pages
by looking at the direction, and - should we want to add
IN data to header - additionally size (<4K => header).
We will be able to look at extended APIs separately down
the road.
--
MST
^ permalink raw reply
* Re: [RFC v1 0/3] Add VIRTIO_F_IOMMU_PLATFORM support
From: Gerd Hoffmann @ 2017-07-24 8:25 UTC (permalink / raw)
To: Michael S. Tsirkin, Brijesh Singh
Cc: Tom Lendacky, David Airlie, Jordan Justen, dri-devel,
virtualization, Laszlo Ersek, edk2-devel
In-Reply-To: <20170722024318-mutt-send-email-mst@kernel.org>
Hi,
> > I see that OVMF has the following virtio drivers, we need to update
> > them
> > all:
> >
> > VirtioBlkDxe
> > VirtioGpuDxe
> > VirtioNetDxe
> > VirtioRngDxe
> > VirtioScsiDxe
> >
> > I will wait for Laszlo and Jordan's initial feedback before
> > changing
> > other drivers.
>
> I'm not sure about the GPU. Cc relevant maintainers -
> can virtio GPU work from behind an IOMMU?
GPU uses main memory as backing storage for framebuffers, and this is
passed as guest physical address (scatterlist of addresses to be exact)
to the host.
So, I think no, this isn't going to work with the current code.
Should be possible to fix though. We need to define what "guest
physical address" should be with VIRTIO_F_IOMMU_PLATFORM enabled
(probably guest pci bus address) and add support for proper iommu
lookups.
cheers,
Gerd
^ permalink raw reply
* Re: [PATCH v12 6/8] mm: support reporting free page blocks
From: Michal Hocko @ 2017-07-24 9:00 UTC (permalink / raw)
To: Wei Wang
Cc: aarcange, virtio-dev, amit.shah, kvm, Michael S. Tsirkin,
linux-kernel, liliang.opensource, qemu-devel, virtualization,
linux-mm, yang.zhang.wz, quan.xu, cornelia.huck, pbonzini, akpm,
mgorman
In-Reply-To: <596F4A0E.4010507@intel.com>
On Wed 19-07-17 20:01:18, Wei Wang wrote:
> On 07/19/2017 04:13 PM, Michal Hocko wrote:
[...
> >All you should need is the check for the page reference count, no? I
> >assume you do some sort of pfn walk and so you should be able to get an
> >access to the struct page.
>
> Not necessarily - the guest struct page is not seen by the hypervisor. The
> hypervisor only gets those guest pfns which are hinted as unused. From the
> hypervisor (host) point of view, a guest physical address corresponds to a
> virtual address of a host process. So, once the hypervisor knows a guest
> physical page is unsued, it knows that the corresponding virtual memory of
> the process doesn't need to be transferred in the 1st round.
I am sorry, but I do not understand. Why cannot _guest_ simply check the
struct page ref count and send them to the hypervisor? Is there any
documentation which describes the workflow or code which would use your
new API?
--
Michal Hocko
SUSE Labs
^ permalink raw reply
* [PATCH] virtio-net: fix module unloading
From: Andrew Jones @ 2017-07-24 13:38 UTC (permalink / raw)
To: linux-kernel; +Cc: virtualization, Sebastian Andrzej Siewior, mst
Unregister the driver before removing multi-instance hotplug
callbacks. This order avoids the warning issued from
__cpuhp_remove_state_cpuslocked when the number of remaining
instances isn't yet zero.
Fixes: 8017c279196a ("net/virtio-net: Convert to hotplug state machine")
Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Andrew Jones <drjones@redhat.com>
---
drivers/net/virtio_net.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 99a26a9efec1..f41ab0ea942a 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -2743,9 +2743,9 @@ module_init(virtio_net_driver_init);
static __exit void virtio_net_driver_exit(void)
{
+ unregister_virtio_driver(&virtio_net_driver);
cpuhp_remove_multi_state(CPUHP_VIRT_NET_DEAD);
cpuhp_remove_multi_state(virtionet_online);
- unregister_virtio_driver(&virtio_net_driver);
}
module_exit(virtio_net_driver_exit);
--
2.13.3
^ permalink raw reply related
* Re: [PATCH net-next V2 0/5] Refine virtio-net XDP
From: David Miller @ 2017-07-24 20:38 UTC (permalink / raw)
To: jasowang; +Cc: netdev, virtualization, linux-kernel, mst
In-Reply-To: <1500454489-16805-1-git-send-email-jasowang@redhat.com>
From: Jason Wang <jasowang@redhat.com>
Date: Wed, 19 Jul 2017 16:54:44 +0800
> Hi:
>
> This series brings two optimizations for virtio-net XDP:
>
> - avoid reset during XDP set
> - turn off offloads on demand
>
> Changes from V1:
> - Various tweaks on commit logs and comments
> - Use virtnet_napi_enable() when enabling NAPI on XDP set
> - Copy the small buffer packet only if xdp_headroom is smaller than
> required
>
> Please review.
Series applied, thanks Jason.
Michael, I gave you 4+ days to properly review this respin of this
series. I felt that was more than sufficient time, even with an
intervening weekend. So if you don't like that I applied this without
your review, please be more punctual in the future.
Thank you.
^ permalink raw reply
* Re: [PATCH net-next V2 5/5] virtio-net: switch off offloads on demand if possible on XDP set
From: Michael S. Tsirkin @ 2017-07-24 21:29 UTC (permalink / raw)
To: Jason Wang; +Cc: netdev, linux-kernel, virtualization
In-Reply-To: <1500454489-16805-6-git-send-email-jasowang@redhat.com>
On Wed, Jul 19, 2017 at 04:54:49PM +0800, Jason Wang wrote:
> Current XDP implementation wants guest offloads feature to be disabled
> on device. This is inconvenient and means guest can't benefit from
> offloads if XDP is not used. This patch tries to address this
> limitation by disabling the offloads on demand through control guest
> offloads. Guest offloads will be disabled and enabled on demand on XDP
> set.
>
> Signed-off-by: Jason Wang <jasowang@redhat.com>
Doesn't look like my comments on v1 were addressed.
Copying here:
In fact, since we no longer reset when XDP is set,
here device might have offloads enabled, buffers are
used but not consumed, then XDP is set.
This can result in
- packet scattered across multiple buffers
(handled correctly but need to update the comment)
- packet may have VIRTIO_NET_HDR_F_NEEDS_CSUM, in that case
the spec says "The checksum on the packet is incomplete".
(probably needs to be handled by calculating the checksum).
Jason, as David applied this patch already, can you comment
on the issues please?
> ---
> drivers/net/virtio_net.c | 70 ++++++++++++++++++++++++++++++++++++++++++++----
> 1 file changed, 65 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
> index b3fc01d..5fbd15e 100644
> --- a/drivers/net/virtio_net.c
> +++ b/drivers/net/virtio_net.c
> @@ -57,6 +57,11 @@ DECLARE_EWMA(pkt_len, 0, 64)
>
> #define VIRTNET_DRIVER_VERSION "1.0.0"
>
> +const unsigned long guest_offloads[] = { VIRTIO_NET_F_GUEST_TSO4,
> + VIRTIO_NET_F_GUEST_TSO6,
> + VIRTIO_NET_F_GUEST_ECN,
> + VIRTIO_NET_F_GUEST_UFO };
> +
> struct virtnet_stats {
> struct u64_stats_sync tx_syncp;
> struct u64_stats_sync rx_syncp;
> @@ -164,10 +169,13 @@ struct virtnet_info {
> u8 ctrl_promisc;
> u8 ctrl_allmulti;
> u16 ctrl_vid;
> + u64 ctrl_offloads;
>
> /* Ethtool settings */
> u8 duplex;
> u32 speed;
> +
> + unsigned long guest_offloads;
> };
>
> struct padded_vnet_hdr {
> @@ -1896,6 +1904,47 @@ static int virtnet_restore_up(struct virtio_device *vdev)
> return err;
> }
>
> +static int virtnet_set_guest_offloads(struct virtnet_info *vi, u64 offloads)
> +{
> + struct scatterlist sg;
> + vi->ctrl_offloads = cpu_to_virtio64(vi->vdev, offloads);
> +
> + sg_init_one(&sg, &vi->ctrl_offloads, sizeof(vi->ctrl_offloads));
> +
> + if (!virtnet_send_command(vi, VIRTIO_NET_CTRL_GUEST_OFFLOADS,
> + VIRTIO_NET_CTRL_GUEST_OFFLOADS_SET, &sg)) {
> + dev_warn(&vi->dev->dev, "Fail to set guest offload. \n");
> + return -EINVAL;
> + }
> +
> + return 0;
> +}
> +
> +static int virtnet_clear_guest_offloads(struct virtnet_info *vi)
> +{
> + u64 offloads = 0;
> +
> + if (!vi->guest_offloads)
> + return 0;
> +
> + if (virtio_has_feature(vi->vdev, VIRTIO_NET_F_GUEST_CSUM))
> + offloads = 1ULL << VIRTIO_NET_F_GUEST_CSUM;
> +
> + return virtnet_set_guest_offloads(vi, offloads);
> +}
> +
> +static int virtnet_restore_guest_offloads(struct virtnet_info *vi)
> +{
> + u64 offloads = vi->guest_offloads;
> +
> + if (!vi->guest_offloads)
> + return 0;
> + if (virtio_has_feature(vi->vdev, VIRTIO_NET_F_GUEST_CSUM))
> + offloads |= 1ULL << VIRTIO_NET_F_GUEST_CSUM;
> +
> + return virtnet_set_guest_offloads(vi, offloads);
> +}
> +
> static int virtnet_xdp_set(struct net_device *dev, struct bpf_prog *prog,
> struct netlink_ext_ack *extack)
> {
> @@ -1905,10 +1954,11 @@ static int virtnet_xdp_set(struct net_device *dev, struct bpf_prog *prog,
> u16 xdp_qp = 0, curr_qp;
> int i, err;
>
> - if (virtio_has_feature(vi->vdev, VIRTIO_NET_F_GUEST_TSO4) ||
> - virtio_has_feature(vi->vdev, VIRTIO_NET_F_GUEST_TSO6) ||
> - virtio_has_feature(vi->vdev, VIRTIO_NET_F_GUEST_ECN) ||
> - virtio_has_feature(vi->vdev, VIRTIO_NET_F_GUEST_UFO)) {
> + if (!virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_GUEST_OFFLOADS)
> + && (virtio_has_feature(vi->vdev, VIRTIO_NET_F_GUEST_TSO4) ||
> + virtio_has_feature(vi->vdev, VIRTIO_NET_F_GUEST_TSO6) ||
> + virtio_has_feature(vi->vdev, VIRTIO_NET_F_GUEST_ECN) ||
> + virtio_has_feature(vi->vdev, VIRTIO_NET_F_GUEST_UFO))) {
> NL_SET_ERR_MSG_MOD(extack, "Can't set XDP while host is implementing LRO, disable LRO first");
> return -EOPNOTSUPP;
> }
> @@ -1955,6 +2005,12 @@ static int virtnet_xdp_set(struct net_device *dev, struct bpf_prog *prog,
> for (i = 0; i < vi->max_queue_pairs; i++) {
> old_prog = rtnl_dereference(vi->rq[i].xdp_prog);
> rcu_assign_pointer(vi->rq[i].xdp_prog, prog);
> + if (i == 0) {
> + if (!old_prog)
> + virtnet_clear_guest_offloads(vi);
> + if (!prog)
> + virtnet_restore_guest_offloads(vi);
> + }
> if (old_prog)
> bpf_prog_put(old_prog);
> virtnet_napi_enable(vi->rq[i].vq, &vi->rq[i].napi);
> @@ -2588,6 +2644,10 @@ static int virtnet_probe(struct virtio_device *vdev)
> netif_carrier_on(dev);
> }
>
> + for (i = 0; i < ARRAY_SIZE(guest_offloads); i++)
> + if (virtio_has_feature(vi->vdev, guest_offloads[i]))
> + set_bit(guest_offloads[i], &vi->guest_offloads);
> +
> pr_debug("virtnet: registered device %s with %d RX and TX vq's\n",
> dev->name, max_queue_pairs);
>
> @@ -2684,7 +2744,7 @@ static struct virtio_device_id id_table[] = {
> VIRTIO_NET_F_CTRL_RX, VIRTIO_NET_F_CTRL_VLAN, \
> VIRTIO_NET_F_GUEST_ANNOUNCE, VIRTIO_NET_F_MQ, \
> VIRTIO_NET_F_CTRL_MAC_ADDR, \
> - VIRTIO_NET_F_MTU
> + VIRTIO_NET_F_MTU, VIRTIO_NET_F_CTRL_GUEST_OFFLOADS
>
> static unsigned int features[] = {
> VIRTNET_FEATURES,
> --
> 2.7.4
^ permalink raw reply
* Re: [PATCH net-next 5/5] virtio-net: switch off offloads on demand if possible on XDP set
From: Michael S. Tsirkin @ 2017-07-24 21:36 UTC (permalink / raw)
To: Jason Wang; +Cc: netdev, linux-kernel, virtualization
In-Reply-To: <494ca887-1df7-6f72-0f2d-16a70a141cbc@redhat.com>
On Wed, Jul 19, 2017 at 10:39:53AM +0800, Jason Wang wrote:
>
>
> On 2017年07月19日 04:07, Michael S. Tsirkin wrote:
> > On Mon, Jul 17, 2017 at 08:44:01PM +0800, Jason Wang wrote:
> > > Current XDP implementation want guest offloads feature to be disabled
> > s/want/wants/
> >
> > > on qemu cli.
> > on the device.
> >
> > > This is inconvenient and means guest can't benefit from
> > > offloads if XDP is not used. This patch tries to address this
> > > limitation by disable
> > disabling
> >
> > > the offloads on demand through control guest
> > > offloads. Guest offloads will be disabled and enabled on demand on XDP
> > > set.
> > >
> > > Signed-off-by: Jason Wang <jasowang@redhat.com>
> > In fact, since we no longer reset when XDP is set,
> > here device might have offloads enabled, buffers are
> > used but not consumed, then XDP is set.
> >
> > This can result in
> > - packet scattered across multiple buffers
> > (handled correctly but need to update the comment)
>
> Ok.
>
> > - packet may have VIRTIO_NET_HDR_F_NEEDS_CSUM, in that case
> > the spec says "The checksum on the packet is incomplete".
> > (probably needs to be handled by calculating the checksum).
>
> That's an option. Maybe it's tricky but I was thinking whether or not we can
> just keep the CHECKSUM_PARTIAL here.
XDP programs do not expect this currently. As it's a temporary
condition, let's just fix it up.
> >
> >
> > Ideas for follow-up patches:
> >
> > - skip looking at packet data completely
> > won't work if you play with checksums dynamically
> > but can be done if disabled on device
> > - allow ethtools to tweak offloads from userspace as well
>
> Right.
>
> Thanks
>
> >
> > > ---
> > > drivers/net/virtio_net.c | 70 ++++++++++++++++++++++++++++++++++++++++++++----
> > > 1 file changed, 65 insertions(+), 5 deletions(-)
> > >
> > > diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
> > > index e732bd6..d970c2d 100644
> > > --- a/drivers/net/virtio_net.c
> > > +++ b/drivers/net/virtio_net.c
> > > @@ -57,6 +57,11 @@ DECLARE_EWMA(pkt_len, 0, 64)
> > > #define VIRTNET_DRIVER_VERSION "1.0.0"
> > > +const unsigned long guest_offloads[] = { VIRTIO_NET_F_GUEST_TSO4,
> > > + VIRTIO_NET_F_GUEST_TSO6,
> > > + VIRTIO_NET_F_GUEST_ECN,
> > > + VIRTIO_NET_F_GUEST_UFO };
> > > +
> > > struct virtnet_stats {
> > > struct u64_stats_sync tx_syncp;
> > > struct u64_stats_sync rx_syncp;
> > > @@ -164,10 +169,13 @@ struct virtnet_info {
> > > u8 ctrl_promisc;
> > > u8 ctrl_allmulti;
> > > u16 ctrl_vid;
> > > + u64 ctrl_offloads;
> > > /* Ethtool settings */
> > > u8 duplex;
> > > u32 speed;
> > > +
> > > + unsigned long guest_offloads;
> > > };
> > > struct padded_vnet_hdr {
> > > @@ -1889,6 +1897,47 @@ static int virtnet_restore_up(struct virtio_device *vdev)
> > > return err;
> > > }
> > > +static int virtnet_set_guest_offloads(struct virtnet_info *vi, u64 offloads)
> > > +{
> > > + struct scatterlist sg;
> > > + vi->ctrl_offloads = cpu_to_virtio64(vi->vdev, offloads);
> > > +
> > > + sg_init_one(&sg, &vi->ctrl_offloads, sizeof(vi->ctrl_offloads));
> > > +
> > > + if (!virtnet_send_command(vi, VIRTIO_NET_CTRL_GUEST_OFFLOADS,
> > > + VIRTIO_NET_CTRL_GUEST_OFFLOADS_SET, &sg)) {
> > > + dev_warn(&vi->dev->dev, "Fail to set guest offload. \n");
> > > + return -EINVAL;
> > > + }
> > > +
> > > + return 0;
> > > +}
> > > +
> > > +static int virtnet_clear_guest_offloads(struct virtnet_info *vi)
> > > +{
> > > + u64 offloads = 0;
> > > +
> > > + if (!vi->guest_offloads)
> > > + return 0;
> > > +
> > > + if (virtio_has_feature(vi->vdev, VIRTIO_NET_F_GUEST_CSUM))
> > > + offloads = 1ULL << VIRTIO_NET_F_GUEST_CSUM;
> > > +
> > > + return virtnet_set_guest_offloads(vi, offloads);
> > > +}
> > > +
> > > +static int virtnet_restore_guest_offloads(struct virtnet_info *vi)
> > > +{
> > > + u64 offloads = vi->guest_offloads;
> > > +
> > > + if (!vi->guest_offloads)
> > > + return 0;
> > > + if (virtio_has_feature(vi->vdev, VIRTIO_NET_F_GUEST_CSUM))
> > > + offloads |= 1ULL << VIRTIO_NET_F_GUEST_CSUM;
> > > +
> > > + return virtnet_set_guest_offloads(vi, offloads);
> > > +}
> > > +
> > > static int virtnet_xdp_set(struct net_device *dev, struct bpf_prog *prog,
> > > struct netlink_ext_ack *extack)
> > > {
> > > @@ -1898,10 +1947,11 @@ static int virtnet_xdp_set(struct net_device *dev, struct bpf_prog *prog,
> > > u16 xdp_qp = 0, curr_qp;
> > > int i, err;
> > > - if (virtio_has_feature(vi->vdev, VIRTIO_NET_F_GUEST_TSO4) ||
> > > - virtio_has_feature(vi->vdev, VIRTIO_NET_F_GUEST_TSO6) ||
> > > - virtio_has_feature(vi->vdev, VIRTIO_NET_F_GUEST_ECN) ||
> > > - virtio_has_feature(vi->vdev, VIRTIO_NET_F_GUEST_UFO)) {
> > > + if (!virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_GUEST_OFFLOADS)
> > > + && (virtio_has_feature(vi->vdev, VIRTIO_NET_F_GUEST_TSO4) ||
> > > + virtio_has_feature(vi->vdev, VIRTIO_NET_F_GUEST_TSO6) ||
> > > + virtio_has_feature(vi->vdev, VIRTIO_NET_F_GUEST_ECN) ||
> > > + virtio_has_feature(vi->vdev, VIRTIO_NET_F_GUEST_UFO))) {
> > > NL_SET_ERR_MSG_MOD(extack, "Can't set XDP while host is implementing LRO, disable LRO first");
> > > return -EOPNOTSUPP;
> > > }
> > > @@ -1950,6 +2000,12 @@ static int virtnet_xdp_set(struct net_device *dev, struct bpf_prog *prog,
> > > for (i = 0; i < vi->max_queue_pairs; i++) {
> > > old_prog = rtnl_dereference(vi->rq[i].xdp_prog);
> > > rcu_assign_pointer(vi->rq[i].xdp_prog, prog);
> > > + if (i == 0) {
> > > + if (!old_prog)
> > > + virtnet_clear_guest_offloads(vi);
> > > + if (!prog)
> > > + virtnet_restore_guest_offloads(vi);
> > > + }
> > > if (old_prog)
> > > bpf_prog_put(old_prog);
> > > napi_enable(&vi->rq[i].napi);
> > > @@ -2583,6 +2639,10 @@ static int virtnet_probe(struct virtio_device *vdev)
> > > netif_carrier_on(dev);
> > > }
> > > + for (i = 0; i < ARRAY_SIZE(guest_offloads); i++)
> > > + if (virtio_has_feature(vi->vdev, guest_offloads[i]))
> > > + set_bit(guest_offloads[i], &vi->guest_offloads);
> > > +
> > > pr_debug("virtnet: registered device %s with %d RX and TX vq's\n",
> > > dev->name, max_queue_pairs);
> > > @@ -2679,7 +2739,7 @@ static struct virtio_device_id id_table[] = {
> > > VIRTIO_NET_F_CTRL_RX, VIRTIO_NET_F_CTRL_VLAN, \
> > > VIRTIO_NET_F_GUEST_ANNOUNCE, VIRTIO_NET_F_MQ, \
> > > VIRTIO_NET_F_CTRL_MAC_ADDR, \
> > > - VIRTIO_NET_F_MTU
> > > + VIRTIO_NET_F_MTU, VIRTIO_NET_F_CTRL_GUEST_OFFLOADS
> > > static unsigned int features[] = {
> > > VIRTNET_FEATURES,
> > > --
> > > 2.7.4
_______________________________________________
Virtualization mailing list
Virtualization@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
^ permalink raw reply
* Re: [PATCH net-next V2 5/5] virtio-net: switch off offloads on demand if possible on XDP set
From: Michael S. Tsirkin @ 2017-07-24 21:40 UTC (permalink / raw)
To: Jason Wang; +Cc: netdev, linux-kernel, virtualization
In-Reply-To: <1500454489-16805-6-git-send-email-jasowang@redhat.com>
On Wed, Jul 19, 2017 at 04:54:49PM +0800, Jason Wang wrote:
> Current XDP implementation wants guest offloads feature to be disabled
> on device. This is inconvenient and means guest can't benefit from
> offloads if XDP is not used. This patch tries to address this
> limitation by disabling the offloads on demand through control guest
> offloads. Guest offloads will be disabled and enabled on demand on XDP
> set.
>
> Signed-off-by: Jason Wang <jasowang@redhat.com>
Also looks like the comment from patch 4 needs to be extended
to cover LRO as cause of temporary packet scatter.
> ---
> drivers/net/virtio_net.c | 70 ++++++++++++++++++++++++++++++++++++++++++++----
> 1 file changed, 65 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
> index b3fc01d..5fbd15e 100644
> --- a/drivers/net/virtio_net.c
> +++ b/drivers/net/virtio_net.c
> @@ -57,6 +57,11 @@ DECLARE_EWMA(pkt_len, 0, 64)
>
> #define VIRTNET_DRIVER_VERSION "1.0.0"
>
> +const unsigned long guest_offloads[] = { VIRTIO_NET_F_GUEST_TSO4,
> + VIRTIO_NET_F_GUEST_TSO6,
> + VIRTIO_NET_F_GUEST_ECN,
> + VIRTIO_NET_F_GUEST_UFO };
> +
> struct virtnet_stats {
> struct u64_stats_sync tx_syncp;
> struct u64_stats_sync rx_syncp;
> @@ -164,10 +169,13 @@ struct virtnet_info {
> u8 ctrl_promisc;
> u8 ctrl_allmulti;
> u16 ctrl_vid;
> + u64 ctrl_offloads;
>
> /* Ethtool settings */
> u8 duplex;
> u32 speed;
> +
> + unsigned long guest_offloads;
> };
>
> struct padded_vnet_hdr {
> @@ -1896,6 +1904,47 @@ static int virtnet_restore_up(struct virtio_device *vdev)
> return err;
> }
>
> +static int virtnet_set_guest_offloads(struct virtnet_info *vi, u64 offloads)
> +{
> + struct scatterlist sg;
> + vi->ctrl_offloads = cpu_to_virtio64(vi->vdev, offloads);
> +
> + sg_init_one(&sg, &vi->ctrl_offloads, sizeof(vi->ctrl_offloads));
> +
> + if (!virtnet_send_command(vi, VIRTIO_NET_CTRL_GUEST_OFFLOADS,
> + VIRTIO_NET_CTRL_GUEST_OFFLOADS_SET, &sg)) {
> + dev_warn(&vi->dev->dev, "Fail to set guest offload. \n");
> + return -EINVAL;
> + }
> +
> + return 0;
> +}
> +
> +static int virtnet_clear_guest_offloads(struct virtnet_info *vi)
> +{
> + u64 offloads = 0;
> +
> + if (!vi->guest_offloads)
> + return 0;
> +
> + if (virtio_has_feature(vi->vdev, VIRTIO_NET_F_GUEST_CSUM))
> + offloads = 1ULL << VIRTIO_NET_F_GUEST_CSUM;
> +
> + return virtnet_set_guest_offloads(vi, offloads);
> +}
> +
> +static int virtnet_restore_guest_offloads(struct virtnet_info *vi)
> +{
> + u64 offloads = vi->guest_offloads;
> +
> + if (!vi->guest_offloads)
> + return 0;
> + if (virtio_has_feature(vi->vdev, VIRTIO_NET_F_GUEST_CSUM))
> + offloads |= 1ULL << VIRTIO_NET_F_GUEST_CSUM;
> +
> + return virtnet_set_guest_offloads(vi, offloads);
> +}
> +
> static int virtnet_xdp_set(struct net_device *dev, struct bpf_prog *prog,
> struct netlink_ext_ack *extack)
> {
> @@ -1905,10 +1954,11 @@ static int virtnet_xdp_set(struct net_device *dev, struct bpf_prog *prog,
> u16 xdp_qp = 0, curr_qp;
> int i, err;
>
> - if (virtio_has_feature(vi->vdev, VIRTIO_NET_F_GUEST_TSO4) ||
> - virtio_has_feature(vi->vdev, VIRTIO_NET_F_GUEST_TSO6) ||
> - virtio_has_feature(vi->vdev, VIRTIO_NET_F_GUEST_ECN) ||
> - virtio_has_feature(vi->vdev, VIRTIO_NET_F_GUEST_UFO)) {
> + if (!virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_GUEST_OFFLOADS)
> + && (virtio_has_feature(vi->vdev, VIRTIO_NET_F_GUEST_TSO4) ||
> + virtio_has_feature(vi->vdev, VIRTIO_NET_F_GUEST_TSO6) ||
> + virtio_has_feature(vi->vdev, VIRTIO_NET_F_GUEST_ECN) ||
> + virtio_has_feature(vi->vdev, VIRTIO_NET_F_GUEST_UFO))) {
> NL_SET_ERR_MSG_MOD(extack, "Can't set XDP while host is implementing LRO, disable LRO first");
> return -EOPNOTSUPP;
> }
> @@ -1955,6 +2005,12 @@ static int virtnet_xdp_set(struct net_device *dev, struct bpf_prog *prog,
> for (i = 0; i < vi->max_queue_pairs; i++) {
> old_prog = rtnl_dereference(vi->rq[i].xdp_prog);
> rcu_assign_pointer(vi->rq[i].xdp_prog, prog);
> + if (i == 0) {
> + if (!old_prog)
> + virtnet_clear_guest_offloads(vi);
> + if (!prog)
> + virtnet_restore_guest_offloads(vi);
> + }
> if (old_prog)
> bpf_prog_put(old_prog);
> virtnet_napi_enable(vi->rq[i].vq, &vi->rq[i].napi);
> @@ -2588,6 +2644,10 @@ static int virtnet_probe(struct virtio_device *vdev)
> netif_carrier_on(dev);
> }
>
> + for (i = 0; i < ARRAY_SIZE(guest_offloads); i++)
> + if (virtio_has_feature(vi->vdev, guest_offloads[i]))
> + set_bit(guest_offloads[i], &vi->guest_offloads);
> +
> pr_debug("virtnet: registered device %s with %d RX and TX vq's\n",
> dev->name, max_queue_pairs);
>
> @@ -2684,7 +2744,7 @@ static struct virtio_device_id id_table[] = {
> VIRTIO_NET_F_CTRL_RX, VIRTIO_NET_F_CTRL_VLAN, \
> VIRTIO_NET_F_GUEST_ANNOUNCE, VIRTIO_NET_F_MQ, \
> VIRTIO_NET_F_CTRL_MAC_ADDR, \
> - VIRTIO_NET_F_MTU
> + VIRTIO_NET_F_MTU, VIRTIO_NET_F_CTRL_GUEST_OFFLOADS
>
> static unsigned int features[] = {
> VIRTNET_FEATURES,
> --
> 2.7.4
^ permalink raw reply
* Re: [PATCH net-next V2 0/5] Refine virtio-net XDP
From: Michael S. Tsirkin @ 2017-07-24 21:41 UTC (permalink / raw)
To: David Miller; +Cc: netdev, linux-kernel, virtualization
In-Reply-To: <20170724.133859.192337723544942743.davem@davemloft.net>
On Mon, Jul 24, 2017 at 01:38:59PM -0700, David Miller wrote:
> From: Jason Wang <jasowang@redhat.com>
> Date: Wed, 19 Jul 2017 16:54:44 +0800
>
> > Hi:
> >
> > This series brings two optimizations for virtio-net XDP:
> >
> > - avoid reset during XDP set
> > - turn off offloads on demand
> >
> > Changes from V1:
> > - Various tweaks on commit logs and comments
> > - Use virtnet_napi_enable() when enabling NAPI on XDP set
> > - Copy the small buffer packet only if xdp_headroom is smaller than
> > required
> >
> > Please review.
>
> Series applied, thanks Jason.
>
> Michael, I gave you 4+ days to properly review this respin of this
> series. I felt that was more than sufficient time, even with an
> intervening weekend. So if you don't like that I applied this without
> your review, please be more punctual in the future.
>
> Thank you.
My bad - reviewed when I was offline and forgot to send it out.
By luck this is not a big deal:
- Patches 1-4 are good.
- Patch 5 has some problems IMO, but all it does
is try to enable a previously non-working configuration, so
it seems ok to fix it up with follow-up patches as appropriate.
--
MST
^ permalink raw reply
* [PATCH 7/8] drm: Nuke drm_atomic_helper_connector_dpms
From: Daniel Vetter @ 2017-07-25 8:01 UTC (permalink / raw)
To: Intel Graphics Development
Cc: Martyn Welch, Neil Armstrong, David Airlie, Daniel Vetter,
DRI Development, virtualization, Andrzej Hajda, Tomi Valkeinen,
linux-mediatek, Laurent Pinchart, Benjamin Gaignard,
Romain Perier, Daniel Vetter, nouveau, Jyri Sarha, Heiko Stuebner,
Marek Vasut, linux-renesas-soc, Archit Taneja, Lars-Peter Clausen,
Joonyoung Shim, Kevin Hilman, Alexey
In-Reply-To: <20170725080122.20548-1-daniel.vetter@ffwll.ch>
It's dead code, the core handles all this directly now.
The only special case is nouveau and tda988x which used one function
for both legacy modeset code and -nv50 atomic world instead of 2
vtables. But amounts to exactly the same.
v2: Rebase over the panel/brideg refactorings in stm/ltdc.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Cc: Archit Taneja <architt@codeaurora.org>
Cc: Andrzej Hajda <a.hajda@samsung.com>
Cc: Laurent Pinchart <Laurent.pinchart@ideasonboard.com>
Cc: Peter Senna Tschudin <peter.senna@collabora.com>
Cc: Martin Donnelly <martin.donnelly@ge.com>
Cc: Martyn Welch <martyn.welch@collabora.co.uk>
Cc: Daniel Vetter <daniel.vetter@intel.com>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Sean Paul <seanpaul@chromium.org>
Cc: David Airlie <airlied@linux.ie>
Cc: Inki Dae <inki.dae@samsung.com>
Cc: Joonyoung Shim <jy0922.shim@samsung.com>
Cc: Seung-Woo Kim <sw0312.kim@samsung.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Kukjin Kim <kgene@kernel.org>
Cc: Krzysztof Kozlowski <krzk@kernel.org>
Cc: Stefan Agner <stefan@agner.ch>
Cc: Alison Wang <alison.wang@freescale.com>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Cc: CK Hu <ck.hu@mediatek.com>
Cc: Matthias Brugger <matthias.bgg@gmail.com>
Cc: Neil Armstrong <narmstrong@baylibre.com>
Cc: Carlo Caione <carlo@caione.org>
Cc: Kevin Hilman <khilman@baylibre.com>
Cc: Marek Vasut <marex@denx.de>
Cc: Ben Skeggs <bskeggs@redhat.com>
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: Eric Anholt <eric@anholt.net>
Cc: Mark Yao <mark.yao@rock-chips.com>
Cc: Heiko Stuebner <heiko@sntech.de>
Cc: Benjamin Gaignard <benjamin.gaignard@linaro.org>
Cc: Vincent Abriou <vincent.abriou@st.com>
Cc: Yannick Fertre <yannick.fertre@st.com>
Cc: Philippe Cornu <philippe.cornu@st.com>
Cc: Maxime Ripard <maxime.ripard@free-electrons.com>
Cc: Chen-Yu Tsai <wens@csie.org>
Cc: Thierry Reding <thierry.reding@gmail.com>
Cc: Jonathan Hunter <jonathanh@nvidia.com>
Cc: Jyri Sarha <jsarha@ti.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Shawn Guo <shawnguo@kernel.org>
Cc: John Stultz <john.stultz@linaro.org>
Cc: Lars-Peter Clausen <lars@metafoo.de>
Cc: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Cc: Jeffy Chen <jeffy.chen@rock-chips.com>
Cc: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Cc: Yakir Yang <kuankuan.y@gmail.com>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>
Cc: Jose Abreu <Jose.Abreu@synopsys.com>
Cc: Romain Perier <romain.perier@collabora.com>
Cc: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Cc: Xinliang Liu <z.liuxinliang@hisilicon.com>
Cc: Alexey Brodkin <abrodkin@synopsys.com>
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: Rongrong Zou <zourongrong@gmail.com>
Cc: Rob Clark <robdclark@gmail.com>
Cc: Hai Li <hali@codeaurora.org>
Cc: "Noralf Trønnes" <noralf@tronnes.org>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-samsung-soc@vger.kernel.org
Cc: intel-gfx@lists.freedesktop.org
Cc: linux-mediatek@lists.infradead.org
Cc: linux-amlogic@lists.infradead.org
Cc: nouveau@lists.freedesktop.org
Cc: linux-renesas-soc@vger.kernel.org
Cc: linux-rockchip@lists.infradead.org
Cc: linux-tegra@vger.kernel.org
Cc: virtualization@lists.linux-foundation.org
Cc: zain wang <wzz@rock-chips.com>
Cc: Baoyou Xie <baoyou.xie@linaro.org>
Cc: Boris Brezillon <boris.brezillon@free-electrons.com>
---
drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 1 -
drivers/gpu/drm/bridge/analogix-anx78xx.c | 1 -
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 1 -
drivers/gpu/drm/bridge/dumb-vga-dac.c | 1 -
.../drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c | 1 -
drivers/gpu/drm/bridge/nxp-ptn3460.c | 1 -
drivers/gpu/drm/bridge/panel.c | 1 -
drivers/gpu/drm/bridge/parade-ps8622.c | 1 -
drivers/gpu/drm/bridge/sii902x.c | 1 -
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 1 -
drivers/gpu/drm/bridge/tc358767.c | 1 -
drivers/gpu/drm/bridge/ti-tfp410.c | 1 -
drivers/gpu/drm/drm_atomic_helper.c | 79 ----------------------
drivers/gpu/drm/exynos/exynos_drm_dpi.c | 1 -
drivers/gpu/drm/exynos/exynos_drm_dsi.c | 1 -
drivers/gpu/drm/exynos/exynos_drm_vidi.c | 1 -
drivers/gpu/drm/exynos/exynos_hdmi.c | 1 -
drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c | 1 -
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c | 1 -
drivers/gpu/drm/i2c/tda998x_drv.c | 10 +--
drivers/gpu/drm/i915/intel_crt.c | 1 -
drivers/gpu/drm/i915/intel_dp.c | 1 -
drivers/gpu/drm/i915/intel_dp_mst.c | 1 -
drivers/gpu/drm/i915/intel_dsi.c | 1 -
drivers/gpu/drm/i915/intel_dvo.c | 1 -
drivers/gpu/drm/i915/intel_hdmi.c | 1 -
drivers/gpu/drm/i915/intel_lvds.c | 1 -
drivers/gpu/drm/i915/intel_sdvo.c | 1 -
drivers/gpu/drm/i915/intel_tv.c | 1 -
drivers/gpu/drm/imx/imx-ldb.c | 1 -
drivers/gpu/drm/imx/imx-tve.c | 1 -
drivers/gpu/drm/imx/parallel-display.c | 1 -
drivers/gpu/drm/mediatek/mtk_dsi.c | 1 -
drivers/gpu/drm/mediatek/mtk_hdmi.c | 1 -
drivers/gpu/drm/meson/meson_venc_cvbs.c | 1 -
drivers/gpu/drm/msm/dsi/dsi_manager.c | 1 -
drivers/gpu/drm/msm/edp/edp_connector.c | 1 -
drivers/gpu/drm/msm/hdmi/hdmi_connector.c | 1 -
drivers/gpu/drm/msm/mdp/mdp4/mdp4_lvds_connector.c | 1 -
drivers/gpu/drm/mxsfb/mxsfb_out.c | 1 -
drivers/gpu/drm/nouveau/nouveau_connector.c | 12 +---
drivers/gpu/drm/nouveau/nv50_display.c | 1 -
drivers/gpu/drm/omapdrm/omap_connector.c | 1 -
drivers/gpu/drm/pl111/pl111_connector.c | 1 -
drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c | 1 -
drivers/gpu/drm/rockchip/cdn-dp-core.c | 1 -
drivers/gpu/drm/rockchip/dw-mipi-dsi.c | 1 -
drivers/gpu/drm/rockchip/inno_hdmi.c | 1 -
drivers/gpu/drm/sti/sti_dvo.c | 1 -
drivers/gpu/drm/sti/sti_hda.c | 1 -
drivers/gpu/drm/sti/sti_hdmi.c | 1 -
drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 1 -
drivers/gpu/drm/sun4i/sun4i_rgb.c | 1 -
drivers/gpu/drm/sun4i/sun4i_tv.c | 1 -
drivers/gpu/drm/tegra/dsi.c | 1 -
drivers/gpu/drm/tegra/hdmi.c | 1 -
drivers/gpu/drm/tegra/rgb.c | 1 -
drivers/gpu/drm/tegra/sor.c | 1 -
drivers/gpu/drm/tilcdc/tilcdc_panel.c | 1 -
drivers/gpu/drm/tilcdc/tilcdc_tfp410.c | 1 -
drivers/gpu/drm/tinydrm/core/tinydrm-pipe.c | 1 -
drivers/gpu/drm/vc4/vc4_hdmi.c | 1 -
drivers/gpu/drm/vc4/vc4_vec.c | 1 -
drivers/gpu/drm/virtio/virtgpu_display.c | 1 -
drivers/gpu/drm/zte/zx_hdmi.c | 1 -
drivers/gpu/drm/zte/zx_tvenc.c | 1 -
drivers/gpu/drm/zte/zx_vga.c | 1 -
include/drm/drm_atomic_helper.h | 2 -
68 files changed, 3 insertions(+), 164 deletions(-)
diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
index ff9792d350c8..682c090fa3ed 100644
--- a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
+++ b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
@@ -786,7 +786,6 @@ adv7511_connector_detect(struct drm_connector *connector, bool force)
}
static struct drm_connector_funcs adv7511_connector_funcs = {
- .dpms = drm_atomic_helper_connector_dpms,
.fill_modes = drm_helper_probe_single_connector_modes,
.detect = adv7511_connector_detect,
.destroy = drm_connector_cleanup,
diff --git a/drivers/gpu/drm/bridge/analogix-anx78xx.c b/drivers/gpu/drm/bridge/analogix-anx78xx.c
index dc045e0c32fc..9385eb0b1ee4 100644
--- a/drivers/gpu/drm/bridge/analogix-anx78xx.c
+++ b/drivers/gpu/drm/bridge/analogix-anx78xx.c
@@ -1002,7 +1002,6 @@ static enum drm_connector_status anx78xx_detect(struct drm_connector *connector,
}
static const struct drm_connector_funcs anx78xx_connector_funcs = {
- .dpms = drm_atomic_helper_connector_dpms,
.fill_modes = drm_helper_probe_single_connector_modes,
.detect = anx78xx_detect,
.destroy = drm_connector_cleanup,
diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
index 4c758ed51939..5dd3f1cd074a 100644
--- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
+++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
@@ -1005,7 +1005,6 @@ analogix_dp_detect(struct drm_connector *connector, bool force)
}
static const struct drm_connector_funcs analogix_dp_connector_funcs = {
- .dpms = drm_atomic_helper_connector_dpms,
.fill_modes = drm_helper_probe_single_connector_modes,
.detect = analogix_dp_detect,
.destroy = drm_connector_cleanup,
diff --git a/drivers/gpu/drm/bridge/dumb-vga-dac.c b/drivers/gpu/drm/bridge/dumb-vga-dac.c
index 8a52539e618e..de5e7dee7ad6 100644
--- a/drivers/gpu/drm/bridge/dumb-vga-dac.c
+++ b/drivers/gpu/drm/bridge/dumb-vga-dac.c
@@ -92,7 +92,6 @@ dumb_vga_connector_detect(struct drm_connector *connector, bool force)
}
static const struct drm_connector_funcs dumb_vga_con_funcs = {
- .dpms = drm_atomic_helper_connector_dpms,
.detect = dumb_vga_connector_detect,
.fill_modes = drm_helper_probe_single_connector_modes,
.destroy = drm_connector_cleanup,
diff --git a/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c b/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c
index 11f11086a68f..7ccadba7c98c 100644
--- a/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c
+++ b/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c
@@ -193,7 +193,6 @@ static enum drm_connector_status ge_b850v3_lvds_detect(
}
static const struct drm_connector_funcs ge_b850v3_lvds_connector_funcs = {
- .dpms = drm_atomic_helper_connector_dpms,
.fill_modes = drm_helper_probe_single_connector_modes,
.detect = ge_b850v3_lvds_detect,
.destroy = drm_connector_cleanup,
diff --git a/drivers/gpu/drm/bridge/nxp-ptn3460.c b/drivers/gpu/drm/bridge/nxp-ptn3460.c
index f0b5d0fc8594..d64a3283822a 100644
--- a/drivers/gpu/drm/bridge/nxp-ptn3460.c
+++ b/drivers/gpu/drm/bridge/nxp-ptn3460.c
@@ -238,7 +238,6 @@ static const struct drm_connector_helper_funcs ptn3460_connector_helper_funcs =
};
static const struct drm_connector_funcs ptn3460_connector_funcs = {
- .dpms = drm_atomic_helper_connector_dpms,
.fill_modes = drm_helper_probe_single_connector_modes,
.destroy = drm_connector_cleanup,
.reset = drm_atomic_helper_connector_reset,
diff --git a/drivers/gpu/drm/bridge/panel.c b/drivers/gpu/drm/bridge/panel.c
index 685c1a480201..59288b248dc5 100644
--- a/drivers/gpu/drm/bridge/panel.c
+++ b/drivers/gpu/drm/bridge/panel.c
@@ -50,7 +50,6 @@ panel_bridge_connector_helper_funcs = {
};
static const struct drm_connector_funcs panel_bridge_connector_funcs = {
- .dpms = drm_atomic_helper_connector_dpms,
.reset = drm_atomic_helper_connector_reset,
.fill_modes = drm_helper_probe_single_connector_modes,
.destroy = drm_connector_cleanup,
diff --git a/drivers/gpu/drm/bridge/parade-ps8622.c b/drivers/gpu/drm/bridge/parade-ps8622.c
index 4f7725d4a309..81198f5e9afa 100644
--- a/drivers/gpu/drm/bridge/parade-ps8622.c
+++ b/drivers/gpu/drm/bridge/parade-ps8622.c
@@ -476,7 +476,6 @@ static const struct drm_connector_helper_funcs ps8622_connector_helper_funcs = {
};
static const struct drm_connector_funcs ps8622_connector_funcs = {
- .dpms = drm_atomic_helper_connector_dpms,
.fill_modes = drm_helper_probe_single_connector_modes,
.destroy = drm_connector_cleanup,
.reset = drm_atomic_helper_connector_reset,
diff --git a/drivers/gpu/drm/bridge/sii902x.c b/drivers/gpu/drm/bridge/sii902x.c
index 9efb7b8fad57..b1ab4ab09532 100644
--- a/drivers/gpu/drm/bridge/sii902x.c
+++ b/drivers/gpu/drm/bridge/sii902x.c
@@ -124,7 +124,6 @@ sii902x_connector_detect(struct drm_connector *connector, bool force)
}
static const struct drm_connector_funcs sii902x_connector_funcs = {
- .dpms = drm_atomic_helper_connector_dpms,
.detect = sii902x_connector_detect,
.fill_modes = drm_helper_probe_single_connector_modes,
.destroy = drm_connector_cleanup,
diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
index 60faf2d2bc6b..91ac849604a8 100644
--- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
+++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
@@ -1920,7 +1920,6 @@ static void dw_hdmi_connector_force(struct drm_connector *connector)
}
static const struct drm_connector_funcs dw_hdmi_connector_funcs = {
- .dpms = drm_atomic_helper_connector_dpms,
.fill_modes = drm_helper_probe_single_connector_modes,
.detect = dw_hdmi_connector_detect,
.destroy = drm_connector_cleanup,
diff --git a/drivers/gpu/drm/bridge/tc358767.c b/drivers/gpu/drm/bridge/tc358767.c
index 12a35f9c3adc..503252d6a74d 100644
--- a/drivers/gpu/drm/bridge/tc358767.c
+++ b/drivers/gpu/drm/bridge/tc358767.c
@@ -1160,7 +1160,6 @@ static const struct drm_connector_helper_funcs tc_connector_helper_funcs = {
};
static const struct drm_connector_funcs tc_connector_funcs = {
- .dpms = drm_atomic_helper_connector_dpms,
.fill_modes = drm_helper_probe_single_connector_modes,
.destroy = drm_connector_cleanup,
.reset = drm_atomic_helper_connector_reset,
diff --git a/drivers/gpu/drm/bridge/ti-tfp410.c b/drivers/gpu/drm/bridge/ti-tfp410.c
index 7ea2a15e8807..acb857030951 100644
--- a/drivers/gpu/drm/bridge/ti-tfp410.c
+++ b/drivers/gpu/drm/bridge/ti-tfp410.c
@@ -102,7 +102,6 @@ tfp410_connector_detect(struct drm_connector *connector, bool force)
}
static const struct drm_connector_funcs tfp410_con_funcs = {
- .dpms = drm_atomic_helper_connector_dpms,
.detect = tfp410_connector_detect,
.fill_modes = drm_helper_probe_single_connector_modes,
.destroy = drm_connector_cleanup,
diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c
index 1ca0dcca6230..877733ae44ac 100644
--- a/drivers/gpu/drm/drm_atomic_helper.c
+++ b/drivers/gpu/drm/drm_atomic_helper.c
@@ -3102,85 +3102,6 @@ int drm_atomic_helper_page_flip_target(struct drm_crtc *crtc,
EXPORT_SYMBOL(drm_atomic_helper_page_flip_target);
/**
- * drm_atomic_helper_connector_dpms() - connector dpms helper implementation
- * @connector: affected connector
- * @mode: DPMS mode
- *
- * This is the main helper function provided by the atomic helper framework for
- * implementing the legacy DPMS connector interface. It computes the new desired
- * &drm_crtc_state.active state for the corresponding CRTC (if the connector is
- * enabled) and updates it.
- *
- * Returns:
- * Returns 0 on success, negative errno numbers on failure.
- */
-int drm_atomic_helper_connector_dpms(struct drm_connector *connector,
- int mode)
-{
- struct drm_mode_config *config = &connector->dev->mode_config;
- struct drm_atomic_state *state;
- struct drm_crtc_state *crtc_state;
- struct drm_crtc *crtc;
- struct drm_connector *tmp_connector;
- struct drm_connector_list_iter conn_iter;
- int ret;
- bool active = false;
- int old_mode = connector->dpms;
-
- if (mode != DRM_MODE_DPMS_ON)
- mode = DRM_MODE_DPMS_OFF;
-
- connector->dpms = mode;
- crtc = connector->state->crtc;
-
- if (!crtc)
- return 0;
-
- state = drm_atomic_state_alloc(connector->dev);
- if (!state)
- return -ENOMEM;
-
- state->acquire_ctx = crtc->dev->mode_config.acquire_ctx;
-retry:
- crtc_state = drm_atomic_get_crtc_state(state, crtc);
- if (IS_ERR(crtc_state)) {
- ret = PTR_ERR(crtc_state);
- goto fail;
- }
-
- WARN_ON(!drm_modeset_is_locked(&config->connection_mutex));
-
- drm_connector_list_iter_begin(connector->dev, &conn_iter);
- drm_for_each_connector_iter(tmp_connector, &conn_iter) {
- if (tmp_connector->state->crtc != crtc)
- continue;
-
- if (tmp_connector->dpms == DRM_MODE_DPMS_ON) {
- active = true;
- break;
- }
- }
- drm_connector_list_iter_end(&conn_iter);
- crtc_state->active = active;
-
- ret = drm_atomic_commit(state);
-fail:
- if (ret == -EDEADLK)
- goto backoff;
- if (ret != 0)
- connector->dpms = old_mode;
- drm_atomic_state_put(state);
- return ret;
-
-backoff:
- drm_atomic_state_clear(state);
- drm_atomic_legacy_backoff(state);
-
- goto retry;
-}
-EXPORT_SYMBOL(drm_atomic_helper_connector_dpms);
-
-/**
* drm_atomic_helper_best_encoder - Helper for
* &drm_connector_helper_funcs.best_encoder callback
* @connector: Connector control structure
diff --git a/drivers/gpu/drm/exynos/exynos_drm_dpi.c b/drivers/gpu/drm/exynos/exynos_drm_dpi.c
index 63abcd280fa0..76d80e5de521 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_dpi.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_dpi.c
@@ -59,7 +59,6 @@ static void exynos_dpi_connector_destroy(struct drm_connector *connector)
}
static const struct drm_connector_funcs exynos_dpi_connector_funcs = {
- .dpms = drm_atomic_helper_connector_dpms,
.detect = exynos_dpi_detect,
.fill_modes = drm_helper_probe_single_connector_modes,
.destroy = exynos_dpi_connector_destroy,
diff --git a/drivers/gpu/drm/exynos/exynos_drm_dsi.c b/drivers/gpu/drm/exynos/exynos_drm_dsi.c
index f580be170089..4ea7cc7cb3de 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_dsi.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_dsi.c
@@ -1537,7 +1537,6 @@ static void exynos_dsi_connector_destroy(struct drm_connector *connector)
}
static const struct drm_connector_funcs exynos_dsi_connector_funcs = {
- .dpms = drm_atomic_helper_connector_dpms,
.detect = exynos_dsi_detect,
.fill_modes = drm_helper_probe_single_connector_modes,
.destroy = exynos_dsi_connector_destroy,
diff --git a/drivers/gpu/drm/exynos/exynos_drm_vidi.c b/drivers/gpu/drm/exynos/exynos_drm_vidi.c
index cb8a72842537..9186a654c3b5 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_vidi.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_vidi.c
@@ -289,7 +289,6 @@ static void vidi_connector_destroy(struct drm_connector *connector)
}
static const struct drm_connector_funcs vidi_connector_funcs = {
- .dpms = drm_atomic_helper_connector_dpms,
.fill_modes = drm_helper_probe_single_connector_modes,
.detect = vidi_detect,
.destroy = vidi_connector_destroy,
diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c
index c953927fb0cb..0e2a472c3021 100644
--- a/drivers/gpu/drm/exynos/exynos_hdmi.c
+++ b/drivers/gpu/drm/exynos/exynos_hdmi.c
@@ -835,7 +835,6 @@ static void hdmi_connector_destroy(struct drm_connector *connector)
}
static const struct drm_connector_funcs hdmi_connector_funcs = {
- .dpms = drm_atomic_helper_connector_dpms,
.fill_modes = drm_helper_probe_single_connector_modes,
.detect = hdmi_detect,
.destroy = hdmi_connector_destroy,
diff --git a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c
index dcbf3c06e1d8..edd7d8127d19 100644
--- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c
+++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c
@@ -63,7 +63,6 @@ static const struct drm_connector_funcs fsl_dcu_drm_connector_funcs = {
.atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
.destroy = fsl_dcu_drm_connector_destroy,
- .dpms = drm_atomic_helper_connector_dpms,
.fill_modes = drm_helper_probe_single_connector_modes,
.reset = drm_atomic_helper_connector_reset,
};
diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c
index 12a18557c5fd..ec4dd9df9150 100644
--- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c
+++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c
@@ -47,7 +47,6 @@ static const struct drm_connector_helper_funcs
};
static const struct drm_connector_funcs hibmc_connector_funcs = {
- .dpms = drm_atomic_helper_connector_dpms,
.fill_modes = drm_helper_probe_single_connector_modes,
.destroy = drm_connector_cleanup,
.reset = drm_atomic_helper_connector_reset,
diff --git a/drivers/gpu/drm/i2c/tda998x_drv.c b/drivers/gpu/drm/i2c/tda998x_drv.c
index d1e7ac540199..54e3255dde13 100644
--- a/drivers/gpu/drm/i2c/tda998x_drv.c
+++ b/drivers/gpu/drm/i2c/tda998x_drv.c
@@ -969,14 +969,6 @@ static int tda998x_audio_codec_init(struct tda998x_priv *priv,
/* DRM connector functions */
-static int tda998x_connector_dpms(struct drm_connector *connector, int mode)
-{
- if (drm_core_check_feature(connector->dev, DRIVER_ATOMIC))
- return drm_atomic_helper_connector_dpms(connector, mode);
- else
- return drm_helper_connector_dpms(connector, mode);
-}
-
static int tda998x_connector_fill_modes(struct drm_connector *connector,
uint32_t maxX, uint32_t maxY)
{
@@ -1014,7 +1006,7 @@ static void tda998x_connector_destroy(struct drm_connector *connector)
}
static const struct drm_connector_funcs tda998x_connector_funcs = {
- .dpms = tda998x_connector_dpms,
+ .dpms = drm_helper_connector_dpms,
.reset = drm_atomic_helper_connector_reset,
.fill_modes = tda998x_connector_fill_modes,
.detect = tda998x_connector_detect,
diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c
index 84c3a6dc7c2a..70e0ff41070c 100644
--- a/drivers/gpu/drm/i915/intel_crt.c
+++ b/drivers/gpu/drm/i915/intel_crt.c
@@ -802,7 +802,6 @@ void intel_crt_reset(struct drm_encoder *encoder)
*/
static const struct drm_connector_funcs intel_crt_connector_funcs = {
- .dpms = drm_atomic_helper_connector_dpms,
.fill_modes = drm_helper_probe_single_connector_modes,
.late_register = intel_connector_register,
.early_unregister = intel_connector_unregister,
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 19b082ea57ef..76c8a0bd17f9 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -5007,7 +5007,6 @@ void intel_dp_encoder_reset(struct drm_encoder *encoder)
}
static const struct drm_connector_funcs intel_dp_connector_funcs = {
- .dpms = drm_atomic_helper_connector_dpms,
.force = intel_dp_force,
.fill_modes = drm_helper_probe_single_connector_modes,
.atomic_get_property = intel_digital_connector_atomic_get_property,
diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c b/drivers/gpu/drm/i915/intel_dp_mst.c
index 59a6dfd48ed4..58568559711a 100644
--- a/drivers/gpu/drm/i915/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/intel_dp_mst.c
@@ -346,7 +346,6 @@ intel_dp_mst_connector_destroy(struct drm_connector *connector)
}
static const struct drm_connector_funcs intel_dp_mst_connector_funcs = {
- .dpms = drm_atomic_helper_connector_dpms,
.detect = intel_dp_mst_detect,
.fill_modes = drm_helper_probe_single_connector_modes,
.late_register = intel_connector_register,
diff --git a/drivers/gpu/drm/i915/intel_dsi.c b/drivers/gpu/drm/i915/intel_dsi.c
index 375e7cfcf207..b0b3adf016f8 100644
--- a/drivers/gpu/drm/i915/intel_dsi.c
+++ b/drivers/gpu/drm/i915/intel_dsi.c
@@ -1653,7 +1653,6 @@ static const struct drm_connector_helper_funcs intel_dsi_connector_helper_funcs
};
static const struct drm_connector_funcs intel_dsi_connector_funcs = {
- .dpms = drm_atomic_helper_connector_dpms,
.late_register = intel_connector_register,
.early_unregister = intel_connector_unregister,
.destroy = intel_dsi_connector_destroy,
diff --git a/drivers/gpu/drm/i915/intel_dvo.c b/drivers/gpu/drm/i915/intel_dvo.c
index 6b1970542911..baf369d2de30 100644
--- a/drivers/gpu/drm/i915/intel_dvo.c
+++ b/drivers/gpu/drm/i915/intel_dvo.c
@@ -344,7 +344,6 @@ static void intel_dvo_destroy(struct drm_connector *connector)
}
static const struct drm_connector_funcs intel_dvo_connector_funcs = {
- .dpms = drm_atomic_helper_connector_dpms,
.detect = intel_dvo_detect,
.late_register = intel_connector_register,
.early_unregister = intel_connector_unregister,
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index 3074190b9455..2ef1ee85129d 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -1761,7 +1761,6 @@ static void intel_hdmi_destroy(struct drm_connector *connector)
}
static const struct drm_connector_funcs intel_hdmi_connector_funcs = {
- .dpms = drm_atomic_helper_connector_dpms,
.detect = intel_hdmi_detect,
.force = intel_hdmi_force,
.fill_modes = drm_helper_probe_single_connector_modes,
diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
index 6579299f5d00..61d557948e21 100644
--- a/drivers/gpu/drm/i915/intel_lvds.c
+++ b/drivers/gpu/drm/i915/intel_lvds.c
@@ -595,7 +595,6 @@ static const struct drm_connector_helper_funcs intel_lvds_connector_helper_funcs
};
static const struct drm_connector_funcs intel_lvds_connector_funcs = {
- .dpms = drm_atomic_helper_connector_dpms,
.detect = intel_lvds_detect,
.fill_modes = drm_helper_probe_single_connector_modes,
.atomic_get_property = intel_digital_connector_atomic_get_property,
diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
index a8eee1984ddf..bea8152ae859 100644
--- a/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.c
@@ -2193,7 +2193,6 @@ intel_sdvo_connector_duplicate_state(struct drm_connector *connector)
}
static const struct drm_connector_funcs intel_sdvo_connector_funcs = {
- .dpms = drm_atomic_helper_connector_dpms,
.detect = intel_sdvo_detect,
.fill_modes = drm_helper_probe_single_connector_modes,
.atomic_get_property = intel_sdvo_connector_atomic_get_property,
diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c
index e4ef2919b682..906893c006d8 100644
--- a/drivers/gpu/drm/i915/intel_tv.c
+++ b/drivers/gpu/drm/i915/intel_tv.c
@@ -1407,7 +1407,6 @@ intel_tv_destroy(struct drm_connector *connector)
}
static const struct drm_connector_funcs intel_tv_connector_funcs = {
- .dpms = drm_atomic_helper_connector_dpms,
.late_register = intel_connector_register,
.early_unregister = intel_connector_unregister,
.destroy = intel_tv_destroy,
diff --git a/drivers/gpu/drm/imx/imx-ldb.c b/drivers/gpu/drm/imx/imx-ldb.c
index 8b05ecb8fdef..56dd7a9a8e25 100644
--- a/drivers/gpu/drm/imx/imx-ldb.c
+++ b/drivers/gpu/drm/imx/imx-ldb.c
@@ -389,7 +389,6 @@ static int imx_ldb_encoder_atomic_check(struct drm_encoder *encoder,
static const struct drm_connector_funcs imx_ldb_connector_funcs = {
- .dpms = drm_atomic_helper_connector_dpms,
.fill_modes = drm_helper_probe_single_connector_modes,
.destroy = imx_drm_connector_destroy,
.reset = drm_atomic_helper_connector_reset,
diff --git a/drivers/gpu/drm/imx/imx-tve.c b/drivers/gpu/drm/imx/imx-tve.c
index 4826bb781723..bc27c2699464 100644
--- a/drivers/gpu/drm/imx/imx-tve.c
+++ b/drivers/gpu/drm/imx/imx-tve.c
@@ -341,7 +341,6 @@ static int imx_tve_atomic_check(struct drm_encoder *encoder,
}
static const struct drm_connector_funcs imx_tve_connector_funcs = {
- .dpms = drm_atomic_helper_connector_dpms,
.fill_modes = drm_helper_probe_single_connector_modes,
.destroy = imx_drm_connector_destroy,
.reset = drm_atomic_helper_connector_reset,
diff --git a/drivers/gpu/drm/imx/parallel-display.c b/drivers/gpu/drm/imx/parallel-display.c
index 8aca20209cb8..8def97d75030 100644
--- a/drivers/gpu/drm/imx/parallel-display.c
+++ b/drivers/gpu/drm/imx/parallel-display.c
@@ -135,7 +135,6 @@ static int imx_pd_encoder_atomic_check(struct drm_encoder *encoder,
}
static const struct drm_connector_funcs imx_pd_connector_funcs = {
- .dpms = drm_atomic_helper_connector_dpms,
.fill_modes = drm_helper_probe_single_connector_modes,
.destroy = imx_drm_connector_destroy,
.reset = drm_atomic_helper_connector_reset,
diff --git a/drivers/gpu/drm/mediatek/mtk_dsi.c b/drivers/gpu/drm/mediatek/mtk_dsi.c
index a31bd2a82de5..7e5e24c2152a 100644
--- a/drivers/gpu/drm/mediatek/mtk_dsi.c
+++ b/drivers/gpu/drm/mediatek/mtk_dsi.c
@@ -766,7 +766,6 @@ static const struct drm_encoder_helper_funcs mtk_dsi_encoder_helper_funcs = {
};
static const struct drm_connector_funcs mtk_dsi_connector_funcs = {
- .dpms = drm_atomic_helper_connector_dpms,
.fill_modes = drm_helper_probe_single_connector_modes,
.destroy = drm_connector_cleanup,
.reset = drm_atomic_helper_connector_reset,
diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi.c b/drivers/gpu/drm/mediatek/mtk_hdmi.c
index f2437cd1e0f9..690c67507cbc 100644
--- a/drivers/gpu/drm/mediatek/mtk_hdmi.c
+++ b/drivers/gpu/drm/mediatek/mtk_hdmi.c
@@ -1261,7 +1261,6 @@ static struct drm_encoder *mtk_hdmi_conn_best_enc(struct drm_connector *conn)
}
static const struct drm_connector_funcs mtk_hdmi_connector_funcs = {
- .dpms = drm_atomic_helper_connector_dpms,
.detect = hdmi_conn_detect,
.fill_modes = drm_helper_probe_single_connector_modes,
.destroy = hdmi_conn_destroy,
diff --git a/drivers/gpu/drm/meson/meson_venc_cvbs.c b/drivers/gpu/drm/meson/meson_venc_cvbs.c
index 00775b397dba..79d95ca8a0c0 100644
--- a/drivers/gpu/drm/meson/meson_venc_cvbs.c
+++ b/drivers/gpu/drm/meson/meson_venc_cvbs.c
@@ -118,7 +118,6 @@ static int meson_cvbs_connector_mode_valid(struct drm_connector *connector,
}
static const struct drm_connector_funcs meson_cvbs_connector_funcs = {
- .dpms = drm_atomic_helper_connector_dpms,
.detect = meson_cvbs_connector_detect,
.fill_modes = drm_helper_probe_single_connector_modes,
.destroy = meson_cvbs_connector_destroy,
diff --git a/drivers/gpu/drm/msm/dsi/dsi_manager.c b/drivers/gpu/drm/msm/dsi/dsi_manager.c
index a879ffa534b4..855248132b2b 100644
--- a/drivers/gpu/drm/msm/dsi/dsi_manager.c
+++ b/drivers/gpu/drm/msm/dsi/dsi_manager.c
@@ -626,7 +626,6 @@ static void dsi_mgr_bridge_mode_set(struct drm_bridge *bridge,
}
static const struct drm_connector_funcs dsi_mgr_connector_funcs = {
- .dpms = drm_atomic_helper_connector_dpms,
.detect = dsi_mgr_connector_detect,
.fill_modes = drm_helper_probe_single_connector_modes,
.destroy = dsi_mgr_connector_destroy,
diff --git a/drivers/gpu/drm/msm/edp/edp_connector.c b/drivers/gpu/drm/msm/edp/edp_connector.c
index 5960628ceb93..6f3fc6b0f0a3 100644
--- a/drivers/gpu/drm/msm/edp/edp_connector.c
+++ b/drivers/gpu/drm/msm/edp/edp_connector.c
@@ -92,7 +92,6 @@ static int edp_connector_mode_valid(struct drm_connector *connector,
}
static const struct drm_connector_funcs edp_connector_funcs = {
- .dpms = drm_atomic_helper_connector_dpms,
.detect = edp_connector_detect,
.fill_modes = drm_helper_probe_single_connector_modes,
.destroy = edp_connector_destroy,
diff --git a/drivers/gpu/drm/msm/hdmi/hdmi_connector.c b/drivers/gpu/drm/msm/hdmi/hdmi_connector.c
index a2515b466ce5..71536d9c7fe8 100644
--- a/drivers/gpu/drm/msm/hdmi/hdmi_connector.c
+++ b/drivers/gpu/drm/msm/hdmi/hdmi_connector.c
@@ -407,7 +407,6 @@ static int msm_hdmi_connector_mode_valid(struct drm_connector *connector,
}
static const struct drm_connector_funcs hdmi_connector_funcs = {
- .dpms = drm_atomic_helper_connector_dpms,
.detect = hdmi_connector_detect,
.fill_modes = drm_helper_probe_single_connector_modes,
.destroy = hdmi_connector_destroy,
diff --git a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_lvds_connector.c b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_lvds_connector.c
index 353429b05733..e3b1c86b7aae 100644
--- a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_lvds_connector.c
+++ b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_lvds_connector.c
@@ -91,7 +91,6 @@ static int mdp4_lvds_connector_mode_valid(struct drm_connector *connector,
}
static const struct drm_connector_funcs mdp4_lvds_connector_funcs = {
- .dpms = drm_atomic_helper_connector_dpms,
.detect = mdp4_lvds_connector_detect,
.fill_modes = drm_helper_probe_single_connector_modes,
.destroy = mdp4_lvds_connector_destroy,
diff --git a/drivers/gpu/drm/mxsfb/mxsfb_out.c b/drivers/gpu/drm/mxsfb/mxsfb_out.c
index f7d729aa09bd..e5edf016a439 100644
--- a/drivers/gpu/drm/mxsfb/mxsfb_out.c
+++ b/drivers/gpu/drm/mxsfb/mxsfb_out.c
@@ -74,7 +74,6 @@ static void mxsfb_panel_connector_destroy(struct drm_connector *connector)
}
static const struct drm_connector_funcs mxsfb_panel_connector_funcs = {
- .dpms = drm_atomic_helper_connector_dpms,
.detect = mxsfb_panel_connector_detect,
.fill_modes = drm_helper_probe_single_connector_modes,
.destroy = mxsfb_panel_connector_destroy,
diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c
index 2468e81918fd..5137155bf3c0 100644
--- a/drivers/gpu/drm/nouveau/nouveau_connector.c
+++ b/drivers/gpu/drm/nouveau/nouveau_connector.c
@@ -1072,17 +1072,9 @@ nouveau_connector_helper_funcs = {
.best_encoder = nouveau_connector_best_encoder,
};
-static int
-nouveau_connector_dpms(struct drm_connector *connector, int mode)
-{
- if (drm_drv_uses_atomic_modeset(connector->dev))
- return drm_atomic_helper_connector_dpms(connector, mode);
- return drm_helper_connector_dpms(connector, mode);
-}
-
static const struct drm_connector_funcs
nouveau_connector_funcs = {
- .dpms = nouveau_connector_dpms,
+ .dpms = drm_helper_connector_dpms,
.reset = nouveau_conn_reset,
.detect = nouveau_connector_detect,
.force = nouveau_connector_force,
@@ -1097,7 +1089,7 @@ nouveau_connector_funcs = {
static const struct drm_connector_funcs
nouveau_connector_funcs_lvds = {
- .dpms = nouveau_connector_dpms,
+ .dpms = drm_helper_connector_dpms,
.reset = nouveau_conn_reset,
.detect = nouveau_connector_detect_lvds,
.force = nouveau_connector_force,
diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c
index 80a96eb08bbf..d442def6c965 100644
--- a/drivers/gpu/drm/nouveau/nv50_display.c
+++ b/drivers/gpu/drm/nouveau/nv50_display.c
@@ -3118,7 +3118,6 @@ nv50_mstc_destroy(struct drm_connector *connector)
static const struct drm_connector_funcs
nv50_mstc = {
- .dpms = drm_atomic_helper_connector_dpms,
.reset = nouveau_conn_reset,
.detect = nv50_mstc_detect,
.fill_modes = drm_helper_probe_single_connector_modes,
diff --git a/drivers/gpu/drm/omapdrm/omap_connector.c b/drivers/gpu/drm/omapdrm/omap_connector.c
index c24b6b783e9a..d1ec76ef5cc6 100644
--- a/drivers/gpu/drm/omapdrm/omap_connector.c
+++ b/drivers/gpu/drm/omapdrm/omap_connector.c
@@ -195,7 +195,6 @@ static int omap_connector_mode_valid(struct drm_connector *connector,
}
static const struct drm_connector_funcs omap_connector_funcs = {
- .dpms = drm_atomic_helper_connector_dpms,
.reset = drm_atomic_helper_connector_reset,
.detect = omap_connector_detect,
.fill_modes = drm_helper_probe_single_connector_modes,
diff --git a/drivers/gpu/drm/pl111/pl111_connector.c b/drivers/gpu/drm/pl111/pl111_connector.c
index 3f213d7e7692..d335f9a29ce4 100644
--- a/drivers/gpu/drm/pl111/pl111_connector.c
+++ b/drivers/gpu/drm/pl111/pl111_connector.c
@@ -69,7 +69,6 @@ const struct drm_connector_funcs connector_funcs = {
.fill_modes = drm_helper_probe_single_connector_modes,
.destroy = pl111_connector_destroy,
.detect = pl111_connector_detect,
- .dpms = drm_atomic_helper_connector_dpms,
.reset = drm_atomic_helper_connector_reset,
.atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c b/drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c
index ee91481131ad..b373ad48ef5f 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c
@@ -46,7 +46,6 @@ static void rcar_du_lvds_connector_destroy(struct drm_connector *connector)
}
static const struct drm_connector_funcs connector_funcs = {
- .dpms = drm_atomic_helper_connector_dpms,
.reset = drm_atomic_helper_connector_reset,
.fill_modes = drm_helper_probe_single_connector_modes,
.destroy = rcar_du_lvds_connector_destroy,
diff --git a/drivers/gpu/drm/rockchip/cdn-dp-core.c b/drivers/gpu/drm/rockchip/cdn-dp-core.c
index 9b0b0588bbed..a57da051f516 100644
--- a/drivers/gpu/drm/rockchip/cdn-dp-core.c
+++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c
@@ -254,7 +254,6 @@ static void cdn_dp_connector_destroy(struct drm_connector *connector)
}
static const struct drm_connector_funcs cdn_dp_atomic_connector_funcs = {
- .dpms = drm_atomic_helper_connector_dpms,
.detect = cdn_dp_connector_detect,
.destroy = cdn_dp_connector_destroy,
.fill_modes = drm_helper_probe_single_connector_modes,
diff --git a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c
index 21b9737662ae..9a20b9dc27c8 100644
--- a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c
+++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c
@@ -1080,7 +1080,6 @@ static void dw_mipi_dsi_drm_connector_destroy(struct drm_connector *connector)
}
static const struct drm_connector_funcs dw_mipi_dsi_atomic_connector_funcs = {
- .dpms = drm_atomic_helper_connector_dpms,
.fill_modes = drm_helper_probe_single_connector_modes,
.destroy = dw_mipi_dsi_drm_connector_destroy,
.reset = drm_atomic_helper_connector_reset,
diff --git a/drivers/gpu/drm/rockchip/inno_hdmi.c b/drivers/gpu/drm/rockchip/inno_hdmi.c
index 7149968aa25a..bd87768dd549 100644
--- a/drivers/gpu/drm/rockchip/inno_hdmi.c
+++ b/drivers/gpu/drm/rockchip/inno_hdmi.c
@@ -593,7 +593,6 @@ static void inno_hdmi_connector_destroy(struct drm_connector *connector)
}
static struct drm_connector_funcs inno_hdmi_connector_funcs = {
- .dpms = drm_atomic_helper_connector_dpms,
.fill_modes = inno_hdmi_probe_single_connector_modes,
.detect = inno_hdmi_connector_detect,
.destroy = inno_hdmi_connector_destroy,
diff --git a/drivers/gpu/drm/sti/sti_dvo.c b/drivers/gpu/drm/sti/sti_dvo.c
index a51cd9f754db..852bf2293b05 100644
--- a/drivers/gpu/drm/sti/sti_dvo.c
+++ b/drivers/gpu/drm/sti/sti_dvo.c
@@ -412,7 +412,6 @@ static int sti_dvo_late_register(struct drm_connector *connector)
}
static const struct drm_connector_funcs sti_dvo_connector_funcs = {
- .dpms = drm_atomic_helper_connector_dpms,
.fill_modes = drm_helper_probe_single_connector_modes,
.detect = sti_dvo_connector_detect,
.destroy = drm_connector_cleanup,
diff --git a/drivers/gpu/drm/sti/sti_hda.c b/drivers/gpu/drm/sti/sti_hda.c
index d6ed909d9d75..cf65e32b5090 100644
--- a/drivers/gpu/drm/sti/sti_hda.c
+++ b/drivers/gpu/drm/sti/sti_hda.c
@@ -647,7 +647,6 @@ static int sti_hda_late_register(struct drm_connector *connector)
}
static const struct drm_connector_funcs sti_hda_connector_funcs = {
- .dpms = drm_atomic_helper_connector_dpms,
.fill_modes = drm_helper_probe_single_connector_modes,
.destroy = drm_connector_cleanup,
.reset = drm_atomic_helper_connector_reset,
diff --git a/drivers/gpu/drm/sti/sti_hdmi.c b/drivers/gpu/drm/sti/sti_hdmi.c
index 21f11dfae472..30f02d2fdd03 100644
--- a/drivers/gpu/drm/sti/sti_hdmi.c
+++ b/drivers/gpu/drm/sti/sti_hdmi.c
@@ -1113,7 +1113,6 @@ static int sti_hdmi_late_register(struct drm_connector *connector)
}
static const struct drm_connector_funcs sti_hdmi_connector_funcs = {
- .dpms = drm_atomic_helper_connector_dpms,
.fill_modes = drm_helper_probe_single_connector_modes,
.detect = sti_hdmi_connector_detect,
.destroy = drm_connector_cleanup,
diff --git a/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c b/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c
index 83b7a2a025f2..f5d0d6bd1084 100644
--- a/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c
+++ b/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c
@@ -306,7 +306,6 @@ sun4i_hdmi_connector_detect(struct drm_connector *connector, bool force)
}
static const struct drm_connector_funcs sun4i_hdmi_connector_funcs = {
- .dpms = drm_atomic_helper_connector_dpms,
.detect = sun4i_hdmi_connector_detect,
.fill_modes = drm_helper_probe_single_connector_modes,
.destroy = drm_connector_cleanup,
diff --git a/drivers/gpu/drm/sun4i/sun4i_rgb.c b/drivers/gpu/drm/sun4i/sun4i_rgb.c
index 422b191faa77..550bb262943f 100644
--- a/drivers/gpu/drm/sun4i/sun4i_rgb.c
+++ b/drivers/gpu/drm/sun4i/sun4i_rgb.c
@@ -120,7 +120,6 @@ sun4i_rgb_connector_destroy(struct drm_connector *connector)
}
static struct drm_connector_funcs sun4i_rgb_con_funcs = {
- .dpms = drm_atomic_helper_connector_dpms,
.fill_modes = drm_helper_probe_single_connector_modes,
.destroy = sun4i_rgb_connector_destroy,
.reset = drm_atomic_helper_connector_reset,
diff --git a/drivers/gpu/drm/sun4i/sun4i_tv.c b/drivers/gpu/drm/sun4i/sun4i_tv.c
index 338b9e5bb2a3..7b45ac9383ea 100644
--- a/drivers/gpu/drm/sun4i/sun4i_tv.c
+++ b/drivers/gpu/drm/sun4i/sun4i_tv.c
@@ -546,7 +546,6 @@ sun4i_tv_comp_connector_destroy(struct drm_connector *connector)
}
static struct drm_connector_funcs sun4i_tv_comp_connector_funcs = {
- .dpms = drm_atomic_helper_connector_dpms,
.fill_modes = drm_helper_probe_single_connector_modes,
.destroy = sun4i_tv_comp_connector_destroy,
.reset = drm_atomic_helper_connector_reset,
diff --git a/drivers/gpu/drm/tegra/dsi.c b/drivers/gpu/drm/tegra/dsi.c
index 3dea1216bafd..e4b5aedfdbd4 100644
--- a/drivers/gpu/drm/tegra/dsi.c
+++ b/drivers/gpu/drm/tegra/dsi.c
@@ -815,7 +815,6 @@ tegra_dsi_connector_duplicate_state(struct drm_connector *connector)
}
static const struct drm_connector_funcs tegra_dsi_connector_funcs = {
- .dpms = drm_atomic_helper_connector_dpms,
.reset = tegra_dsi_connector_reset,
.detect = tegra_output_connector_detect,
.fill_modes = drm_helper_probe_single_connector_modes,
diff --git a/drivers/gpu/drm/tegra/hdmi.c b/drivers/gpu/drm/tegra/hdmi.c
index 718d8db406a6..a621b0da4092 100644
--- a/drivers/gpu/drm/tegra/hdmi.c
+++ b/drivers/gpu/drm/tegra/hdmi.c
@@ -902,7 +902,6 @@ tegra_hdmi_connector_detect(struct drm_connector *connector, bool force)
}
static const struct drm_connector_funcs tegra_hdmi_connector_funcs = {
- .dpms = drm_atomic_helper_connector_dpms,
.reset = drm_atomic_helper_connector_reset,
.detect = tegra_hdmi_connector_detect,
.fill_modes = drm_helper_probe_single_connector_modes,
diff --git a/drivers/gpu/drm/tegra/rgb.c b/drivers/gpu/drm/tegra/rgb.c
index a131b44e2d6f..78ec5193741d 100644
--- a/drivers/gpu/drm/tegra/rgb.c
+++ b/drivers/gpu/drm/tegra/rgb.c
@@ -88,7 +88,6 @@ static void tegra_dc_write_regs(struct tegra_dc *dc,
}
static const struct drm_connector_funcs tegra_rgb_connector_funcs = {
- .dpms = drm_atomic_helper_connector_dpms,
.reset = drm_atomic_helper_connector_reset,
.detect = tegra_output_connector_detect,
.fill_modes = drm_helper_probe_single_connector_modes,
diff --git a/drivers/gpu/drm/tegra/sor.c b/drivers/gpu/drm/tegra/sor.c
index fb2709c0c461..e0642d05a8d3 100644
--- a/drivers/gpu/drm/tegra/sor.c
+++ b/drivers/gpu/drm/tegra/sor.c
@@ -1340,7 +1340,6 @@ tegra_sor_connector_duplicate_state(struct drm_connector *connector)
}
static const struct drm_connector_funcs tegra_sor_connector_funcs = {
- .dpms = drm_atomic_helper_connector_dpms,
.reset = tegra_sor_connector_reset,
.detect = tegra_sor_connector_detect,
.fill_modes = drm_helper_probe_single_connector_modes,
diff --git a/drivers/gpu/drm/tilcdc/tilcdc_panel.c b/drivers/gpu/drm/tilcdc/tilcdc_panel.c
index 28c3e2f44f64..1813a3623ce6 100644
--- a/drivers/gpu/drm/tilcdc/tilcdc_panel.c
+++ b/drivers/gpu/drm/tilcdc/tilcdc_panel.c
@@ -189,7 +189,6 @@ static struct drm_encoder *panel_connector_best_encoder(
static const struct drm_connector_funcs panel_connector_funcs = {
.destroy = panel_connector_destroy,
- .dpms = drm_atomic_helper_connector_dpms,
.fill_modes = drm_helper_probe_single_connector_modes,
.reset = drm_atomic_helper_connector_reset,
.atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
diff --git a/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c b/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c
index aabfad882e23..1e2dfb1b1d6b 100644
--- a/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c
+++ b/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c
@@ -202,7 +202,6 @@ static struct drm_encoder *tfp410_connector_best_encoder(
static const struct drm_connector_funcs tfp410_connector_funcs = {
.destroy = tfp410_connector_destroy,
- .dpms = drm_atomic_helper_connector_dpms,
.detect = tfp410_connector_detect,
.fill_modes = drm_helper_probe_single_connector_modes,
.reset = drm_atomic_helper_connector_reset,
diff --git a/drivers/gpu/drm/tinydrm/core/tinydrm-pipe.c b/drivers/gpu/drm/tinydrm/core/tinydrm-pipe.c
index ec43fb7ad9e4..79b6687977d3 100644
--- a/drivers/gpu/drm/tinydrm/core/tinydrm-pipe.c
+++ b/drivers/gpu/drm/tinydrm/core/tinydrm-pipe.c
@@ -71,7 +71,6 @@ static void tinydrm_connector_destroy(struct drm_connector *connector)
}
static const struct drm_connector_funcs tinydrm_connector_funcs = {
- .dpms = drm_atomic_helper_connector_dpms,
.reset = drm_atomic_helper_connector_reset,
.detect = tinydrm_connector_detect,
.fill_modes = drm_helper_probe_single_connector_modes,
diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
index 406d6d83b6c6..b249b79ce04a 100644
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
@@ -265,7 +265,6 @@ static int vc4_hdmi_connector_get_modes(struct drm_connector *connector)
}
static const struct drm_connector_funcs vc4_hdmi_connector_funcs = {
- .dpms = drm_atomic_helper_connector_dpms,
.detect = vc4_hdmi_connector_detect,
.fill_modes = drm_helper_probe_single_connector_modes,
.destroy = vc4_hdmi_connector_destroy,
diff --git a/drivers/gpu/drm/vc4/vc4_vec.c b/drivers/gpu/drm/vc4/vc4_vec.c
index 369fea5a13a1..3a9a302247a2 100644
--- a/drivers/gpu/drm/vc4/vc4_vec.c
+++ b/drivers/gpu/drm/vc4/vc4_vec.c
@@ -366,7 +366,6 @@ static int vc4_vec_connector_get_modes(struct drm_connector *connector)
}
static const struct drm_connector_funcs vc4_vec_connector_funcs = {
- .dpms = drm_atomic_helper_connector_dpms,
.detect = vc4_vec_connector_detect,
.fill_modes = drm_helper_probe_single_connector_modes,
.destroy = vc4_vec_connector_destroy,
diff --git a/drivers/gpu/drm/virtio/virtgpu_display.c b/drivers/gpu/drm/virtio/virtgpu_display.c
index ffd22e5ab43a..b6d52055a11f 100644
--- a/drivers/gpu/drm/virtio/virtgpu_display.c
+++ b/drivers/gpu/drm/virtio/virtgpu_display.c
@@ -252,7 +252,6 @@ static void virtio_gpu_conn_destroy(struct drm_connector *connector)
}
static const struct drm_connector_funcs virtio_gpu_connector_funcs = {
- .dpms = drm_atomic_helper_connector_dpms,
.detect = virtio_gpu_conn_detect,
.fill_modes = drm_helper_probe_single_connector_modes,
.destroy = virtio_gpu_conn_destroy,
diff --git a/drivers/gpu/drm/zte/zx_hdmi.c b/drivers/gpu/drm/zte/zx_hdmi.c
index 7e834e3eeed9..b8abb1b496ff 100644
--- a/drivers/gpu/drm/zte/zx_hdmi.c
+++ b/drivers/gpu/drm/zte/zx_hdmi.c
@@ -300,7 +300,6 @@ zx_hdmi_connector_detect(struct drm_connector *connector, bool force)
}
static const struct drm_connector_funcs zx_hdmi_connector_funcs = {
- .dpms = drm_atomic_helper_connector_dpms,
.fill_modes = drm_helper_probe_single_connector_modes,
.detect = zx_hdmi_connector_detect,
.destroy = drm_connector_cleanup,
diff --git a/drivers/gpu/drm/zte/zx_tvenc.c b/drivers/gpu/drm/zte/zx_tvenc.c
index b56dc69843fc..0de1a71ca4e0 100644
--- a/drivers/gpu/drm/zte/zx_tvenc.c
+++ b/drivers/gpu/drm/zte/zx_tvenc.c
@@ -269,7 +269,6 @@ static struct drm_connector_helper_funcs zx_tvenc_connector_helper_funcs = {
};
static const struct drm_connector_funcs zx_tvenc_connector_funcs = {
- .dpms = drm_atomic_helper_connector_dpms,
.fill_modes = drm_helper_probe_single_connector_modes,
.destroy = drm_connector_cleanup,
.reset = drm_atomic_helper_connector_reset,
diff --git a/drivers/gpu/drm/zte/zx_vga.c b/drivers/gpu/drm/zte/zx_vga.c
index 1e0811f775cb..3e7e33cd3dfa 100644
--- a/drivers/gpu/drm/zte/zx_vga.c
+++ b/drivers/gpu/drm/zte/zx_vga.c
@@ -138,7 +138,6 @@ zx_vga_connector_detect(struct drm_connector *connector, bool force)
}
static const struct drm_connector_funcs zx_vga_connector_funcs = {
- .dpms = drm_atomic_helper_connector_dpms,
.fill_modes = drm_helper_probe_single_connector_modes,
.detect = zx_vga_connector_detect,
.destroy = drm_connector_cleanup,
diff --git a/include/drm/drm_atomic_helper.h b/include/drm/drm_atomic_helper.h
index 619089a027ec..d2b56cc657e9 100644
--- a/include/drm/drm_atomic_helper.h
+++ b/include/drm/drm_atomic_helper.h
@@ -136,8 +136,6 @@ int drm_atomic_helper_page_flip_target(
uint32_t flags,
uint32_t target,
struct drm_modeset_acquire_ctx *ctx);
-int drm_atomic_helper_connector_dpms(struct drm_connector *connector,
- int mode);
struct drm_encoder *
drm_atomic_helper_best_encoder(struct drm_connector *connector);
--
2.13.3
_______________________________________________
Virtualization mailing list
Virtualization@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
^ permalink raw reply related
* Re: [PATCH 7/8] drm: Nuke drm_atomic_helper_connector_dpms
From: Neil Armstrong @ 2017-07-25 8:04 UTC (permalink / raw)
To: Daniel Vetter, Intel Graphics Development
Cc: Martyn Welch, David Airlie, nouveau, DRI Development,
virtualization, Andrzej Hajda, Tomi Valkeinen, linux-mediatek,
Laurent Pinchart, Benjamin Gaignard, Romain Perier, Daniel Vetter,
Jyri Sarha, Heiko Stuebner, Marek Vasut, linux-renesas-soc,
Archit Taneja, Lars-Peter Clausen, Joonyoung Shim, Kevin Hilman,
Alexey Brodkin, Russell King, Krzysztof
In-Reply-To: <20170725080122.20548-8-daniel.vetter@ffwll.ch>
Le 25/07/2017 10:01, Daniel Vetter a écrit :
> It's dead code, the core handles all this directly now.
>
> The only special case is nouveau and tda988x which used one function
> for both legacy modeset code and -nv50 atomic world instead of 2
> vtables. But amounts to exactly the same.
>
> v2: Rebase over the panel/brideg refactorings in stm/ltdc.
>
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> Cc: Archit Taneja <architt@codeaurora.org>
> Cc: Andrzej Hajda <a.hajda@samsung.com>
> Cc: Laurent Pinchart <Laurent.pinchart@ideasonboard.com>
> Cc: Peter Senna Tschudin <peter.senna@collabora.com>
> Cc: Martin Donnelly <martin.donnelly@ge.com>
> Cc: Martyn Welch <martyn.welch@collabora.co.uk>
> Cc: Daniel Vetter <daniel.vetter@intel.com>
> Cc: Jani Nikula <jani.nikula@linux.intel.com>
> Cc: Sean Paul <seanpaul@chromium.org>
> Cc: David Airlie <airlied@linux.ie>
> Cc: Inki Dae <inki.dae@samsung.com>
> Cc: Joonyoung Shim <jy0922.shim@samsung.com>
> Cc: Seung-Woo Kim <sw0312.kim@samsung.com>
> Cc: Kyungmin Park <kyungmin.park@samsung.com>
> Cc: Kukjin Kim <kgene@kernel.org>
> Cc: Krzysztof Kozlowski <krzk@kernel.org>
> Cc: Stefan Agner <stefan@agner.ch>
> Cc: Alison Wang <alison.wang@freescale.com>
> Cc: Russell King <linux@armlinux.org.uk>
> Cc: Philipp Zabel <p.zabel@pengutronix.de>
> Cc: CK Hu <ck.hu@mediatek.com>
> Cc: Matthias Brugger <matthias.bgg@gmail.com>
> Cc: Neil Armstrong <narmstrong@baylibre.com>
> Cc: Carlo Caione <carlo@caione.org>
> Cc: Kevin Hilman <khilman@baylibre.com>
> Cc: Marek Vasut <marex@denx.de>
> Cc: Ben Skeggs <bskeggs@redhat.com>
> Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
> Cc: Eric Anholt <eric@anholt.net>
> Cc: Mark Yao <mark.yao@rock-chips.com>
> Cc: Heiko Stuebner <heiko@sntech.de>
> Cc: Benjamin Gaignard <benjamin.gaignard@linaro.org>
> Cc: Vincent Abriou <vincent.abriou@st.com>
> Cc: Yannick Fertre <yannick.fertre@st.com>
> Cc: Philippe Cornu <philippe.cornu@st.com>
> Cc: Maxime Ripard <maxime.ripard@free-electrons.com>
> Cc: Chen-Yu Tsai <wens@csie.org>
> Cc: Thierry Reding <thierry.reding@gmail.com>
> Cc: Jonathan Hunter <jonathanh@nvidia.com>
> Cc: Jyri Sarha <jsarha@ti.com>
> Cc: Gerd Hoffmann <kraxel@redhat.com>
> Cc: Shawn Guo <shawnguo@kernel.org>
> Cc: John Stultz <john.stultz@linaro.org>
> Cc: Lars-Peter Clausen <lars@metafoo.de>
> Cc: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
> Cc: Jeffy Chen <jeffy.chen@rock-chips.com>
> Cc: Tomeu Vizoso <tomeu.vizoso@collabora.com>
> Cc: Yakir Yang <kuankuan.y@gmail.com>
> Cc: Marek Szyprowski <m.szyprowski@samsung.com>
> Cc: Jose Abreu <Jose.Abreu@synopsys.com>
> Cc: Romain Perier <romain.perier@collabora.com>
> Cc: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
> Cc: Xinliang Liu <z.liuxinliang@hisilicon.com>
> Cc: Alexey Brodkin <abrodkin@synopsys.com>
> Cc: Alex Deucher <alexander.deucher@amd.com>
> Cc: Rongrong Zou <zourongrong@gmail.com>
> Cc: Rob Clark <robdclark@gmail.com>
> Cc: Hai Li <hali@codeaurora.org>
> Cc: "Noralf Trønnes" <noralf@tronnes.org>
> Cc: linux-arm-kernel@lists.infradead.org
> Cc: linux-samsung-soc@vger.kernel.org
> Cc: intel-gfx@lists.freedesktop.org
> Cc: linux-mediatek@lists.infradead.org
> Cc: linux-amlogic@lists.infradead.org
> Cc: nouveau@lists.freedesktop.org
> Cc: linux-renesas-soc@vger.kernel.org
> Cc: linux-rockchip@lists.infradead.org
> Cc: linux-tegra@vger.kernel.org
> Cc: virtualization@lists.linux-foundation.org
> Cc: zain wang <wzz@rock-chips.com>
> Cc: Baoyou Xie <baoyou.xie@linaro.org>
> Cc: Boris Brezillon <boris.brezillon@free-electrons.com>
> ---
> drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 1 -
> drivers/gpu/drm/bridge/analogix-anx78xx.c | 1 -
> drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 1 -
> drivers/gpu/drm/bridge/dumb-vga-dac.c | 1 -
> .../drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c | 1 -
> drivers/gpu/drm/bridge/nxp-ptn3460.c | 1 -
> drivers/gpu/drm/bridge/panel.c | 1 -
> drivers/gpu/drm/bridge/parade-ps8622.c | 1 -
> drivers/gpu/drm/bridge/sii902x.c | 1 -
> drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 1 -
> drivers/gpu/drm/bridge/tc358767.c | 1 -
> drivers/gpu/drm/bridge/ti-tfp410.c | 1 -
> drivers/gpu/drm/drm_atomic_helper.c | 79 ----------------------
> drivers/gpu/drm/exynos/exynos_drm_dpi.c | 1 -
> drivers/gpu/drm/exynos/exynos_drm_dsi.c | 1 -
> drivers/gpu/drm/exynos/exynos_drm_vidi.c | 1 -
> drivers/gpu/drm/exynos/exynos_hdmi.c | 1 -
> drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c | 1 -
> drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c | 1 -
> drivers/gpu/drm/i2c/tda998x_drv.c | 10 +--
> drivers/gpu/drm/i915/intel_crt.c | 1 -
> drivers/gpu/drm/i915/intel_dp.c | 1 -
> drivers/gpu/drm/i915/intel_dp_mst.c | 1 -
> drivers/gpu/drm/i915/intel_dsi.c | 1 -
> drivers/gpu/drm/i915/intel_dvo.c | 1 -
> drivers/gpu/drm/i915/intel_hdmi.c | 1 -
> drivers/gpu/drm/i915/intel_lvds.c | 1 -
> drivers/gpu/drm/i915/intel_sdvo.c | 1 -
> drivers/gpu/drm/i915/intel_tv.c | 1 -
> drivers/gpu/drm/imx/imx-ldb.c | 1 -
> drivers/gpu/drm/imx/imx-tve.c | 1 -
> drivers/gpu/drm/imx/parallel-display.c | 1 -
> drivers/gpu/drm/mediatek/mtk_dsi.c | 1 -
> drivers/gpu/drm/mediatek/mtk_hdmi.c | 1 -
> drivers/gpu/drm/meson/meson_venc_cvbs.c | 1 -
> drivers/gpu/drm/msm/dsi/dsi_manager.c | 1 -
> drivers/gpu/drm/msm/edp/edp_connector.c | 1 -
> drivers/gpu/drm/msm/hdmi/hdmi_connector.c | 1 -
> drivers/gpu/drm/msm/mdp/mdp4/mdp4_lvds_connector.c | 1 -
> drivers/gpu/drm/mxsfb/mxsfb_out.c | 1 -
> drivers/gpu/drm/nouveau/nouveau_connector.c | 12 +---
> drivers/gpu/drm/nouveau/nv50_display.c | 1 -
> drivers/gpu/drm/omapdrm/omap_connector.c | 1 -
> drivers/gpu/drm/pl111/pl111_connector.c | 1 -
> drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c | 1 -
> drivers/gpu/drm/rockchip/cdn-dp-core.c | 1 -
> drivers/gpu/drm/rockchip/dw-mipi-dsi.c | 1 -
> drivers/gpu/drm/rockchip/inno_hdmi.c | 1 -
> drivers/gpu/drm/sti/sti_dvo.c | 1 -
> drivers/gpu/drm/sti/sti_hda.c | 1 -
> drivers/gpu/drm/sti/sti_hdmi.c | 1 -
> drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 1 -
> drivers/gpu/drm/sun4i/sun4i_rgb.c | 1 -
> drivers/gpu/drm/sun4i/sun4i_tv.c | 1 -
> drivers/gpu/drm/tegra/dsi.c | 1 -
> drivers/gpu/drm/tegra/hdmi.c | 1 -
> drivers/gpu/drm/tegra/rgb.c | 1 -
> drivers/gpu/drm/tegra/sor.c | 1 -
> drivers/gpu/drm/tilcdc/tilcdc_panel.c | 1 -
> drivers/gpu/drm/tilcdc/tilcdc_tfp410.c | 1 -
> drivers/gpu/drm/tinydrm/core/tinydrm-pipe.c | 1 -
> drivers/gpu/drm/vc4/vc4_hdmi.c | 1 -
> drivers/gpu/drm/vc4/vc4_vec.c | 1 -
> drivers/gpu/drm/virtio/virtgpu_display.c | 1 -
> drivers/gpu/drm/zte/zx_hdmi.c | 1 -
> drivers/gpu/drm/zte/zx_tvenc.c | 1 -
> drivers/gpu/drm/zte/zx_vga.c | 1 -
> include/drm/drm_atomic_helper.h | 2 -
> 68 files changed, 3 insertions(+), 164 deletions(-)
>
> diff --git a/drivers/gpu/drm/meson/meson_venc_cvbs.c b/drivers/gpu/drm/meson/meson_venc_cvbs.c
> index 00775b397dba..79d95ca8a0c0 100644
> --- a/drivers/gpu/drm/meson/meson_venc_cvbs.c
> +++ b/drivers/gpu/drm/meson/meson_venc_cvbs.c
> @@ -118,7 +118,6 @@ static int meson_cvbs_connector_mode_valid(struct drm_connector *connector,
> }
>
> static const struct drm_connector_funcs meson_cvbs_connector_funcs = {
> - .dpms = drm_atomic_helper_connector_dpms,
> .detect = meson_cvbs_connector_detect,
> .fill_modes = drm_helper_probe_single_connector_modes,
> .destroy = meson_cvbs_connector_destroy,
For meson driver :
Acked-by: Neil Armstrong <narmstrong@baylibre.com>
For the rest:
Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
_______________________________________________
Virtualization mailing list
Virtualization@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
^ permalink raw reply
* Re: [RFC] virtio-mem: paravirtualized memory
From: David Hildenbrand @ 2017-07-25 8:21 UTC (permalink / raw)
To: KVM, virtualization@lists.linux-foundation.org,
qemu-devel@nongnu.org, linux-mm@kvack.org
Cc: Andrea Arcangeli, Paolo Bonzini, Radim Krcmar, Michael S. Tsirkin
In-Reply-To: <547865a9-d6c2-7140-47e2-5af01e7d761d@redhat.com>
(ping)
Hi,
this has been on these lists for quite some time now. I want to start
preparing a virtio spec for virtio-mem soon.
So if you have any more comments/ideas/objections/questions, now is the
right time to post them :)
Thanks!
On 16.06.2017 16:20, David Hildenbrand wrote:
> Hi,
>
> this is an idea that is based on Andrea Arcangeli's original idea to
> host enforce guest access to memory given up using virtio-balloon using
> userfaultfd in the hypervisor. While looking into the details, I
> realized that host-enforcing virtio-balloon would result in way too many
> problems (mainly backwards compatibility) and would also have some
> conceptual restrictions that I want to avoid. So I developed the idea of
> virtio-mem - "paravirtualized memory".
>
> The basic idea is to add memory to the guest via a paravirtualized
> mechanism (so the guest can hotplug it) and remove memory via a
> mechanism similar to a balloon. This avoids having to online memory as
> "online-movable" in the guest and allows more fain grained memory
> hot(un)plug. In addition, migrating QEMU guests after adding/removing
> memory gets a lot easier.
>
> Actually, this has a lot in common with the XEN balloon or the Hyper-V
> balloon (namely: paravirtualized hotplug and ballooning), but is very
> different when going into the details.
>
> Getting this all implemented properly will take quite some effort,
> that's why I want to get some early feedback regarding the general
> concept. If you have some alternative ideas, or ideas how to modify this
> concept, I'll be happy to discuss. Just please make sure to have a look
> at the requirements first.
>
> -----------------------------------------------------------------------
> 0. Outline:
> -----------------------------------------------------------------------
> - I. General concept
> - II. Use cases
> - III. Identified requirements
> - IV. Possible modifications
> - V. Prototype
> - VI. Problems to solve / things to sort out / missing in prototype
> - VII. Questions
> - VIII. Q&A
>
> ------------------------------------------------------------------------
> I. General concept
> ------------------------------------------------------------------------
>
> We expose memory regions to the guest via a paravirtualize interface. So
> instead of e.g. a DIMM on x86, such memory is not anounced via ACPI.
> Unmodified guests (without a virtio-mem driver) won't be able to see/use
> this memory. The virtio-mem guest driver is needed to detect and manage
> these memory areas. What makes this memory special is that it can grow
> while the guest is running ("plug memory") and might shrink on a reboot
> (to compensate "unplugged" memory - see next paragraph). Each virtio-mem
> device manages exactly one such memory area. By having multiple ones
> assigned to different NUMA nodes, we can modify memory on a NUMA basis.
>
> Of course, we cannot shrink these memory areas while the guest is
> running. To be able to unplug memory, we do something like a balloon
> does, however limited to this very memory area that belongs to the
> virtio-mem device. The guest will hand back small chunks of memory. If
> we want to add memory to the guest, we first "replug" memory that has
> previously been given up by the guest, before we grow our memory area.
>
> On a reboot, we want to avoid any memory holes in our memory, therefore
> we resize our memory area (shrink it) to compensate memory that has been
> unplugged. This highly simplifies hotplugging memory in the guest (
> hotplugging memory with random memory holes is basically impossible).
>
> We have to make sure that all memory chunks the guest hands back on
> unplug requests will not consume memory in the host. We do this by
> write-protecting that memory chunk in the host and then dropping the
> backing pages. The guest can read this memory (reading from the ZERO
> page) but no longer write to it. For now, this will only work on
> anonymous memory. We will use userfaultfd WP (write-protect mode) to
> avoid creating too many VMAs. Huge pages will require more effort (no
> explicit ZERO page).
>
> As we unplug memory on a fine grained basis (and e.g. not on
> a complete DIMM basis), there is no need to online virtio-mem memory
> as online-movable. Also, memory unplug support for Windows might be
> supported that way. You can find more details in the Q/A section below.
>
>
> The important points here are:
> - After a reboot, every memory the guest sees can be accessed and used.
> (in contrast to e.g. the XEN balloon, see Q/A fore more details)
> - Rebooting into an unmodified guest will not result into random
> crashed. The guest will simply not be able to use all memory without a
> virtio-mem driver.
> - Adding/Removing memory will not require modifying the QEMU command
> line on the migration target. Migration simply works (re-sizing memory
> areas is already part of the migration protocol!). Essentially, this
> makes adding/removing memory to/from a guest way simpler and
> independent of the underlying architecture. If the guest OS can online
> new memory, we can add more memory this way.
> - Unplugged memory can be read. This allows e.g. kexec() without nasty
> modifications. Especially relevant for Windows' kexec() variant.
> - It will play nicely with other things mapped into the address space,
> e.g. also other DIMMs or NVDIMM. virtio-mem will only work on its own
> memory region (in contrast e.g. to virtio-balloon). Especially it will
> not give up ("allocate") memory on other DIMMs, hindering them to get
> unplugged the ACPI way.
> - We can add/remove memory without running into KVM memory slot or other
> (e.g. ACPI slot) restrictions. The granularity in which we can add
> memory is only limited by the granularity the guest can add memory
> (e.g. Windows 2MB, Linux on x86 128MB for now).
> - By not having to online memory as online-movable we don't run into any
> memory restrictions in the guest. E.g. page tables can only be created
> on !movable memory. So while there might be plenty of online-movable
> memory left, allocation of page tables might fail. See Q/A for more
> details.
> - The admin will not have to set memory offline in the guest first in
> order to unplug it. virtio-mem will handle this internally and not
> require interaction with an admin or a guest-agent.
>
> Important restrictions of this concept:
> - Guests without a virtio-mem guest driver can't see that memory.
> - We will always require some boot memory that cannot get unplugged.
> Also, virtio-mem memory (as all other hotplugged memory) cannot become
> DMA memory under Linux. So the boot memory also defines the amount of
> DMA memory.
> - Hibernation/Sleep+Restore while virtio-mem is active is not supported.
> On a reboot/fresh start, the size of the virtio-mem memory area might
> change and a running/loaded guest can't deal with that.
> - Unplug support for hugetlbfs/shmem will take quite some time to
> support. The larger the used page size, the harder for the guest to
> give up memory. We can still use DIMM based hotplug for that.
> - Huge huge pages are problematic, as the guest would have to give up
> e.g. 1GB chunks. This is not expected to be supported. We can still
> use DIMM based hotplug for setups that require that.
> - For any memory we unplug using this mechanism, for now we will still
> have struct pages allocated in the guest. This means, that roughly
> 1.6% of unplugged memory will still be allocated in the guest, being
> unusable.
>
>
> ------------------------------------------------------------------------
> II. Use cases
> ------------------------------------------------------------------------
>
> Of course, we want to deny any access to unplugged memory. In contrast
> to virtio-balloon or other similar ideas (free page hinting), this is
> not about cooperative memory management, but about guarantees. The idea
> is, that both concepts can coexist.
>
> So one use case is of course cloud providers. Customers can add
> or remove memory to/from a VM without having to care about how to
> online memory or in which amount to add memory in the first place in
> order to remove it again. In cloud environments, we care about
> guarantees. E.g. for virtio-balloon a malicious guest can simply reuse
> any deflated memory, and the hypervisor can't even tell if the guest is
> malicious (e.g. a harmless guest reboot might look like a malicious
> guest). For virtio-mem, we guarantee that the guest can't reuse any
> memory that it previously gave up.
>
> But also for ordinary VMs (!cloud), this avoids having to online memory
> in the guest as online-movable and therefore not running into allocation
> problems if there are e.g. many processes needing many page tables on
> !movable memory. Also here, we don't have to know how much memory we
> want to remove some-when in the future before we add memory. (e.g. if we
> add a 128GB DIMM, we can only remove that 128GB DIMM - if we are lucky).
>
> We might be able to support memory unplug for Windows (as for now,
> ACPI unplug is not supported), more details have to be clarified.
>
> As we can grow these memory areas quite easily, another use case might
> be guests that tell us they need more memory. Thinking about VMs to
> protect containers, there seems to be the general problem that we don't
> know how much memory the container will actually need. We could
> implement a mechanism (in virtio-mem or guest driver), by which the
> guest can request more memory. If the hypervisor agrees, it can simply
> give the guest more memory. As this is all handled within QEMU,
> migration is not a problem. Adding more memory will not result in new
> DIMM devices.
>
>
> ------------------------------------------------------------------------
> III. Identified requirements
> ------------------------------------------------------------------------
>
> I considered the following requirements.
>
> NUMA aware:
> We want to be able to add/remove memory to/from NUMA nodes.
> Different page-size support:
> We want to be able to support different page sizes, e.g. because of
> huge pages in the hypervisor or because host and guest have different
> page sizes (powerpc 64k vs 4k).
> Guarantees:
> There has to be no way the guest can reuse unplugged memory without
> host consent. Still, we could implement a mechanism for the guest to
> request more memory. The hypervisor then has to decide how it wants to
> handle that request.
> Architecture independence:
> We want this to work independently of other technologies bound to
> specific architectures, like ACPI.
> Avoid online-movable:
> We don't want to have to online memory in the guest as online-movable
> just to be able to unplug (at least parts of) it again.
> Migration support:
> Be able to migrate without too much hassle. Especially, to handle it
> completely within QEMU (not having to add new devices to the target
> command line).
> Windows support:
> We definitely want to support Windows guests in the long run.
> Coexistence with other hotplug mechanisms:
> Allow to hotplug DIMMs / NVDIMMs, therefore to share the "hotplug"
> address space part with other devices.
> Backwards compatibility:
> Don't break if rebooting into an unmodified guest after having
> unplugged some memory. All memory a freshly booted guest sees must not
> contain memory holes that will crash it if it tries to access it.
>
>
> ------------------------------------------------------------------------
> IV. Possible modifications
> ------------------------------------------------------------------------
>
> Adding a guest->host request mechanism would make sense to e.g. be able
> to request further memory from the hypervisor directly from the guest.
>
> Adding memory will be much easier than removing memory. We can split
> this up and first introduce "adding memory" and later add "removing
> memory". Removing memory will require userfaultfd WP in the hypervisor
> and a special fancy allocator in the guest. So this will take some time.
>
> Adding a mechanism to trade in memory blocks might make sense to allow
> some sort of memory compaction. However I expect this to be highly
> complicated and basically not feasible.
>
> Being able to unplug memory "any" memory instead of only memory
> belonging to the virtio-mem device sounds tempting (and simplifies
> certain parts), however it has a couple of side effects I want to avoid.
> You can read more about that in the Q/A below.
>
>
> ------------------------------------------------------------------------
> V. Prototype
> ------------------------------------------------------------------------
>
> To identify potential problems I developed a very basic prototype. It
> is incomplete, full of hacks and most probably broken in various ways.
> I used it only in the given setup, only on x86 and only with an initrd.
>
> It uses a fixed page size of 256k for now, has a very ugly allocator
> hack in the guest, the virtio protocol really needs some tuning and
> an async job interface towards the user is missing. Instead of using
> userfaultfd WP, I am using simply mprotect() in this prototype. Basic
> migration works (not involving userfaultfd).
>
> Please, don't even try to review it (that's why I will also not attach
> any patches to this mail :) ), just use this as an inspiration what this
> could look like. You can find the latest hack at:
>
> QEMU: https://github.com/davidhildenbrand/qemu/tree/virtio-mem
>
> Kernel: https://github.com/davidhildenbrand/linux/tree/virtio-mem
>
> Use the kernel in the guest and make sure to compile the virtio-mem
> driver into the kernel (CONFIG_VIRTIO_MEM=y). A host kernel patch is
> contained to allow atomic resize of KVM memory regions, however it is
> pretty much untested.
>
>
> 1. Starting a guest with virtio-mem memory:
> We will create a guest with 2 NUMA nodes and 4GB of "boot + DMA"
> memory. This memory is visible also to guests without virtio-mem.
> Also, we will add 4GB to NUMA node 0 and 3GB to NUMA node 1 using
> virtio-mem. We allow both virtio-mem devices to grow up to 8GB. The
> last 4 lines are the important part.
>
> --> qemu/x86_64-softmmu/qemu-system-x86_64 \
> --enable-kvm
> -m 4G,maxmem=20G \
> -smp sockets=2,cores=2 \
> -numa node,nodeid=0,cpus=0-1 -numa node,nodeid=1,cpus=2-3 \
> -machine pc \
> -kernel linux/arch/x86_64/boot/bzImage \
> -nodefaults \
> -chardev stdio,id=serial \
> -device isa-serial,chardev=serial \
> -append "console=ttyS0 rd.shell rd.luks=0 rd.lvm=0" \
> -initrd /boot/initramfs-4.10.8-200.fc25.x86_64.img \
> -chardev socket,id=monitor,path=/var/tmp/monitor,server,nowait \
> -mon chardev=monitor,mode=readline \
> -object memory-backend-ram,id=mem0,size=4G,max-size=8G \
> -device virtio-mem-pci,id=reg0,memdev=mem0,node=0 \
> -object memory-backend-ram,id=mem1,size=3G,max-size=8G \
> -device virtio-mem-pci,id=reg1,memdev=mem1,node=1
>
> 2. Listing current memory assignment:
>
> --> (qemu) info memory-devices
> Memory device [virtio-mem]: "reg0"
> addr: 0x140000000
> node: 0
> size: 4294967296
> max-size: 8589934592
> memdev: /objects/mem0
> Memory device [virtio-mem]: "reg1"
> addr: 0x340000000
> node: 1
> size: 3221225472
> max-size: 8589934592
> memdev: /objects/mem1
> --> (qemu) info numa
> 2 nodes
> node 0 cpus: 0 1
> node 0 size: 6144 MB
> node 1 cpus: 2 3
> node 1 size: 5120 MB
>
> 3. Resize a virtio-mem device: Unplugging memory.
> Setting reg0 to 2G (remove 2G from NUMA node 0)
>
> --> (qemu) virtio-mem reg0 2048
> virtio-mem reg0 2048
> --> (qemu) info numa
> info numa
> 2 nodes
> node 0 cpus: 0 1
> node 0 size: 4096 MB
> node 1 cpus: 2 3
> node 1 size: 5120 MB
>
> 4. Resize a virtio-mem device: Plugging memory
> Setting reg0 to 8G (adding 6G to NUMA node 0) will replug 2G and plug
> 4G, automatically re-sizing the memory area. You might experience
> random crashes at this point if the host kernel missed a KVM patch
> (as the memory slot is not re-sized in an atomic fashion).
>
> --> (qemu) virtio-mem reg0 8192
> virtio-mem reg0 8192
> --> (qemu) info numa
> info numa
> 2 nodes
> node 0 cpus: 0 1
> node 0 size: 10240 MB
> node 1 cpus: 2 3
> node 1 size: 5120 MB
>
> 5. Resize a virtio-mem device: Try to unplug all memory.
> Setting reg0 to 0G (removing 8G from NUMA node 0) will not work. The
> guest will not be able to unplug all memory. In my example, 164M
> cannot be unplugged (out of memory).
>
> --> (qemu) virtio-mem reg0 0
> virtio-mem reg0 0
> --> (qemu) info numa
> info numa
> 2 nodes
> node 0 cpus: 0 1
> node 0 size: 2212 MB
> node 1 cpus: 2 3
> node 1 size: 5120 MB
> --> (qemu) info virtio-mem reg0
> info virtio-mem reg0
> Status: ready
> Request status: vm-oom
> Page size: 2097152 bytes
> --> (qemu) info memory-devices
> Memory device [virtio-mem]: "reg0"
> addr: 0x140000000
> node: 0
> size: 171966464
> max-size: 8589934592
> memdev: /objects/mem0
> Memory device [virtio-mem]: "reg1"
> addr: 0x340000000
> node: 1
> size: 3221225472
> max-size: 8589934592
> memdev: /objects/mem1
>
> At any point, we can migrate our guest without having to care about
> modifying the QEMU command line on the target side. Simply start the
> target e.g. with an additional '-incoming "exec: cat IMAGE"' and you're
> done.
>
> ------------------------------------------------------------------------
> VI. Problems to solve / things to sort out / missing in prototype
> ------------------------------------------------------------------------
>
> General:
> - We need an async job API to send the unplug/replug/plug requests to
> the guest and query the state. [medium/hard]
> - Handle various alignment problems. [medium]
> - We need a virtio spec
>
> Relevant for plug:
> - Resize QEMU memory regions while the guest is running (esp. grow).
> While I implemented a demo solution for KVM memory slots, something
> similar would be needed for vhost. Re-sizing of memory slots has to be
> an atomic operation. [medium]
> - NUMA: Most probably the NUMA node should not be part of the virtio-mem
> device, this should rather be indicated via e.g. ACPI. [medium]
> - x86: Add the complete possible memory to the a820 map as reserved.
> [medium]
> - x86/powerpc/...: Indicate to which NUMA node the memory belongs using
> ACPI. [medium]
> - x86/powerpc/...: Share address space with ordinary DIMMS/NVDIMMs, for
> now this is blocked for simplicity. [medium/hard]
> - If the bitmaps become too big, migrate them like memory. [medium]
>
> Relevant for unplug:
> - Allocate memory in Linux from a specific memory range. Windows has a
> nice interface for that (at least it looks nice when reading the API).
> This could be done using fake NUMA nodes or a new ZONE. My prototype
> just uses a very ugly hack. [very hard]
> - Use userfaultfd WP (write-protect) insted of mprotect. Especially,
> have multiple userfaultfd user in QEMU at a time (postcopy).
> [medium/hard]
>
> Stuff for the future:
> - Huge pages are problematic (no ZERO page support). This might not be
> trivial to support. [hard/very hard]
> - Try to free struct pages, to avoid the 1.6% overhead [very very hard]
>
>
> ------------------------------------------------------------------------
> VII. Questions
> ------------------------------------------------------------------------
>
> To get unplug working properly, it will require quite some effort,
> that's why I want to get some basic feedback before continuing working
> on a RFC implementation + RFC virtio spec.
>
> a) Did I miss anything important? Are there any ultimate blockers that I
> ignored? Any concepts that are broken?
>
> b) Are there any alternatives? Any modifications that could make life
> easier while still taking care of the requirements?
>
> c) Are there other use cases we should care about and focus on?
>
> d) Am I missing any requirements? What else could be important for
> !cloud and cloud?
>
> e) Are there any possible solutions to the allocator problem (allocating
> memory from a specific memory area)? Please speak up!
>
> f) Anything unclear?
>
> e) Any feelings about this? Yay or nay?
>
>
> As you reached this point: Thanks for having a look!!! Highly appreciated!
>
>
> ------------------------------------------------------------------------
> VIII. Q&A
> ------------------------------------------------------------------------
>
> ---
> Q: What's the problem with ordinary memory hot(un)plug?
>
> A: 1. We can only unplug in the granularity we plugged. So we have to
> know in advance, how much memory we want to remove later on. If we
> plug a 2G dimm, we can only unplug a 2G dimm.
> 2. We might run out of memory slots. Although very unlikely, this
> would strike if we try to always plug small modules in order to be
> able to unplug again (e.g. loads of 128MB modules).
> 3. Any locked page in the guest can hinder us from unplugging a dimm.
> Even if memory was onlined as online_movable, a single locked page
> can hinder us from unplugging that memory dimm.
> 4. Memory has to be onlined as online_movable. If we don't put that
> memory into the movable zone, any non-movable kernel allocation
> could end up on it, turning the complete dimm unpluggable. As
> certain allocations cannot go into the movable zone (e.g. page
> tables), the ratio between online_movable/online memory depends on
> the workload in the guest. Ratios of 50% -70% are usually fine.
> But it could happen, that there is plenty of memory available,
> but kernel allocations fail. (source: Andrea Arcangeli)
> 5. Unplugging might require several attempts. It takes some time to
> migrate all memory from the dimm. At that point, it is then not
> really obvious why it failed, and whether it could ever succeed.
> 6. Windows does support memory hotplug but not memory hotunplug. So
> this could be a way to support it also for Windows.
> ---
> Q: Will this work with Windows?
>
> A: Most probably not in the current form. Memory has to be at least
> added to the a820 map and ACPI (NUMA). Hyper-V ballon is also able to
> hotadd memory using a paravirtualized interface, so there are very
> good chances that this will work. But we won't know for sure until we
> also start prototyping.
> ---
> Q: How does this compare to virtio-balloo?
>
> A: In contrast to virtio-balloon, virtio-mem
> 1. Supports multiple page sizes, even different ones for different
> virtio-mem devices in a guest.
> 2. Is NUMA aware.
> 3. Is able to add more memory.
> 4. Doesn't work on all memory, but only on the managed one.
> 5. Has guarantees. There is now way for the guest to reclaim memory.
> ---
> Q: How does this compare to XEN balloon?
>
> A: XEN balloon also has a way to hotplug new memory. However, on a
> reboot, the guest will "see" more memory than it actually has.
> Compared to XEN balloon, virtio-mem:
> 1. Supports multiple page sizes.
> 2. Is NUMA aware.
> 3. The guest can survive a reboot into a system without the guest
> driver. If the XEN guest driver doesn't come up, the guest will
> get killed once it touches too much memory.
> 4. Reboots don't require any hacks.
> 5. The guest knows which memory is special. And it remains special
> during a reboot. Hotplugged memory not suddenly becomes base
> memory. The balloon mechanism will only work on a specific memory
> area.
> ---
> Q: How does this compare to Hyper-V balloon?
>
> A: Based on the code from the Linux Hyper-V balloon driver, I can say
> that Hyper-V also has a way to hotplug new memory. However, memory
> will remain plugged on a reboot. Therefore, the guest will see more
> memory than the hypervisor actually wants to assign to it.
> Virtio-mem in contrast:
> 1. Supports multiple page sizes.
> 2. Is NUMA aware.
> 3. I have no idea what happens under Hyper-v when
> a) rebooting into a guest without a fitting guest driver
> b) kexec() touches all memory
> c) the guest misbehaves
> 4. The guest knows which memory is special. And it remains special
> during a reboot. Hotpplugged memory not suddenly becomes base
> memory. The balloon mechanism will only work on a specific memory
> area.
> In general, it looks like the hypervisor has to deal with malicious
> guests trying to access more memory than desired by providing enough
> swap space.
> ---
> Q: How is virtio-mem NUMA aware?
>
> A: Each virtio-mem device belongs exactly to one NUMA node (if NUMA is
> enabled). As we can resize these regions separately, we can control
> from/to which node to remove/add memory.
> ---
> Q: Why do we need support for multiple page sizes?
>
> A: If huge pages are used in the host, we can only guarantee that they
> are not accessible by the guest anymore, if the guest gives up memory
> in this granularity. We prepare for that. Also, powerpc can have 64k
> pages in the host but 4k pages in the guest. So the guest must only
> give up 64k chunks. In addition, unplugging 4k pages might be bad
> when it comes to fragmentation. My prototype currently uses 256k. We
> can make this configurable - and it can vary for each virtio-mem
> device.
> ---
> Q: What are the limitations with paravirtualized memory hotplug?
>
> A: The same as for DIMM based hotplug, but we don't run out of any
> memory/ACPI slots. E.g. on x86 Linux, only 128MB chunks can be
> hotplugged, on x86 Windows it's 2MB. In addition, of course we
> have to take care of maximum address limits in the guest. The idea
> is to communicate these limits to the hypervisor via virtio-mem,
> to give hints when trying to add/remove memory.
> ---
> Q: Why not simply unplug *any* memory like virtio-balloon does?
>
> A: This could be done and a previous prototype did it like that.
> However, there are some points to consider here.
> 1. If we combine this with ordinary memory hotplug (DIMM), we most
> likely won't be able to unplug DIMMs anymore as virtio-mem memory
> gets "allocated" on these.
> 2. All guests using virtio-mem cannot use huge pages as backing
> storage at all (as virtio-mem only supports anonymous pages).
> 3. We need to track unplugged memory for the complete address space,
> so we need a global state in QEMU. Bitmaps get bigger. We will not
> be abe to dynamically grow the bitmaps for a virtio-mem device.
> 4. Resolving/checking memory to be unplugged gets significantly
> harder. How should the guest know which memory it can unplug for a
> specific virtio-mem device? E.g. if NUMA is active, only that NUMA
> node to which a virtio-mem device belongs can be used.
> 5. We will need userfaultfd handler for the complete address space,
> not just for the virtio-mem managed memory.
> Especially, if somebody hotplugs a DIMM, we dynamically will have
> to enable the userfaultfd handler.
> 6. What shall we do if somebody hotplugs a DIMM with huge pages? How
> should we tell the guest, that this memory cannot be used for
> unplugging?
> In summary: This concept is way cleaner, but also harder to
> implement.
> ---
> Q: Why not reuse virtio-balloon?
>
> A: virtio-balloon is for cooperative memory management. It has a fixed
> page size and will deflate in certain situations. Any change we
> introduce will break backwards compatibility. virtio-balloon was not
> designed to give guarantees. Nobody can hinder the guest from
> deflating/reusing inflated memory. In addition, it might make perfect
> sense to have both, virtio-balloon and virtio-mem at the same time,
> especially looking at the DEFLATE_ON_OOM or STATS features of
> virtio-balloon. While virtio-mem is all about guarantees, virtio-
> balloon is about cooperation.
> ---
> Q: Why not reuse acpi hotplug?
>
> A: We can easily run out of slots, migration in QEMU will just be
> horrible and we don't want to bind virtio* to architecture specific
> technologies.
> E.g. thinking about s390x - no ACPI. Also, mixing an ACPI driver with
> a virtio-driver sounds very weird. If the virtio-driver performs the
> hotplug itself, we might later perform some extra tricks: e.g.
> actually unplug certain regions to give up some struct pages.
>
> We want to manage the way memory is added/removed completely in QEMU.
> We cannot simply add new device from within QEMU and expect that
> migration in QEMU will work.
> ---
> Q: Why do we need resizable memory regions?
>
> A: Migration in QEMU is special. Any device we have on our source VM has
> to already be around on our target VM. So simply creating random
> devides internally in QEMU is not going to work. The concept of
> resizable memory regions in QEMU already exists and is part of the
> migration protocol. Before memory is migrated, the memory is resized.
> So in essence, this makes migration support _a lot_ easier.
>
> In addition, we won't run in any slot number restriction when
> automatically managing how to add memory in QEMU.
> ---
> Q: Why do we have to resize memory regions on a reboot?
>
> A: We have to compensate all memory that has been unplugged for that
> area by shrinking it, so that a fresh guest can use all memory when
> initializing the virtio-mem device.
> ---
> Q: Why do we need userfaultfd?
>
> A: mprotect() will create a lot of VMAs in the kernel. This will degrade
> performance and might even fail at one point. userfaultfd avoids this
> by not creating a new VMA for every protected range. userfaultfd WP
> is currently still under development and suffers from false positives
> that make it currently impossible to properly integrate this into the
> prototype.
> ---
> Q: Why do we have to allow reading unplugged memory?
>
> A: E.g. if the guest crashes and want's to write a memory dump, it will
> blindly access all memory. While we could find ways to fixup kexec,
> Windows dumps might be more problematic. Allowing the guest to read
> all memory (resulting in reading all 0's) safes us from a lot of
> trouble.
>
> The downside is, that page tables full of zero pages might be
> created. (we might be able to find ways to optimize this)
> ---
> Q: Will this work with postcopy live-migration?
>
> A: Not in the current form. And it doesn't really make sense to spend
> time on it as long as we don't use userfaultfd. Combining both
> handlers will be interesting. It can be done with some effort on the
> QEMU side.
> ---
> Q: What's the problem with shmem/hugetlbfs?
>
> A: We currently rely on the ZERO page to be mapped when the guest tries
> to read unplugged memory. For shmem/hugetlbfs, there is no ZERO page,
> so read access would result in memory getting populated. We could
> either introduce an explicit ZERO page, or manage it using one dummy
> ZERO page (using regular usefaultfd, allow only one such page to be
> mapped at a time). For now, only anonymous memory.
> ---
> Q: Ripping out random page ranges, won't this fragment our guest memory?
>
> A: Yes, but depending on the virtio-mem page size, this might be more or
> less problematic. The smaller the virtio-mem page size, the more we
> fragment and make small allocations fail. The bigger the virtio-mem
> page size, the higher the chance that we can't unplug any more
> memory.
> ---
> Q: Why can't we use memory compaction like virtio-balloon?
>
> A: If the virtio-mem page size > PAGE_SIZE, we can't do ordinary
> page migration, migration would have to be done in blocks. We could
> later add an guest->host virtqueue, via which the guest can
> "exchange" memory ranges. However, also mm has to support this kind
> of migration. So it is not completely out of scope, but will require
> quite some work.
> ---
> Q: Do we really need yet another paravirtualized interface for this?
>
> A: You tell me :)
> ---
>
> Thanks,
>
> David
>
--
Thanks,
David
^ permalink raw reply
* Re: [PATCH 7/8] drm: Nuke drm_atomic_helper_connector_dpms
From: Philipp Zabel @ 2017-07-25 8:59 UTC (permalink / raw)
To: Daniel Vetter
Cc: Martyn Welch, Neil Armstrong, David Airlie, nouveau,
DRI Development, virtualization, Andrzej Hajda, Tomi Valkeinen,
linux-mediatek, Laurent Pinchart, Benjamin Gaignard,
Romain Perier, Daniel Vetter, Jyri Sarha, Heiko Stuebner,
Marek Vasut, linux-renesas-soc, Archit Taneja, Lars-Peter Clausen,
Joonyoung Shim, Kevin Hilman, Alexey Brodkin, Russell
In-Reply-To: <20170725080122.20548-8-daniel.vetter@ffwll.ch>
On Tue, 2017-07-25 at 10:01 +0200, Daniel Vetter wrote:
> It's dead code, the core handles all this directly now.
>
> The only special case is nouveau and tda988x which used one function
> for both legacy modeset code and -nv50 atomic world instead of 2
> vtables. But amounts to exactly the same.
>
> v2: Rebase over the panel/brideg refactorings in stm/ltdc.
>
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
[...]
> drivers/gpu/drm/imx/imx-ldb.c | 1 -
> drivers/gpu/drm/imx/imx-tve.c | 1 -
> drivers/gpu/drm/imx/parallel-display.c | 1 -
> drivers/gpu/drm/mediatek/mtk_dsi.c | 1 -
> drivers/gpu/drm/mediatek/mtk_hdmi.c | 1 -
Acked-by: Philipp Zabel <p.zabel@pengutronix.de>
regards
Philipp
^ permalink raw reply
* Re: [PATCH 7/8] drm: Nuke drm_atomic_helper_connector_dpms
From: Archit Taneja @ 2017-07-25 9:30 UTC (permalink / raw)
To: Daniel Vetter, Intel Graphics Development
Cc: Martyn Welch, Neil Armstrong, David Airlie, nouveau, Stefan Agner,
virtualization, Andrzej Hajda, Tomi Valkeinen, linux-mediatek,
Laurent Pinchart, Benjamin Gaignard, Romain Perier, Daniel Vetter,
Jyri Sarha, Heiko Stuebner, Marek Vasut, linux-renesas-soc,
Lars-Peter Clausen, Joonyoung Shim, Kevin Hilman, Alexey Brodkin,
Russell King, Krzysztof Kozlowski
In-Reply-To: <20170725080122.20548-8-daniel.vetter@ffwll.ch>
On 07/25/2017 01:31 PM, Daniel Vetter wrote:
> It's dead code, the core handles all this directly now.
>
> The only special case is nouveau and tda988x which used one function
> for both legacy modeset code and -nv50 atomic world instead of 2
> vtables. But amounts to exactly the same.
>
> v2: Rebase over the panel/brideg refactorings in stm/ltdc.
s/brideg/bridge
<snip>
> ---
> drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 1 -
> drivers/gpu/drm/bridge/analogix-anx78xx.c | 1 -
> drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 1 -
> drivers/gpu/drm/bridge/dumb-vga-dac.c | 1 -
> .../drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c | 1 -
> drivers/gpu/drm/bridge/nxp-ptn3460.c | 1 -
> drivers/gpu/drm/bridge/panel.c | 1 -
> drivers/gpu/drm/bridge/parade-ps8622.c | 1 -
> drivers/gpu/drm/bridge/sii902x.c | 1 -
> drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 1 -
> drivers/gpu/drm/bridge/tc358767.c | 1 -
> drivers/gpu/drm/bridge/ti-tfp410.c | 1 -
For bridge changes:
Acked-by: Archit Taneja <architt@codeaurora.org>
Archit
--
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project
^ permalink raw reply
* Re: [PATCH v12 6/8] mm: support reporting free page blocks
From: Wei Wang @ 2017-07-25 9:32 UTC (permalink / raw)
To: Michal Hocko
Cc: aarcange, virtio-dev, amit.shah, kvm, Michael S. Tsirkin,
linux-kernel, liliang.opensource, qemu-devel, virtualization,
linux-mm, yang.zhang.wz, quan.xu, cornelia.huck, pbonzini, akpm,
mgorman
In-Reply-To: <20170724090042.GF25221@dhcp22.suse.cz>
On 07/24/2017 05:00 PM, Michal Hocko wrote:
> On Wed 19-07-17 20:01:18, Wei Wang wrote:
>> On 07/19/2017 04:13 PM, Michal Hocko wrote:
> [...
>>> All you should need is the check for the page reference count, no? I
>>> assume you do some sort of pfn walk and so you should be able to get an
>>> access to the struct page.
>> Not necessarily - the guest struct page is not seen by the hypervisor. The
>> hypervisor only gets those guest pfns which are hinted as unused. From the
>> hypervisor (host) point of view, a guest physical address corresponds to a
>> virtual address of a host process. So, once the hypervisor knows a guest
>> physical page is unsued, it knows that the corresponding virtual memory of
>> the process doesn't need to be transferred in the 1st round.
> I am sorry, but I do not understand. Why cannot _guest_ simply check the
> struct page ref count and send them to the hypervisor?
Were you suggesting the following?
1) get a free page block from the page list using the API;
2) if page->ref_count == 0, send it to the hypervisor
Btw, ref_count may also change at any time.
> Is there any
> documentation which describes the workflow or code which would use your
> new API?
>
It's used in the balloon driver (patch 8). We don't have any docs yet, but
I think the high level workflow is the two steps above.
Best,
Wei
^ permalink raw reply
* Re: [PATCH 7/8] drm: Nuke drm_atomic_helper_connector_dpms
From: Philippe CORNU @ 2017-07-25 10:07 UTC (permalink / raw)
To: Daniel Vetter, Intel Graphics Development
Cc: Martyn Welch, Neil Armstrong, David Airlie,
nouveau@lists.freedesktop.org, DRI Development,
virtualization@lists.linux-foundation.org, Andrzej Hajda,
Tomi Valkeinen, linux-mediatek@lists.infradead.org,
Laurent Pinchart, Benjamin Gaignard, Romain Perier, Daniel Vetter,
Jyri Sarha, Heiko Stuebner, Marek Vasut,
linux-renesas-soc@vger.kernel.org, Archit Taneja, Lars-Pete
In-Reply-To: <20170725080122.20548-8-daniel.vetter@ffwll.ch>
On 07/25/2017 10:01 AM, Daniel Vetter wrote:
> It's dead code, the core handles all this directly now.
>
> The only special case is nouveau and tda988x which used one function
> for both legacy modeset code and -nv50 atomic world instead of 2
> vtables. But amounts to exactly the same.
>
> v2: Rebase over the panel/brideg refactorings in stm/ltdc.
>
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> Cc: Archit Taneja <architt@codeaurora.org>
> Cc: Andrzej Hajda <a.hajda@samsung.com>
> Cc: Laurent Pinchart <Laurent.pinchart@ideasonboard.com>
> Cc: Peter Senna Tschudin <peter.senna@collabora.com>
> Cc: Martin Donnelly <martin.donnelly@ge.com>
> Cc: Martyn Welch <martyn.welch@collabora.co.uk>
> Cc: Daniel Vetter <daniel.vetter@intel.com>
> Cc: Jani Nikula <jani.nikula@linux.intel.com>
> Cc: Sean Paul <seanpaul@chromium.org>
> Cc: David Airlie <airlied@linux.ie>
> Cc: Inki Dae <inki.dae@samsung.com>
> Cc: Joonyoung Shim <jy0922.shim@samsung.com>
> Cc: Seung-Woo Kim <sw0312.kim@samsung.com>
> Cc: Kyungmin Park <kyungmin.park@samsung.com>
> Cc: Kukjin Kim <kgene@kernel.org>
> Cc: Krzysztof Kozlowski <krzk@kernel.org>
> Cc: Stefan Agner <stefan@agner.ch>
> Cc: Alison Wang <alison.wang@freescale.com>
> Cc: Russell King <linux@armlinux.org.uk>
> Cc: Philipp Zabel <p.zabel@pengutronix.de>
> Cc: CK Hu <ck.hu@mediatek.com>
> Cc: Matthias Brugger <matthias.bgg@gmail.com>
> Cc: Neil Armstrong <narmstrong@baylibre.com>
> Cc: Carlo Caione <carlo@caione.org>
> Cc: Kevin Hilman <khilman@baylibre.com>
> Cc: Marek Vasut <marex@denx.de>
> Cc: Ben Skeggs <bskeggs@redhat.com>
> Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
> Cc: Eric Anholt <eric@anholt.net>
> Cc: Mark Yao <mark.yao@rock-chips.com>
> Cc: Heiko Stuebner <heiko@sntech.de>
> Cc: Benjamin Gaignard <benjamin.gaignard@linaro.org>
> Cc: Vincent Abriou <vincent.abriou@st.com>
> Cc: Yannick Fertre <yannick.fertre@st.com>
> Cc: Philippe Cornu <philippe.cornu@st.com>
Tested-by: Philippe Cornu <philippe.cornu@st.com> (on stm)
Many thanks
Philippe :-)
> Cc: Maxime Ripard <maxime.ripard@free-electrons.com>
> Cc: Chen-Yu Tsai <wens@csie.org>
> Cc: Thierry Reding <thierry.reding@gmail.com>
> Cc: Jonathan Hunter <jonathanh@nvidia.com>
> Cc: Jyri Sarha <jsarha@ti.com>
> Cc: Gerd Hoffmann <kraxel@redhat.com>
> Cc: Shawn Guo <shawnguo@kernel.org>
> Cc: John Stultz <john.stultz@linaro.org>
> Cc: Lars-Peter Clausen <lars@metafoo.de>
> Cc: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
> Cc: Jeffy Chen <jeffy.chen@rock-chips.com>
> Cc: Tomeu Vizoso <tomeu.vizoso@collabora.com>
> Cc: Yakir Yang <kuankuan.y@gmail.com>
> Cc: Marek Szyprowski <m.szyprowski@samsung.com>
> Cc: Jose Abreu <Jose.Abreu@synopsys.com>
> Cc: Romain Perier <romain.perier@collabora.com>
> Cc: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
> Cc: Xinliang Liu <z.liuxinliang@hisilicon.com>
> Cc: Alexey Brodkin <abrodkin@synopsys.com>
> Cc: Alex Deucher <alexander.deucher@amd.com>
> Cc: Rongrong Zou <zourongrong@gmail.com>
> Cc: Rob Clark <robdclark@gmail.com>
> Cc: Hai Li <hali@codeaurora.org>
> Cc: "Noralf Trønnes" <noralf@tronnes.org>
> Cc: linux-arm-kernel@lists.infradead.org
> Cc: linux-samsung-soc@vger.kernel.org
> Cc: intel-gfx@lists.freedesktop.org
> Cc: linux-mediatek@lists.infradead.org
> Cc: linux-amlogic@lists.infradead.org
> Cc: nouveau@lists.freedesktop.org
> Cc: linux-renesas-soc@vger.kernel.org
> Cc: linux-rockchip@lists.infradead.org
> Cc: linux-tegra@vger.kernel.org
> Cc: virtualization@lists.linux-foundation.org
> Cc: zain wang <wzz@rock-chips.com>
> Cc: Baoyou Xie <baoyou.xie@linaro.org>
> Cc: Boris Brezillon <boris.brezillon@free-electrons.com>
> ---
> drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 1 -
> drivers/gpu/drm/bridge/analogix-anx78xx.c | 1 -
> drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 1 -
> drivers/gpu/drm/bridge/dumb-vga-dac.c | 1 -
> .../drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c | 1 -
> drivers/gpu/drm/bridge/nxp-ptn3460.c | 1 -
> drivers/gpu/drm/bridge/panel.c | 1 -
> drivers/gpu/drm/bridge/parade-ps8622.c | 1 -
> drivers/gpu/drm/bridge/sii902x.c | 1 -
> drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 1 -
> drivers/gpu/drm/bridge/tc358767.c | 1 -
> drivers/gpu/drm/bridge/ti-tfp410.c | 1 -
> drivers/gpu/drm/drm_atomic_helper.c | 79 ----------------------
> drivers/gpu/drm/exynos/exynos_drm_dpi.c | 1 -
> drivers/gpu/drm/exynos/exynos_drm_dsi.c | 1 -
> drivers/gpu/drm/exynos/exynos_drm_vidi.c | 1 -
> drivers/gpu/drm/exynos/exynos_hdmi.c | 1 -
> drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c | 1 -
> drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c | 1 -
> drivers/gpu/drm/i2c/tda998x_drv.c | 10 +--
> drivers/gpu/drm/i915/intel_crt.c | 1 -
> drivers/gpu/drm/i915/intel_dp.c | 1 -
> drivers/gpu/drm/i915/intel_dp_mst.c | 1 -
> drivers/gpu/drm/i915/intel_dsi.c | 1 -
> drivers/gpu/drm/i915/intel_dvo.c | 1 -
> drivers/gpu/drm/i915/intel_hdmi.c | 1 -
> drivers/gpu/drm/i915/intel_lvds.c | 1 -
> drivers/gpu/drm/i915/intel_sdvo.c | 1 -
> drivers/gpu/drm/i915/intel_tv.c | 1 -
> drivers/gpu/drm/imx/imx-ldb.c | 1 -
> drivers/gpu/drm/imx/imx-tve.c | 1 -
> drivers/gpu/drm/imx/parallel-display.c | 1 -
> drivers/gpu/drm/mediatek/mtk_dsi.c | 1 -
> drivers/gpu/drm/mediatek/mtk_hdmi.c | 1 -
> drivers/gpu/drm/meson/meson_venc_cvbs.c | 1 -
> drivers/gpu/drm/msm/dsi/dsi_manager.c | 1 -
> drivers/gpu/drm/msm/edp/edp_connector.c | 1 -
> drivers/gpu/drm/msm/hdmi/hdmi_connector.c | 1 -
> drivers/gpu/drm/msm/mdp/mdp4/mdp4_lvds_connector.c | 1 -
> drivers/gpu/drm/mxsfb/mxsfb_out.c | 1 -
> drivers/gpu/drm/nouveau/nouveau_connector.c | 12 +---
> drivers/gpu/drm/nouveau/nv50_display.c | 1 -
> drivers/gpu/drm/omapdrm/omap_connector.c | 1 -
> drivers/gpu/drm/pl111/pl111_connector.c | 1 -
> drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c | 1 -
> drivers/gpu/drm/rockchip/cdn-dp-core.c | 1 -
> drivers/gpu/drm/rockchip/dw-mipi-dsi.c | 1 -
> drivers/gpu/drm/rockchip/inno_hdmi.c | 1 -
> drivers/gpu/drm/sti/sti_dvo.c | 1 -
> drivers/gpu/drm/sti/sti_hda.c | 1 -
> drivers/gpu/drm/sti/sti_hdmi.c | 1 -
> drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 1 -
> drivers/gpu/drm/sun4i/sun4i_rgb.c | 1 -
> drivers/gpu/drm/sun4i/sun4i_tv.c | 1 -
> drivers/gpu/drm/tegra/dsi.c | 1 -
> drivers/gpu/drm/tegra/hdmi.c | 1 -
> drivers/gpu/drm/tegra/rgb.c | 1 -
> drivers/gpu/drm/tegra/sor.c | 1 -
> drivers/gpu/drm/tilcdc/tilcdc_panel.c | 1 -
> drivers/gpu/drm/tilcdc/tilcdc_tfp410.c | 1 -
> drivers/gpu/drm/tinydrm/core/tinydrm-pipe.c | 1 -
> drivers/gpu/drm/vc4/vc4_hdmi.c | 1 -
> drivers/gpu/drm/vc4/vc4_vec.c | 1 -
> drivers/gpu/drm/virtio/virtgpu_display.c | 1 -
> drivers/gpu/drm/zte/zx_hdmi.c | 1 -
> drivers/gpu/drm/zte/zx_tvenc.c | 1 -
> drivers/gpu/drm/zte/zx_vga.c | 1 -
> include/drm/drm_atomic_helper.h | 2 -
> 68 files changed, 3 insertions(+), 164 deletions(-)
>
> diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
> index ff9792d350c8..682c090fa3ed 100644
> --- a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
> +++ b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
> @@ -786,7 +786,6 @@ adv7511_connector_detect(struct drm_connector *connector, bool force)
> }
>
> static struct drm_connector_funcs adv7511_connector_funcs = {
> - .dpms = drm_atomic_helper_connector_dpms,
> .fill_modes = drm_helper_probe_single_connector_modes,
> .detect = adv7511_connector_detect,
> .destroy = drm_connector_cleanup,
> diff --git a/drivers/gpu/drm/bridge/analogix-anx78xx.c b/drivers/gpu/drm/bridge/analogix-anx78xx.c
> index dc045e0c32fc..9385eb0b1ee4 100644
> --- a/drivers/gpu/drm/bridge/analogix-anx78xx.c
> +++ b/drivers/gpu/drm/bridge/analogix-anx78xx.c
> @@ -1002,7 +1002,6 @@ static enum drm_connector_status anx78xx_detect(struct drm_connector *connector,
> }
>
> static const struct drm_connector_funcs anx78xx_connector_funcs = {
> - .dpms = drm_atomic_helper_connector_dpms,
> .fill_modes = drm_helper_probe_single_connector_modes,
> .detect = anx78xx_detect,
> .destroy = drm_connector_cleanup,
> diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
> index 4c758ed51939..5dd3f1cd074a 100644
> --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
> +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
> @@ -1005,7 +1005,6 @@ analogix_dp_detect(struct drm_connector *connector, bool force)
> }
>
> static const struct drm_connector_funcs analogix_dp_connector_funcs = {
> - .dpms = drm_atomic_helper_connector_dpms,
> .fill_modes = drm_helper_probe_single_connector_modes,
> .detect = analogix_dp_detect,
> .destroy = drm_connector_cleanup,
> diff --git a/drivers/gpu/drm/bridge/dumb-vga-dac.c b/drivers/gpu/drm/bridge/dumb-vga-dac.c
> index 8a52539e618e..de5e7dee7ad6 100644
> --- a/drivers/gpu/drm/bridge/dumb-vga-dac.c
> +++ b/drivers/gpu/drm/bridge/dumb-vga-dac.c
> @@ -92,7 +92,6 @@ dumb_vga_connector_detect(struct drm_connector *connector, bool force)
> }
>
> static const struct drm_connector_funcs dumb_vga_con_funcs = {
> - .dpms = drm_atomic_helper_connector_dpms,
> .detect = dumb_vga_connector_detect,
> .fill_modes = drm_helper_probe_single_connector_modes,
> .destroy = drm_connector_cleanup,
> diff --git a/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c b/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c
> index 11f11086a68f..7ccadba7c98c 100644
> --- a/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c
> +++ b/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c
> @@ -193,7 +193,6 @@ static enum drm_connector_status ge_b850v3_lvds_detect(
> }
>
> static const struct drm_connector_funcs ge_b850v3_lvds_connector_funcs = {
> - .dpms = drm_atomic_helper_connector_dpms,
> .fill_modes = drm_helper_probe_single_connector_modes,
> .detect = ge_b850v3_lvds_detect,
> .destroy = drm_connector_cleanup,
> diff --git a/drivers/gpu/drm/bridge/nxp-ptn3460.c b/drivers/gpu/drm/bridge/nxp-ptn3460.c
> index f0b5d0fc8594..d64a3283822a 100644
> --- a/drivers/gpu/drm/bridge/nxp-ptn3460.c
> +++ b/drivers/gpu/drm/bridge/nxp-ptn3460.c
> @@ -238,7 +238,6 @@ static const struct drm_connector_helper_funcs ptn3460_connector_helper_funcs =
> };
>
> static const struct drm_connector_funcs ptn3460_connector_funcs = {
> - .dpms = drm_atomic_helper_connector_dpms,
> .fill_modes = drm_helper_probe_single_connector_modes,
> .destroy = drm_connector_cleanup,
> .reset = drm_atomic_helper_connector_reset,
> diff --git a/drivers/gpu/drm/bridge/panel.c b/drivers/gpu/drm/bridge/panel.c
> index 685c1a480201..59288b248dc5 100644
> --- a/drivers/gpu/drm/bridge/panel.c
> +++ b/drivers/gpu/drm/bridge/panel.c
> @@ -50,7 +50,6 @@ panel_bridge_connector_helper_funcs = {
> };
>
> static const struct drm_connector_funcs panel_bridge_connector_funcs = {
> - .dpms = drm_atomic_helper_connector_dpms,
> .reset = drm_atomic_helper_connector_reset,
> .fill_modes = drm_helper_probe_single_connector_modes,
> .destroy = drm_connector_cleanup,
> diff --git a/drivers/gpu/drm/bridge/parade-ps8622.c b/drivers/gpu/drm/bridge/parade-ps8622.c
> index 4f7725d4a309..81198f5e9afa 100644
> --- a/drivers/gpu/drm/bridge/parade-ps8622.c
> +++ b/drivers/gpu/drm/bridge/parade-ps8622.c
> @@ -476,7 +476,6 @@ static const struct drm_connector_helper_funcs ps8622_connector_helper_funcs = {
> };
>
> static const struct drm_connector_funcs ps8622_connector_funcs = {
> - .dpms = drm_atomic_helper_connector_dpms,
> .fill_modes = drm_helper_probe_single_connector_modes,
> .destroy = drm_connector_cleanup,
> .reset = drm_atomic_helper_connector_reset,
> diff --git a/drivers/gpu/drm/bridge/sii902x.c b/drivers/gpu/drm/bridge/sii902x.c
> index 9efb7b8fad57..b1ab4ab09532 100644
> --- a/drivers/gpu/drm/bridge/sii902x.c
> +++ b/drivers/gpu/drm/bridge/sii902x.c
> @@ -124,7 +124,6 @@ sii902x_connector_detect(struct drm_connector *connector, bool force)
> }
>
> static const struct drm_connector_funcs sii902x_connector_funcs = {
> - .dpms = drm_atomic_helper_connector_dpms,
> .detect = sii902x_connector_detect,
> .fill_modes = drm_helper_probe_single_connector_modes,
> .destroy = drm_connector_cleanup,
> diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
> index 60faf2d2bc6b..91ac849604a8 100644
> --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
> +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
> @@ -1920,7 +1920,6 @@ static void dw_hdmi_connector_force(struct drm_connector *connector)
> }
>
> static const struct drm_connector_funcs dw_hdmi_connector_funcs = {
> - .dpms = drm_atomic_helper_connector_dpms,
> .fill_modes = drm_helper_probe_single_connector_modes,
> .detect = dw_hdmi_connector_detect,
> .destroy = drm_connector_cleanup,
> diff --git a/drivers/gpu/drm/bridge/tc358767.c b/drivers/gpu/drm/bridge/tc358767.c
> index 12a35f9c3adc..503252d6a74d 100644
> --- a/drivers/gpu/drm/bridge/tc358767.c
> +++ b/drivers/gpu/drm/bridge/tc358767.c
> @@ -1160,7 +1160,6 @@ static const struct drm_connector_helper_funcs tc_connector_helper_funcs = {
> };
>
> static const struct drm_connector_funcs tc_connector_funcs = {
> - .dpms = drm_atomic_helper_connector_dpms,
> .fill_modes = drm_helper_probe_single_connector_modes,
> .destroy = drm_connector_cleanup,
> .reset = drm_atomic_helper_connector_reset,
> diff --git a/drivers/gpu/drm/bridge/ti-tfp410.c b/drivers/gpu/drm/bridge/ti-tfp410.c
> index 7ea2a15e8807..acb857030951 100644
> --- a/drivers/gpu/drm/bridge/ti-tfp410.c
> +++ b/drivers/gpu/drm/bridge/ti-tfp410.c
> @@ -102,7 +102,6 @@ tfp410_connector_detect(struct drm_connector *connector, bool force)
> }
>
> static const struct drm_connector_funcs tfp410_con_funcs = {
> - .dpms = drm_atomic_helper_connector_dpms,
> .detect = tfp410_connector_detect,
> .fill_modes = drm_helper_probe_single_connector_modes,
> .destroy = drm_connector_cleanup,
> diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c
> index 1ca0dcca6230..877733ae44ac 100644
> --- a/drivers/gpu/drm/drm_atomic_helper.c
> +++ b/drivers/gpu/drm/drm_atomic_helper.c
> @@ -3102,85 +3102,6 @@ int drm_atomic_helper_page_flip_target(struct drm_crtc *crtc,
> EXPORT_SYMBOL(drm_atomic_helper_page_flip_target);
>
> /**
> - * drm_atomic_helper_connector_dpms() - connector dpms helper implementation
> - * @connector: affected connector
> - * @mode: DPMS mode
> - *
> - * This is the main helper function provided by the atomic helper framework for
> - * implementing the legacy DPMS connector interface. It computes the new desired
> - * &drm_crtc_state.active state for the corresponding CRTC (if the connector is
> - * enabled) and updates it.
> - *
> - * Returns:
> - * Returns 0 on success, negative errno numbers on failure.
> - */
> -int drm_atomic_helper_connector_dpms(struct drm_connector *connector,
> - int mode)
> -{
> - struct drm_mode_config *config = &connector->dev->mode_config;
> - struct drm_atomic_state *state;
> - struct drm_crtc_state *crtc_state;
> - struct drm_crtc *crtc;
> - struct drm_connector *tmp_connector;
> - struct drm_connector_list_iter conn_iter;
> - int ret;
> - bool active = false;
> - int old_mode = connector->dpms;
> -
> - if (mode != DRM_MODE_DPMS_ON)
> - mode = DRM_MODE_DPMS_OFF;
> -
> - connector->dpms = mode;
> - crtc = connector->state->crtc;
> -
> - if (!crtc)
> - return 0;
> -
> - state = drm_atomic_state_alloc(connector->dev);
> - if (!state)
> - return -ENOMEM;
> -
> - state->acquire_ctx = crtc->dev->mode_config.acquire_ctx;
> -retry:
> - crtc_state = drm_atomic_get_crtc_state(state, crtc);
> - if (IS_ERR(crtc_state)) {
> - ret = PTR_ERR(crtc_state);
> - goto fail;
> - }
> -
> - WARN_ON(!drm_modeset_is_locked(&config->connection_mutex));
> -
> - drm_connector_list_iter_begin(connector->dev, &conn_iter);
> - drm_for_each_connector_iter(tmp_connector, &conn_iter) {
> - if (tmp_connector->state->crtc != crtc)
> - continue;
> -
> - if (tmp_connector->dpms == DRM_MODE_DPMS_ON) {
> - active = true;
> - break;
> - }
> - }
> - drm_connector_list_iter_end(&conn_iter);
> - crtc_state->active = active;
> -
> - ret = drm_atomic_commit(state);
> -fail:
> - if (ret == -EDEADLK)
> - goto backoff;
> - if (ret != 0)
> - connector->dpms = old_mode;
> - drm_atomic_state_put(state);
> - return ret;
> -
> -backoff:
> - drm_atomic_state_clear(state);
> - drm_atomic_legacy_backoff(state);
> -
> - goto retry;
> -}
> -EXPORT_SYMBOL(drm_atomic_helper_connector_dpms);
> -
> -/**
> * drm_atomic_helper_best_encoder - Helper for
> * &drm_connector_helper_funcs.best_encoder callback
> * @connector: Connector control structure
> diff --git a/drivers/gpu/drm/exynos/exynos_drm_dpi.c b/drivers/gpu/drm/exynos/exynos_drm_dpi.c
> index 63abcd280fa0..76d80e5de521 100644
> --- a/drivers/gpu/drm/exynos/exynos_drm_dpi.c
> +++ b/drivers/gpu/drm/exynos/exynos_drm_dpi.c
> @@ -59,7 +59,6 @@ static void exynos_dpi_connector_destroy(struct drm_connector *connector)
> }
>
> static const struct drm_connector_funcs exynos_dpi_connector_funcs = {
> - .dpms = drm_atomic_helper_connector_dpms,
> .detect = exynos_dpi_detect,
> .fill_modes = drm_helper_probe_single_connector_modes,
> .destroy = exynos_dpi_connector_destroy,
> diff --git a/drivers/gpu/drm/exynos/exynos_drm_dsi.c b/drivers/gpu/drm/exynos/exynos_drm_dsi.c
> index f580be170089..4ea7cc7cb3de 100644
> --- a/drivers/gpu/drm/exynos/exynos_drm_dsi.c
> +++ b/drivers/gpu/drm/exynos/exynos_drm_dsi.c
> @@ -1537,7 +1537,6 @@ static void exynos_dsi_connector_destroy(struct drm_connector *connector)
> }
>
> static const struct drm_connector_funcs exynos_dsi_connector_funcs = {
> - .dpms = drm_atomic_helper_connector_dpms,
> .detect = exynos_dsi_detect,
> .fill_modes = drm_helper_probe_single_connector_modes,
> .destroy = exynos_dsi_connector_destroy,
> diff --git a/drivers/gpu/drm/exynos/exynos_drm_vidi.c b/drivers/gpu/drm/exynos/exynos_drm_vidi.c
> index cb8a72842537..9186a654c3b5 100644
> --- a/drivers/gpu/drm/exynos/exynos_drm_vidi.c
> +++ b/drivers/gpu/drm/exynos/exynos_drm_vidi.c
> @@ -289,7 +289,6 @@ static void vidi_connector_destroy(struct drm_connector *connector)
> }
>
> static const struct drm_connector_funcs vidi_connector_funcs = {
> - .dpms = drm_atomic_helper_connector_dpms,
> .fill_modes = drm_helper_probe_single_connector_modes,
> .detect = vidi_detect,
> .destroy = vidi_connector_destroy,
> diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c
> index c953927fb0cb..0e2a472c3021 100644
> --- a/drivers/gpu/drm/exynos/exynos_hdmi.c
> +++ b/drivers/gpu/drm/exynos/exynos_hdmi.c
> @@ -835,7 +835,6 @@ static void hdmi_connector_destroy(struct drm_connector *connector)
> }
>
> static const struct drm_connector_funcs hdmi_connector_funcs = {
> - .dpms = drm_atomic_helper_connector_dpms,
> .fill_modes = drm_helper_probe_single_connector_modes,
> .detect = hdmi_detect,
> .destroy = hdmi_connector_destroy,
> diff --git a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c
> index dcbf3c06e1d8..edd7d8127d19 100644
> --- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c
> +++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c
> @@ -63,7 +63,6 @@ static const struct drm_connector_funcs fsl_dcu_drm_connector_funcs = {
> .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
> .atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
> .destroy = fsl_dcu_drm_connector_destroy,
> - .dpms = drm_atomic_helper_connector_dpms,
> .fill_modes = drm_helper_probe_single_connector_modes,
> .reset = drm_atomic_helper_connector_reset,
> };
> diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c
> index 12a18557c5fd..ec4dd9df9150 100644
> --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c
> +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c
> @@ -47,7 +47,6 @@ static const struct drm_connector_helper_funcs
> };
>
> static const struct drm_connector_funcs hibmc_connector_funcs = {
> - .dpms = drm_atomic_helper_connector_dpms,
> .fill_modes = drm_helper_probe_single_connector_modes,
> .destroy = drm_connector_cleanup,
> .reset = drm_atomic_helper_connector_reset,
> diff --git a/drivers/gpu/drm/i2c/tda998x_drv.c b/drivers/gpu/drm/i2c/tda998x_drv.c
> index d1e7ac540199..54e3255dde13 100644
> --- a/drivers/gpu/drm/i2c/tda998x_drv.c
> +++ b/drivers/gpu/drm/i2c/tda998x_drv.c
> @@ -969,14 +969,6 @@ static int tda998x_audio_codec_init(struct tda998x_priv *priv,
>
> /* DRM connector functions */
>
> -static int tda998x_connector_dpms(struct drm_connector *connector, int mode)
> -{
> - if (drm_core_check_feature(connector->dev, DRIVER_ATOMIC))
> - return drm_atomic_helper_connector_dpms(connector, mode);
> - else
> - return drm_helper_connector_dpms(connector, mode);
> -}
> -
> static int tda998x_connector_fill_modes(struct drm_connector *connector,
> uint32_t maxX, uint32_t maxY)
> {
> @@ -1014,7 +1006,7 @@ static void tda998x_connector_destroy(struct drm_connector *connector)
> }
>
> static const struct drm_connector_funcs tda998x_connector_funcs = {
> - .dpms = tda998x_connector_dpms,
> + .dpms = drm_helper_connector_dpms,
> .reset = drm_atomic_helper_connector_reset,
> .fill_modes = tda998x_connector_fill_modes,
> .detect = tda998x_connector_detect,
> diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c
> index 84c3a6dc7c2a..70e0ff41070c 100644
> --- a/drivers/gpu/drm/i915/intel_crt.c
> +++ b/drivers/gpu/drm/i915/intel_crt.c
> @@ -802,7 +802,6 @@ void intel_crt_reset(struct drm_encoder *encoder)
> */
>
> static const struct drm_connector_funcs intel_crt_connector_funcs = {
> - .dpms = drm_atomic_helper_connector_dpms,
> .fill_modes = drm_helper_probe_single_connector_modes,
> .late_register = intel_connector_register,
> .early_unregister = intel_connector_unregister,
> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> index 19b082ea57ef..76c8a0bd17f9 100644
> --- a/drivers/gpu/drm/i915/intel_dp.c
> +++ b/drivers/gpu/drm/i915/intel_dp.c
> @@ -5007,7 +5007,6 @@ void intel_dp_encoder_reset(struct drm_encoder *encoder)
> }
>
> static const struct drm_connector_funcs intel_dp_connector_funcs = {
> - .dpms = drm_atomic_helper_connector_dpms,
> .force = intel_dp_force,
> .fill_modes = drm_helper_probe_single_connector_modes,
> .atomic_get_property = intel_digital_connector_atomic_get_property,
> diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c b/drivers/gpu/drm/i915/intel_dp_mst.c
> index 59a6dfd48ed4..58568559711a 100644
> --- a/drivers/gpu/drm/i915/intel_dp_mst.c
> +++ b/drivers/gpu/drm/i915/intel_dp_mst.c
> @@ -346,7 +346,6 @@ intel_dp_mst_connector_destroy(struct drm_connector *connector)
> }
>
> static const struct drm_connector_funcs intel_dp_mst_connector_funcs = {
> - .dpms = drm_atomic_helper_connector_dpms,
> .detect = intel_dp_mst_detect,
> .fill_modes = drm_helper_probe_single_connector_modes,
> .late_register = intel_connector_register,
> diff --git a/drivers/gpu/drm/i915/intel_dsi.c b/drivers/gpu/drm/i915/intel_dsi.c
> index 375e7cfcf207..b0b3adf016f8 100644
> --- a/drivers/gpu/drm/i915/intel_dsi.c
> +++ b/drivers/gpu/drm/i915/intel_dsi.c
> @@ -1653,7 +1653,6 @@ static const struct drm_connector_helper_funcs intel_dsi_connector_helper_funcs
> };
>
> static const struct drm_connector_funcs intel_dsi_connector_funcs = {
> - .dpms = drm_atomic_helper_connector_dpms,
> .late_register = intel_connector_register,
> .early_unregister = intel_connector_unregister,
> .destroy = intel_dsi_connector_destroy,
> diff --git a/drivers/gpu/drm/i915/intel_dvo.c b/drivers/gpu/drm/i915/intel_dvo.c
> index 6b1970542911..baf369d2de30 100644
> --- a/drivers/gpu/drm/i915/intel_dvo.c
> +++ b/drivers/gpu/drm/i915/intel_dvo.c
> @@ -344,7 +344,6 @@ static void intel_dvo_destroy(struct drm_connector *connector)
> }
>
> static const struct drm_connector_funcs intel_dvo_connector_funcs = {
> - .dpms = drm_atomic_helper_connector_dpms,
> .detect = intel_dvo_detect,
> .late_register = intel_connector_register,
> .early_unregister = intel_connector_unregister,
> diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
> index 3074190b9455..2ef1ee85129d 100644
> --- a/drivers/gpu/drm/i915/intel_hdmi.c
> +++ b/drivers/gpu/drm/i915/intel_hdmi.c
> @@ -1761,7 +1761,6 @@ static void intel_hdmi_destroy(struct drm_connector *connector)
> }
>
> static const struct drm_connector_funcs intel_hdmi_connector_funcs = {
> - .dpms = drm_atomic_helper_connector_dpms,
> .detect = intel_hdmi_detect,
> .force = intel_hdmi_force,
> .fill_modes = drm_helper_probe_single_connector_modes,
> diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
> index 6579299f5d00..61d557948e21 100644
> --- a/drivers/gpu/drm/i915/intel_lvds.c
> +++ b/drivers/gpu/drm/i915/intel_lvds.c
> @@ -595,7 +595,6 @@ static const struct drm_connector_helper_funcs intel_lvds_connector_helper_funcs
> };
>
> static const struct drm_connector_funcs intel_lvds_connector_funcs = {
> - .dpms = drm_atomic_helper_connector_dpms,
> .detect = intel_lvds_detect,
> .fill_modes = drm_helper_probe_single_connector_modes,
> .atomic_get_property = intel_digital_connector_atomic_get_property,
> diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
> index a8eee1984ddf..bea8152ae859 100644
> --- a/drivers/gpu/drm/i915/intel_sdvo.c
> +++ b/drivers/gpu/drm/i915/intel_sdvo.c
> @@ -2193,7 +2193,6 @@ intel_sdvo_connector_duplicate_state(struct drm_connector *connector)
> }
>
> static const struct drm_connector_funcs intel_sdvo_connector_funcs = {
> - .dpms = drm_atomic_helper_connector_dpms,
> .detect = intel_sdvo_detect,
> .fill_modes = drm_helper_probe_single_connector_modes,
> .atomic_get_property = intel_sdvo_connector_atomic_get_property,
> diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c
> index e4ef2919b682..906893c006d8 100644
> --- a/drivers/gpu/drm/i915/intel_tv.c
> +++ b/drivers/gpu/drm/i915/intel_tv.c
> @@ -1407,7 +1407,6 @@ intel_tv_destroy(struct drm_connector *connector)
> }
>
> static const struct drm_connector_funcs intel_tv_connector_funcs = {
> - .dpms = drm_atomic_helper_connector_dpms,
> .late_register = intel_connector_register,
> .early_unregister = intel_connector_unregister,
> .destroy = intel_tv_destroy,
> diff --git a/drivers/gpu/drm/imx/imx-ldb.c b/drivers/gpu/drm/imx/imx-ldb.c
> index 8b05ecb8fdef..56dd7a9a8e25 100644
> --- a/drivers/gpu/drm/imx/imx-ldb.c
> +++ b/drivers/gpu/drm/imx/imx-ldb.c
> @@ -389,7 +389,6 @@ static int imx_ldb_encoder_atomic_check(struct drm_encoder *encoder,
>
>
> static const struct drm_connector_funcs imx_ldb_connector_funcs = {
> - .dpms = drm_atomic_helper_connector_dpms,
> .fill_modes = drm_helper_probe_single_connector_modes,
> .destroy = imx_drm_connector_destroy,
> .reset = drm_atomic_helper_connector_reset,
> diff --git a/drivers/gpu/drm/imx/imx-tve.c b/drivers/gpu/drm/imx/imx-tve.c
> index 4826bb781723..bc27c2699464 100644
> --- a/drivers/gpu/drm/imx/imx-tve.c
> +++ b/drivers/gpu/drm/imx/imx-tve.c
> @@ -341,7 +341,6 @@ static int imx_tve_atomic_check(struct drm_encoder *encoder,
> }
>
> static const struct drm_connector_funcs imx_tve_connector_funcs = {
> - .dpms = drm_atomic_helper_connector_dpms,
> .fill_modes = drm_helper_probe_single_connector_modes,
> .destroy = imx_drm_connector_destroy,
> .reset = drm_atomic_helper_connector_reset,
> diff --git a/drivers/gpu/drm/imx/parallel-display.c b/drivers/gpu/drm/imx/parallel-display.c
> index 8aca20209cb8..8def97d75030 100644
> --- a/drivers/gpu/drm/imx/parallel-display.c
> +++ b/drivers/gpu/drm/imx/parallel-display.c
> @@ -135,7 +135,6 @@ static int imx_pd_encoder_atomic_check(struct drm_encoder *encoder,
> }
>
> static const struct drm_connector_funcs imx_pd_connector_funcs = {
> - .dpms = drm_atomic_helper_connector_dpms,
> .fill_modes = drm_helper_probe_single_connector_modes,
> .destroy = imx_drm_connector_destroy,
> .reset = drm_atomic_helper_connector_reset,
> diff --git a/drivers/gpu/drm/mediatek/mtk_dsi.c b/drivers/gpu/drm/mediatek/mtk_dsi.c
> index a31bd2a82de5..7e5e24c2152a 100644
> --- a/drivers/gpu/drm/mediatek/mtk_dsi.c
> +++ b/drivers/gpu/drm/mediatek/mtk_dsi.c
> @@ -766,7 +766,6 @@ static const struct drm_encoder_helper_funcs mtk_dsi_encoder_helper_funcs = {
> };
>
> static const struct drm_connector_funcs mtk_dsi_connector_funcs = {
> - .dpms = drm_atomic_helper_connector_dpms,
> .fill_modes = drm_helper_probe_single_connector_modes,
> .destroy = drm_connector_cleanup,
> .reset = drm_atomic_helper_connector_reset,
> diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi.c b/drivers/gpu/drm/mediatek/mtk_hdmi.c
> index f2437cd1e0f9..690c67507cbc 100644
> --- a/drivers/gpu/drm/mediatek/mtk_hdmi.c
> +++ b/drivers/gpu/drm/mediatek/mtk_hdmi.c
> @@ -1261,7 +1261,6 @@ static struct drm_encoder *mtk_hdmi_conn_best_enc(struct drm_connector *conn)
> }
>
> static const struct drm_connector_funcs mtk_hdmi_connector_funcs = {
> - .dpms = drm_atomic_helper_connector_dpms,
> .detect = hdmi_conn_detect,
> .fill_modes = drm_helper_probe_single_connector_modes,
> .destroy = hdmi_conn_destroy,
> diff --git a/drivers/gpu/drm/meson/meson_venc_cvbs.c b/drivers/gpu/drm/meson/meson_venc_cvbs.c
> index 00775b397dba..79d95ca8a0c0 100644
> --- a/drivers/gpu/drm/meson/meson_venc_cvbs.c
> +++ b/drivers/gpu/drm/meson/meson_venc_cvbs.c
> @@ -118,7 +118,6 @@ static int meson_cvbs_connector_mode_valid(struct drm_connector *connector,
> }
>
> static const struct drm_connector_funcs meson_cvbs_connector_funcs = {
> - .dpms = drm_atomic_helper_connector_dpms,
> .detect = meson_cvbs_connector_detect,
> .fill_modes = drm_helper_probe_single_connector_modes,
> .destroy = meson_cvbs_connector_destroy,
> diff --git a/drivers/gpu/drm/msm/dsi/dsi_manager.c b/drivers/gpu/drm/msm/dsi/dsi_manager.c
> index a879ffa534b4..855248132b2b 100644
> --- a/drivers/gpu/drm/msm/dsi/dsi_manager.c
> +++ b/drivers/gpu/drm/msm/dsi/dsi_manager.c
> @@ -626,7 +626,6 @@ static void dsi_mgr_bridge_mode_set(struct drm_bridge *bridge,
> }
>
> static const struct drm_connector_funcs dsi_mgr_connector_funcs = {
> - .dpms = drm_atomic_helper_connector_dpms,
> .detect = dsi_mgr_connector_detect,
> .fill_modes = drm_helper_probe_single_connector_modes,
> .destroy = dsi_mgr_connector_destroy,
> diff --git a/drivers/gpu/drm/msm/edp/edp_connector.c b/drivers/gpu/drm/msm/edp/edp_connector.c
> index 5960628ceb93..6f3fc6b0f0a3 100644
> --- a/drivers/gpu/drm/msm/edp/edp_connector.c
> +++ b/drivers/gpu/drm/msm/edp/edp_connector.c
> @@ -92,7 +92,6 @@ static int edp_connector_mode_valid(struct drm_connector *connector,
> }
>
> static const struct drm_connector_funcs edp_connector_funcs = {
> - .dpms = drm_atomic_helper_connector_dpms,
> .detect = edp_connector_detect,
> .fill_modes = drm_helper_probe_single_connector_modes,
> .destroy = edp_connector_destroy,
> diff --git a/drivers/gpu/drm/msm/hdmi/hdmi_connector.c b/drivers/gpu/drm/msm/hdmi/hdmi_connector.c
> index a2515b466ce5..71536d9c7fe8 100644
> --- a/drivers/gpu/drm/msm/hdmi/hdmi_connector.c
> +++ b/drivers/gpu/drm/msm/hdmi/hdmi_connector.c
> @@ -407,7 +407,6 @@ static int msm_hdmi_connector_mode_valid(struct drm_connector *connector,
> }
>
> static const struct drm_connector_funcs hdmi_connector_funcs = {
> - .dpms = drm_atomic_helper_connector_dpms,
> .detect = hdmi_connector_detect,
> .fill_modes = drm_helper_probe_single_connector_modes,
> .destroy = hdmi_connector_destroy,
> diff --git a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_lvds_connector.c b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_lvds_connector.c
> index 353429b05733..e3b1c86b7aae 100644
> --- a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_lvds_connector.c
> +++ b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_lvds_connector.c
> @@ -91,7 +91,6 @@ static int mdp4_lvds_connector_mode_valid(struct drm_connector *connector,
> }
>
> static const struct drm_connector_funcs mdp4_lvds_connector_funcs = {
> - .dpms = drm_atomic_helper_connector_dpms,
> .detect = mdp4_lvds_connector_detect,
> .fill_modes = drm_helper_probe_single_connector_modes,
> .destroy = mdp4_lvds_connector_destroy,
> diff --git a/drivers/gpu/drm/mxsfb/mxsfb_out.c b/drivers/gpu/drm/mxsfb/mxsfb_out.c
> index f7d729aa09bd..e5edf016a439 100644
> --- a/drivers/gpu/drm/mxsfb/mxsfb_out.c
> +++ b/drivers/gpu/drm/mxsfb/mxsfb_out.c
> @@ -74,7 +74,6 @@ static void mxsfb_panel_connector_destroy(struct drm_connector *connector)
> }
>
> static const struct drm_connector_funcs mxsfb_panel_connector_funcs = {
> - .dpms = drm_atomic_helper_connector_dpms,
> .detect = mxsfb_panel_connector_detect,
> .fill_modes = drm_helper_probe_single_connector_modes,
> .destroy = mxsfb_panel_connector_destroy,
> diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c
> index 2468e81918fd..5137155bf3c0 100644
> --- a/drivers/gpu/drm/nouveau/nouveau_connector.c
> +++ b/drivers/gpu/drm/nouveau/nouveau_connector.c
> @@ -1072,17 +1072,9 @@ nouveau_connector_helper_funcs = {
> .best_encoder = nouveau_connector_best_encoder,
> };
>
> -static int
> -nouveau_connector_dpms(struct drm_connector *connector, int mode)
> -{
> - if (drm_drv_uses_atomic_modeset(connector->dev))
> - return drm_atomic_helper_connector_dpms(connector, mode);
> - return drm_helper_connector_dpms(connector, mode);
> -}
> -
> static const struct drm_connector_funcs
> nouveau_connector_funcs = {
> - .dpms = nouveau_connector_dpms,
> + .dpms = drm_helper_connector_dpms,
> .reset = nouveau_conn_reset,
> .detect = nouveau_connector_detect,
> .force = nouveau_connector_force,
> @@ -1097,7 +1089,7 @@ nouveau_connector_funcs = {
>
> static const struct drm_connector_funcs
> nouveau_connector_funcs_lvds = {
> - .dpms = nouveau_connector_dpms,
> + .dpms = drm_helper_connector_dpms,
> .reset = nouveau_conn_reset,
> .detect = nouveau_connector_detect_lvds,
> .force = nouveau_connector_force,
> diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c
> index 80a96eb08bbf..d442def6c965 100644
> --- a/drivers/gpu/drm/nouveau/nv50_display.c
> +++ b/drivers/gpu/drm/nouveau/nv50_display.c
> @@ -3118,7 +3118,6 @@ nv50_mstc_destroy(struct drm_connector *connector)
>
> static const struct drm_connector_funcs
> nv50_mstc = {
> - .dpms = drm_atomic_helper_connector_dpms,
> .reset = nouveau_conn_reset,
> .detect = nv50_mstc_detect,
> .fill_modes = drm_helper_probe_single_connector_modes,
> diff --git a/drivers/gpu/drm/omapdrm/omap_connector.c b/drivers/gpu/drm/omapdrm/omap_connector.c
> index c24b6b783e9a..d1ec76ef5cc6 100644
> --- a/drivers/gpu/drm/omapdrm/omap_connector.c
> +++ b/drivers/gpu/drm/omapdrm/omap_connector.c
> @@ -195,7 +195,6 @@ static int omap_connector_mode_valid(struct drm_connector *connector,
> }
>
> static const struct drm_connector_funcs omap_connector_funcs = {
> - .dpms = drm_atomic_helper_connector_dpms,
> .reset = drm_atomic_helper_connector_reset,
> .detect = omap_connector_detect,
> .fill_modes = drm_helper_probe_single_connector_modes,
> diff --git a/drivers/gpu/drm/pl111/pl111_connector.c b/drivers/gpu/drm/pl111/pl111_connector.c
> index 3f213d7e7692..d335f9a29ce4 100644
> --- a/drivers/gpu/drm/pl111/pl111_connector.c
> +++ b/drivers/gpu/drm/pl111/pl111_connector.c
> @@ -69,7 +69,6 @@ const struct drm_connector_funcs connector_funcs = {
> .fill_modes = drm_helper_probe_single_connector_modes,
> .destroy = pl111_connector_destroy,
> .detect = pl111_connector_detect,
> - .dpms = drm_atomic_helper_connector_dpms,
> .reset = drm_atomic_helper_connector_reset,
> .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
> .atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
> diff --git a/drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c b/drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c
> index ee91481131ad..b373ad48ef5f 100644
> --- a/drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c
> +++ b/drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c
> @@ -46,7 +46,6 @@ static void rcar_du_lvds_connector_destroy(struct drm_connector *connector)
> }
>
> static const struct drm_connector_funcs connector_funcs = {
> - .dpms = drm_atomic_helper_connector_dpms,
> .reset = drm_atomic_helper_connector_reset,
> .fill_modes = drm_helper_probe_single_connector_modes,
> .destroy = rcar_du_lvds_connector_destroy,
> diff --git a/drivers/gpu/drm/rockchip/cdn-dp-core.c b/drivers/gpu/drm/rockchip/cdn-dp-core.c
> index 9b0b0588bbed..a57da051f516 100644
> --- a/drivers/gpu/drm/rockchip/cdn-dp-core.c
> +++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c
> @@ -254,7 +254,6 @@ static void cdn_dp_connector_destroy(struct drm_connector *connector)
> }
>
> static const struct drm_connector_funcs cdn_dp_atomic_connector_funcs = {
> - .dpms = drm_atomic_helper_connector_dpms,
> .detect = cdn_dp_connector_detect,
> .destroy = cdn_dp_connector_destroy,
> .fill_modes = drm_helper_probe_single_connector_modes,
> diff --git a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c
> index 21b9737662ae..9a20b9dc27c8 100644
> --- a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c
> +++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c
> @@ -1080,7 +1080,6 @@ static void dw_mipi_dsi_drm_connector_destroy(struct drm_connector *connector)
> }
>
> static const struct drm_connector_funcs dw_mipi_dsi_atomic_connector_funcs = {
> - .dpms = drm_atomic_helper_connector_dpms,
> .fill_modes = drm_helper_probe_single_connector_modes,
> .destroy = dw_mipi_dsi_drm_connector_destroy,
> .reset = drm_atomic_helper_connector_reset,
> diff --git a/drivers/gpu/drm/rockchip/inno_hdmi.c b/drivers/gpu/drm/rockchip/inno_hdmi.c
> index 7149968aa25a..bd87768dd549 100644
> --- a/drivers/gpu/drm/rockchip/inno_hdmi.c
> +++ b/drivers/gpu/drm/rockchip/inno_hdmi.c
> @@ -593,7 +593,6 @@ static void inno_hdmi_connector_destroy(struct drm_connector *connector)
> }
>
> static struct drm_connector_funcs inno_hdmi_connector_funcs = {
> - .dpms = drm_atomic_helper_connector_dpms,
> .fill_modes = inno_hdmi_probe_single_connector_modes,
> .detect = inno_hdmi_connector_detect,
> .destroy = inno_hdmi_connector_destroy,
> diff --git a/drivers/gpu/drm/sti/sti_dvo.c b/drivers/gpu/drm/sti/sti_dvo.c
> index a51cd9f754db..852bf2293b05 100644
> --- a/drivers/gpu/drm/sti/sti_dvo.c
> +++ b/drivers/gpu/drm/sti/sti_dvo.c
> @@ -412,7 +412,6 @@ static int sti_dvo_late_register(struct drm_connector *connector)
> }
>
> static const struct drm_connector_funcs sti_dvo_connector_funcs = {
> - .dpms = drm_atomic_helper_connector_dpms,
> .fill_modes = drm_helper_probe_single_connector_modes,
> .detect = sti_dvo_connector_detect,
> .destroy = drm_connector_cleanup,
> diff --git a/drivers/gpu/drm/sti/sti_hda.c b/drivers/gpu/drm/sti/sti_hda.c
> index d6ed909d9d75..cf65e32b5090 100644
> --- a/drivers/gpu/drm/sti/sti_hda.c
> +++ b/drivers/gpu/drm/sti/sti_hda.c
> @@ -647,7 +647,6 @@ static int sti_hda_late_register(struct drm_connector *connector)
> }
>
> static const struct drm_connector_funcs sti_hda_connector_funcs = {
> - .dpms = drm_atomic_helper_connector_dpms,
> .fill_modes = drm_helper_probe_single_connector_modes,
> .destroy = drm_connector_cleanup,
> .reset = drm_atomic_helper_connector_reset,
> diff --git a/drivers/gpu/drm/sti/sti_hdmi.c b/drivers/gpu/drm/sti/sti_hdmi.c
> index 21f11dfae472..30f02d2fdd03 100644
> --- a/drivers/gpu/drm/sti/sti_hdmi.c
> +++ b/drivers/gpu/drm/sti/sti_hdmi.c
> @@ -1113,7 +1113,6 @@ static int sti_hdmi_late_register(struct drm_connector *connector)
> }
>
> static const struct drm_connector_funcs sti_hdmi_connector_funcs = {
> - .dpms = drm_atomic_helper_connector_dpms,
> .fill_modes = drm_helper_probe_single_connector_modes,
> .detect = sti_hdmi_connector_detect,
> .destroy = drm_connector_cleanup,
> diff --git a/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c b/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c
> index 83b7a2a025f2..f5d0d6bd1084 100644
> --- a/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c
> +++ b/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c
> @@ -306,7 +306,6 @@ sun4i_hdmi_connector_detect(struct drm_connector *connector, bool force)
> }
>
> static const struct drm_connector_funcs sun4i_hdmi_connector_funcs = {
> - .dpms = drm_atomic_helper_connector_dpms,
> .detect = sun4i_hdmi_connector_detect,
> .fill_modes = drm_helper_probe_single_connector_modes,
> .destroy = drm_connector_cleanup,
> diff --git a/drivers/gpu/drm/sun4i/sun4i_rgb.c b/drivers/gpu/drm/sun4i/sun4i_rgb.c
> index 422b191faa77..550bb262943f 100644
> --- a/drivers/gpu/drm/sun4i/sun4i_rgb.c
> +++ b/drivers/gpu/drm/sun4i/sun4i_rgb.c
> @@ -120,7 +120,6 @@ sun4i_rgb_connector_destroy(struct drm_connector *connector)
> }
>
> static struct drm_connector_funcs sun4i_rgb_con_funcs = {
> - .dpms = drm_atomic_helper_connector_dpms,
> .fill_modes = drm_helper_probe_single_connector_modes,
> .destroy = sun4i_rgb_connector_destroy,
> .reset = drm_atomic_helper_connector_reset,
> diff --git a/drivers/gpu/drm/sun4i/sun4i_tv.c b/drivers/gpu/drm/sun4i/sun4i_tv.c
> index 338b9e5bb2a3..7b45ac9383ea 100644
> --- a/drivers/gpu/drm/sun4i/sun4i_tv.c
> +++ b/drivers/gpu/drm/sun4i/sun4i_tv.c
> @@ -546,7 +546,6 @@ sun4i_tv_comp_connector_destroy(struct drm_connector *connector)
> }
>
> static struct drm_connector_funcs sun4i_tv_comp_connector_funcs = {
> - .dpms = drm_atomic_helper_connector_dpms,
> .fill_modes = drm_helper_probe_single_connector_modes,
> .destroy = sun4i_tv_comp_connector_destroy,
> .reset = drm_atomic_helper_connector_reset,
> diff --git a/drivers/gpu/drm/tegra/dsi.c b/drivers/gpu/drm/tegra/dsi.c
> index 3dea1216bafd..e4b5aedfdbd4 100644
> --- a/drivers/gpu/drm/tegra/dsi.c
> +++ b/drivers/gpu/drm/tegra/dsi.c
> @@ -815,7 +815,6 @@ tegra_dsi_connector_duplicate_state(struct drm_connector *connector)
> }
>
> static const struct drm_connector_funcs tegra_dsi_connector_funcs = {
> - .dpms = drm_atomic_helper_connector_dpms,
> .reset = tegra_dsi_connector_reset,
> .detect = tegra_output_connector_detect,
> .fill_modes = drm_helper_probe_single_connector_modes,
> diff --git a/drivers/gpu/drm/tegra/hdmi.c b/drivers/gpu/drm/tegra/hdmi.c
> index 718d8db406a6..a621b0da4092 100644
> --- a/drivers/gpu/drm/tegra/hdmi.c
> +++ b/drivers/gpu/drm/tegra/hdmi.c
> @@ -902,7 +902,6 @@ tegra_hdmi_connector_detect(struct drm_connector *connector, bool force)
> }
>
> static const struct drm_connector_funcs tegra_hdmi_connector_funcs = {
> - .dpms = drm_atomic_helper_connector_dpms,
> .reset = drm_atomic_helper_connector_reset,
> .detect = tegra_hdmi_connector_detect,
> .fill_modes = drm_helper_probe_single_connector_modes,
> diff --git a/drivers/gpu/drm/tegra/rgb.c b/drivers/gpu/drm/tegra/rgb.c
> index a131b44e2d6f..78ec5193741d 100644
> --- a/drivers/gpu/drm/tegra/rgb.c
> +++ b/drivers/gpu/drm/tegra/rgb.c
> @@ -88,7 +88,6 @@ static void tegra_dc_write_regs(struct tegra_dc *dc,
> }
>
> static const struct drm_connector_funcs tegra_rgb_connector_funcs = {
> - .dpms = drm_atomic_helper_connector_dpms,
> .reset = drm_atomic_helper_connector_reset,
> .detect = tegra_output_connector_detect,
> .fill_modes = drm_helper_probe_single_connector_modes,
> diff --git a/drivers/gpu/drm/tegra/sor.c b/drivers/gpu/drm/tegra/sor.c
> index fb2709c0c461..e0642d05a8d3 100644
> --- a/drivers/gpu/drm/tegra/sor.c
> +++ b/drivers/gpu/drm/tegra/sor.c
> @@ -1340,7 +1340,6 @@ tegra_sor_connector_duplicate_state(struct drm_connector *connector)
> }
>
> static const struct drm_connector_funcs tegra_sor_connector_funcs = {
> - .dpms = drm_atomic_helper_connector_dpms,
> .reset = tegra_sor_connector_reset,
> .detect = tegra_sor_connector_detect,
> .fill_modes = drm_helper_probe_single_connector_modes,
> diff --git a/drivers/gpu/drm/tilcdc/tilcdc_panel.c b/drivers/gpu/drm/tilcdc/tilcdc_panel.c
> index 28c3e2f44f64..1813a3623ce6 100644
> --- a/drivers/gpu/drm/tilcdc/tilcdc_panel.c
> +++ b/drivers/gpu/drm/tilcdc/tilcdc_panel.c
> @@ -189,7 +189,6 @@ static struct drm_encoder *panel_connector_best_encoder(
>
> static const struct drm_connector_funcs panel_connector_funcs = {
> .destroy = panel_connector_destroy,
> - .dpms = drm_atomic_helper_connector_dpms,
> .fill_modes = drm_helper_probe_single_connector_modes,
> .reset = drm_atomic_helper_connector_reset,
> .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
> diff --git a/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c b/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c
> index aabfad882e23..1e2dfb1b1d6b 100644
> --- a/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c
> +++ b/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c
> @@ -202,7 +202,6 @@ static struct drm_encoder *tfp410_connector_best_encoder(
>
> static const struct drm_connector_funcs tfp410_connector_funcs = {
> .destroy = tfp410_connector_destroy,
> - .dpms = drm_atomic_helper_connector_dpms,
> .detect = tfp410_connector_detect,
> .fill_modes = drm_helper_probe_single_connector_modes,
> .reset = drm_atomic_helper_connector_reset,
> diff --git a/drivers/gpu/drm/tinydrm/core/tinydrm-pipe.c b/drivers/gpu/drm/tinydrm/core/tinydrm-pipe.c
> index ec43fb7ad9e4..79b6687977d3 100644
> --- a/drivers/gpu/drm/tinydrm/core/tinydrm-pipe.c
> +++ b/drivers/gpu/drm/tinydrm/core/tinydrm-pipe.c
> @@ -71,7 +71,6 @@ static void tinydrm_connector_destroy(struct drm_connector *connector)
> }
>
> static const struct drm_connector_funcs tinydrm_connector_funcs = {
> - .dpms = drm_atomic_helper_connector_dpms,
> .reset = drm_atomic_helper_connector_reset,
> .detect = tinydrm_connector_detect,
> .fill_modes = drm_helper_probe_single_connector_modes,
> diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
> index 406d6d83b6c6..b249b79ce04a 100644
> --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
> +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
> @@ -265,7 +265,6 @@ static int vc4_hdmi_connector_get_modes(struct drm_connector *connector)
> }
>
> static const struct drm_connector_funcs vc4_hdmi_connector_funcs = {
> - .dpms = drm_atomic_helper_connector_dpms,
> .detect = vc4_hdmi_connector_detect,
> .fill_modes = drm_helper_probe_single_connector_modes,
> .destroy = vc4_hdmi_connector_destroy,
> diff --git a/drivers/gpu/drm/vc4/vc4_vec.c b/drivers/gpu/drm/vc4/vc4_vec.c
> index 369fea5a13a1..3a9a302247a2 100644
> --- a/drivers/gpu/drm/vc4/vc4_vec.c
> +++ b/drivers/gpu/drm/vc4/vc4_vec.c
> @@ -366,7 +366,6 @@ static int vc4_vec_connector_get_modes(struct drm_connector *connector)
> }
>
> static const struct drm_connector_funcs vc4_vec_connector_funcs = {
> - .dpms = drm_atomic_helper_connector_dpms,
> .detect = vc4_vec_connector_detect,
> .fill_modes = drm_helper_probe_single_connector_modes,
> .destroy = vc4_vec_connector_destroy,
> diff --git a/drivers/gpu/drm/virtio/virtgpu_display.c b/drivers/gpu/drm/virtio/virtgpu_display.c
> index ffd22e5ab43a..b6d52055a11f 100644
> --- a/drivers/gpu/drm/virtio/virtgpu_display.c
> +++ b/drivers/gpu/drm/virtio/virtgpu_display.c
> @@ -252,7 +252,6 @@ static void virtio_gpu_conn_destroy(struct drm_connector *connector)
> }
>
> static const struct drm_connector_funcs virtio_gpu_connector_funcs = {
> - .dpms = drm_atomic_helper_connector_dpms,
> .detect = virtio_gpu_conn_detect,
> .fill_modes = drm_helper_probe_single_connector_modes,
> .destroy = virtio_gpu_conn_destroy,
> diff --git a/drivers/gpu/drm/zte/zx_hdmi.c b/drivers/gpu/drm/zte/zx_hdmi.c
> index 7e834e3eeed9..b8abb1b496ff 100644
> --- a/drivers/gpu/drm/zte/zx_hdmi.c
> +++ b/drivers/gpu/drm/zte/zx_hdmi.c
> @@ -300,7 +300,6 @@ zx_hdmi_connector_detect(struct drm_connector *connector, bool force)
> }
>
> static const struct drm_connector_funcs zx_hdmi_connector_funcs = {
> - .dpms = drm_atomic_helper_connector_dpms,
> .fill_modes = drm_helper_probe_single_connector_modes,
> .detect = zx_hdmi_connector_detect,
> .destroy = drm_connector_cleanup,
> diff --git a/drivers/gpu/drm/zte/zx_tvenc.c b/drivers/gpu/drm/zte/zx_tvenc.c
> index b56dc69843fc..0de1a71ca4e0 100644
> --- a/drivers/gpu/drm/zte/zx_tvenc.c
> +++ b/drivers/gpu/drm/zte/zx_tvenc.c
> @@ -269,7 +269,6 @@ static struct drm_connector_helper_funcs zx_tvenc_connector_helper_funcs = {
> };
>
> static const struct drm_connector_funcs zx_tvenc_connector_funcs = {
> - .dpms = drm_atomic_helper_connector_dpms,
> .fill_modes = drm_helper_probe_single_connector_modes,
> .destroy = drm_connector_cleanup,
> .reset = drm_atomic_helper_connector_reset,
> diff --git a/drivers/gpu/drm/zte/zx_vga.c b/drivers/gpu/drm/zte/zx_vga.c
> index 1e0811f775cb..3e7e33cd3dfa 100644
> --- a/drivers/gpu/drm/zte/zx_vga.c
> +++ b/drivers/gpu/drm/zte/zx_vga.c
> @@ -138,7 +138,6 @@ zx_vga_connector_detect(struct drm_connector *connector, bool force)
> }
>
> static const struct drm_connector_funcs zx_vga_connector_funcs = {
> - .dpms = drm_atomic_helper_connector_dpms,
> .fill_modes = drm_helper_probe_single_connector_modes,
> .detect = zx_vga_connector_detect,
> .destroy = drm_connector_cleanup,
> diff --git a/include/drm/drm_atomic_helper.h b/include/drm/drm_atomic_helper.h
> index 619089a027ec..d2b56cc657e9 100644
> --- a/include/drm/drm_atomic_helper.h
> +++ b/include/drm/drm_atomic_helper.h
> @@ -136,8 +136,6 @@ int drm_atomic_helper_page_flip_target(
> uint32_t flags,
> uint32_t target,
> struct drm_modeset_acquire_ctx *ctx);
> -int drm_atomic_helper_connector_dpms(struct drm_connector *connector,
> - int mode);
> struct drm_encoder *
> drm_atomic_helper_best_encoder(struct drm_connector *connector);
>
>
_______________________________________________
Virtualization mailing list
Virtualization@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
^ permalink raw reply
* Re: [PATCH v12 6/8] mm: support reporting free page blocks
From: Michal Hocko @ 2017-07-25 11:25 UTC (permalink / raw)
To: Wei Wang
Cc: aarcange, virtio-dev, amit.shah, kvm, Michael S. Tsirkin,
linux-kernel, liliang.opensource, qemu-devel, virtualization,
linux-mm, yang.zhang.wz, quan.xu, cornelia.huck, pbonzini, akpm,
mgorman
In-Reply-To: <59771010.6080108@intel.com>
On Tue 25-07-17 17:32:00, Wei Wang wrote:
> On 07/24/2017 05:00 PM, Michal Hocko wrote:
> >On Wed 19-07-17 20:01:18, Wei Wang wrote:
> >>On 07/19/2017 04:13 PM, Michal Hocko wrote:
> >[...
> >>>All you should need is the check for the page reference count, no? I
> >>>assume you do some sort of pfn walk and so you should be able to get an
> >>>access to the struct page.
> >>Not necessarily - the guest struct page is not seen by the hypervisor. The
> >>hypervisor only gets those guest pfns which are hinted as unused. From the
> >>hypervisor (host) point of view, a guest physical address corresponds to a
> >>virtual address of a host process. So, once the hypervisor knows a guest
> >>physical page is unsued, it knows that the corresponding virtual memory of
> >>the process doesn't need to be transferred in the 1st round.
> >I am sorry, but I do not understand. Why cannot _guest_ simply check the
> >struct page ref count and send them to the hypervisor?
>
> Were you suggesting the following?
> 1) get a free page block from the page list using the API;
No. Use a pfn walk, check the reference count and skip those pages which
have 0 ref count. I suspected that you need to do some sort of the pfn
walk anyway because you somehow have to evaluate a memory to migrate,
right?
> 2) if page->ref_count == 0, send it to the hypervisor
yes
> Btw, ref_count may also change at any time.
>
> >Is there any
> >documentation which describes the workflow or code which would use your
> >new API?
> >
>
> It's used in the balloon driver (patch 8). We don't have any docs yet, but
> I think the high level workflow is the two steps above.
I will have a look.
--
Michal Hocko
SUSE Labs
^ permalink raw reply
* Re: [PATCH v12 6/8] mm: support reporting free page blocks
From: Wei Wang @ 2017-07-25 11:56 UTC (permalink / raw)
To: Michal Hocko
Cc: aarcange, virtio-dev, amit.shah, kvm, Michael S. Tsirkin,
linux-kernel, liliang.opensource, qemu-devel, virtualization,
linux-mm, yang.zhang.wz, quan.xu, cornelia.huck, pbonzini, akpm,
mgorman
In-Reply-To: <20170725112513.GD26723@dhcp22.suse.cz>
On 07/25/2017 07:25 PM, Michal Hocko wrote:
> On Tue 25-07-17 17:32:00, Wei Wang wrote:
>> On 07/24/2017 05:00 PM, Michal Hocko wrote:
>>> On Wed 19-07-17 20:01:18, Wei Wang wrote:
>>>> On 07/19/2017 04:13 PM, Michal Hocko wrote:
>>> [...
>>>>> All you should need is the check for the page reference count, no? I
>>>>> assume you do some sort of pfn walk and so you should be able to get an
>>>>> access to the struct page.
>>>> Not necessarily - the guest struct page is not seen by the hypervisor. The
>>>> hypervisor only gets those guest pfns which are hinted as unused. From the
>>>> hypervisor (host) point of view, a guest physical address corresponds to a
>>>> virtual address of a host process. So, once the hypervisor knows a guest
>>>> physical page is unsued, it knows that the corresponding virtual memory of
>>>> the process doesn't need to be transferred in the 1st round.
>>> I am sorry, but I do not understand. Why cannot _guest_ simply check the
>>> struct page ref count and send them to the hypervisor?
>> Were you suggesting the following?
>> 1) get a free page block from the page list using the API;
> No. Use a pfn walk, check the reference count and skip those pages which
> have 0 ref count.
"pfn walk" - do you mean start from the first pfn, and scan all the pfns
that the VM has?
> I suspected that you need to do some sort of the pfn
> walk anyway because you somehow have to evaluate a memory to migrate,
> right?
We don't need to do the pfn walk in the guest kernel. When the API
reports, for example,
a 2MB free page block, the API caller offers to the hypervisor the base
address of the page
block, and size=2MB, to the hypervisor.
The hypervisor maintains a bitmap of all the guest physical memory (a
bit corresponds to
a guest pfn). When migrating memory, only the pfns that are set in the
bitmap are transferred
to the destination machine. So, when the hypervisor receives a 2MB free
page block, the
corresponding bits in the bitmap are cleared.
Best,
Wei
^ permalink raw reply
* Re: [PATCH v12 6/8] mm: support reporting free page blocks
From: Michal Hocko @ 2017-07-25 12:41 UTC (permalink / raw)
To: Wei Wang
Cc: aarcange, virtio-dev, amit.shah, kvm, Michael S. Tsirkin,
linux-kernel, liliang.opensource, qemu-devel, virtualization,
linux-mm, yang.zhang.wz, quan.xu, cornelia.huck, pbonzini, akpm,
mgorman
In-Reply-To: <597731E8.9040803@intel.com>
On Tue 25-07-17 19:56:24, Wei Wang wrote:
> On 07/25/2017 07:25 PM, Michal Hocko wrote:
> >On Tue 25-07-17 17:32:00, Wei Wang wrote:
> >>On 07/24/2017 05:00 PM, Michal Hocko wrote:
> >>>On Wed 19-07-17 20:01:18, Wei Wang wrote:
> >>>>On 07/19/2017 04:13 PM, Michal Hocko wrote:
> >>>[...
> >>>>>All you should need is the check for the page reference count, no? I
> >>>>>assume you do some sort of pfn walk and so you should be able to get an
> >>>>>access to the struct page.
> >>>>Not necessarily - the guest struct page is not seen by the hypervisor. The
> >>>>hypervisor only gets those guest pfns which are hinted as unused. From the
> >>>>hypervisor (host) point of view, a guest physical address corresponds to a
> >>>>virtual address of a host process. So, once the hypervisor knows a guest
> >>>>physical page is unsued, it knows that the corresponding virtual memory of
> >>>>the process doesn't need to be transferred in the 1st round.
> >>>I am sorry, but I do not understand. Why cannot _guest_ simply check the
> >>>struct page ref count and send them to the hypervisor?
> >>Were you suggesting the following?
> >>1) get a free page block from the page list using the API;
> >No. Use a pfn walk, check the reference count and skip those pages which
> >have 0 ref count.
>
>
> "pfn walk" - do you mean start from the first pfn, and scan all the pfns
> that the VM has?
yes
> >I suspected that you need to do some sort of the pfn
> >walk anyway because you somehow have to evaluate a memory to migrate,
> >right?
>
> We don't need to do the pfn walk in the guest kernel. When the API
> reports, for example, a 2MB free page block, the API caller offers to
> the hypervisor the base address of the page block, and size=2MB, to
> the hypervisor.
So you want to skip pfn walks by regularly calling into the page
allocator to update your bitmap. If that is the case then would an API
that would allow you to update your bitmap via a callback be s
sufficient? Something like
void walk_free_mem(int node, int min_order,
void (*visit)(unsigned long pfn, unsigned long nr_pages))
The function will call the given callback for each free memory block on
the given node starting from the given min_order. The callback will be
strictly an atomic and very light context. You can update your bitmap
from there.
This would address my main concern that the allocator internals would
get outside of the allocator proper. A nasty callback which would be too
expensive could still stall other allocations and cause latencies but
the locking will be under mm core control at least.
Does that sound useful?
--
Michal Hocko
SUSE Labs
^ permalink raw reply
* Re: [PATCH 7/8] drm: Nuke drm_atomic_helper_connector_dpms
From: Laurent Pinchart @ 2017-07-25 14:01 UTC (permalink / raw)
To: Daniel Vetter
Cc: nopsys.com, one.org, Martyn Welch, Neil Armstrong, David Airlie,
nouveau, DRI Development, virtualization, Andrzej Hajda,
Tomi Valkeinen, linux-mediatek, Benjamin Gaignard, Romain Perier,
Daniel Vetter, Jyri Sarha, Heiko Stuebner, Marek Vasut,
linux-renesas-soc, Archit Taneja, Lars-Peter Clausen,
Joonyoung Shim, Kevin Hilman, Alexey Brodkin
In-Reply-To: <20170725080122.20548-8-daniel.vetter@ffwll.ch>
Hi Daniel,
Thank you for the patch.
On Tuesday 25 Jul 2017 10:01:21 Daniel Vetter wrote:
> It's dead code, the core handles all this directly now.
>
> The only special case is nouveau and tda988x which used one function
> for both legacy modeset code and -nv50 atomic world instead of 2
> vtables. But amounts to exactly the same.
>
> v2: Rebase over the panel/brideg refactorings in stm/ltdc.
>
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
[snip]
> ---
> drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 1 -
> drivers/gpu/drm/bridge/dumb-vga-dac.c | 1 -
> drivers/gpu/drm/bridge/panel.c | 1 -
> drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 1 -
> drivers/gpu/drm/drm_atomic_helper.c | 79 -------------------
> drivers/gpu/drm/omapdrm/omap_connector.c | 1 -
> drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c | 1 -
For the above,
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
--
Regards,
Laurent Pinchart
^ permalink raw reply
* Re: [PATCH 7/8] drm: Nuke drm_atomic_helper_connector_dpms
From: Shawn Guo @ 2017-07-25 14:42 UTC (permalink / raw)
To: Daniel Vetter
Cc: Martyn Welch, Neil Armstrong, David Airlie, nouveau,
DRI Development, virtualization, Andrzej Hajda, Tomi Valkeinen,
linux-mediatek, Laurent Pinchart, Benjamin Gaignard,
Romain Perier, Daniel Vetter, Jyri Sarha, Heiko Stuebner,
Marek Vasut, linux-renesas-soc, Archit Taneja, Lars-Peter Clausen,
Joonyoung Shim, Kevin Hilman, Alexey Brodkin, Russell
In-Reply-To: <20170725080122.20548-8-daniel.vetter@ffwll.ch>
On Tue, Jul 25, 2017 at 10:01:21AM +0200, Daniel Vetter wrote:
> It's dead code, the core handles all this directly now.
>
> The only special case is nouveau and tda988x which used one function
> for both legacy modeset code and -nv50 atomic world instead of 2
> vtables. But amounts to exactly the same.
>
> v2: Rebase over the panel/brideg refactorings in stm/ltdc.
>
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
...
> drivers/gpu/drm/zte/zx_hdmi.c | 1 -
> drivers/gpu/drm/zte/zx_tvenc.c | 1 -
> drivers/gpu/drm/zte/zx_vga.c | 1 -
Acked-by: Shawn Guo <shawnguo@kernel.org>
^ permalink raw reply
* RE: [PATCH v12 6/8] mm: support reporting free page blocks
From: Wang, Wei W @ 2017-07-25 14:47 UTC (permalink / raw)
To: Michal Hocko
Cc: aarcange@redhat.com, virtio-dev@lists.oasis-open.org,
amit.shah@redhat.com, kvm@vger.kernel.org, Michael S. Tsirkin,
linux-kernel@vger.kernel.org, liliang.opensource@gmail.com,
qemu-devel@nongnu.org, virtualization@lists.linux-foundation.org,
linux-mm@kvack.org, yang.zhang.wz@gmail.com, quan.xu@aliyun.com,
cornelia.huck@de.ibm.com, pbonzini@redhat.com,
akpm@linux-foundation.org, mgorman@techsingularity.net
In-Reply-To: <20170725124141.GF26723@dhcp22.suse.cz>
On Tuesday, July 25, 2017 8:42 PM, hal Hocko wrote:
> On Tue 25-07-17 19:56:24, Wei Wang wrote:
> > On 07/25/2017 07:25 PM, Michal Hocko wrote:
> > >On Tue 25-07-17 17:32:00, Wei Wang wrote:
> > >>On 07/24/2017 05:00 PM, Michal Hocko wrote:
> > >>>On Wed 19-07-17 20:01:18, Wei Wang wrote:
> > >>>>On 07/19/2017 04:13 PM, Michal Hocko wrote:
> > >>>[...
> > We don't need to do the pfn walk in the guest kernel. When the API
> > reports, for example, a 2MB free page block, the API caller offers to
> > the hypervisor the base address of the page block, and size=2MB, to
> > the hypervisor.
>
> So you want to skip pfn walks by regularly calling into the page allocator to
> update your bitmap. If that is the case then would an API that would allow you
> to update your bitmap via a callback be s sufficient? Something like
> void walk_free_mem(int node, int min_order,
> void (*visit)(unsigned long pfn, unsigned long nr_pages))
>
> The function will call the given callback for each free memory block on the given
> node starting from the given min_order. The callback will be strictly an atomic
> and very light context. You can update your bitmap from there.
I would need to introduce more about the background here:
The hypervisor and the guest live in their own address space. The hypervisor's bitmap
isn't seen by the guest. I think we also wouldn't be able to give a callback function
from the hypervisor to the guest in this case.
>
> This would address my main concern that the allocator internals would get
> outside of the allocator proper.
What issue would it have to expose the internal, for_each_zone()?
I think new code which would call it will also be strictly checked when they
are pushed to upstream.
Best,
Wei
^ permalink raw reply
* Re: [PATCH v12 6/8] mm: support reporting free page blocks
From: Michal Hocko @ 2017-07-25 14:53 UTC (permalink / raw)
To: Wang, Wei W
Cc: aarcange@redhat.com, virtio-dev@lists.oasis-open.org,
amit.shah@redhat.com, kvm@vger.kernel.org, Michael S. Tsirkin,
linux-kernel@vger.kernel.org, liliang.opensource@gmail.com,
qemu-devel@nongnu.org, virtualization@lists.linux-foundation.org,
linux-mm@kvack.org, yang.zhang.wz@gmail.com, quan.xu@aliyun.com,
cornelia.huck@de.ibm.com, pbonzini@redhat.com,
akpm@linux-foundation.org, mgorman@techsingularity.net
In-Reply-To: <286AC319A985734F985F78AFA26841F739283F62@shsmsx102.ccr.corp.intel.com>
On Tue 25-07-17 14:47:16, Wang, Wei W wrote:
> On Tuesday, July 25, 2017 8:42 PM, hal Hocko wrote:
> > On Tue 25-07-17 19:56:24, Wei Wang wrote:
> > > On 07/25/2017 07:25 PM, Michal Hocko wrote:
> > > >On Tue 25-07-17 17:32:00, Wei Wang wrote:
> > > >>On 07/24/2017 05:00 PM, Michal Hocko wrote:
> > > >>>On Wed 19-07-17 20:01:18, Wei Wang wrote:
> > > >>>>On 07/19/2017 04:13 PM, Michal Hocko wrote:
> > > >>>[...
> > > We don't need to do the pfn walk in the guest kernel. When the API
> > > reports, for example, a 2MB free page block, the API caller offers to
> > > the hypervisor the base address of the page block, and size=2MB, to
> > > the hypervisor.
> >
> > So you want to skip pfn walks by regularly calling into the page allocator to
> > update your bitmap. If that is the case then would an API that would allow you
> > to update your bitmap via a callback be s sufficient? Something like
> > void walk_free_mem(int node, int min_order,
> > void (*visit)(unsigned long pfn, unsigned long nr_pages))
> >
> > The function will call the given callback for each free memory block on the given
> > node starting from the given min_order. The callback will be strictly an atomic
> > and very light context. You can update your bitmap from there.
>
> I would need to introduce more about the background here:
> The hypervisor and the guest live in their own address space. The hypervisor's bitmap
> isn't seen by the guest. I think we also wouldn't be able to give a callback function
> from the hypervisor to the guest in this case.
How did you plan to use your original API which export struct page array
then?
> > This would address my main concern that the allocator internals would get
> > outside of the allocator proper.
>
> What issue would it have to expose the internal, for_each_zone()?
zone is a MM internal concept. No code outside of the MM proper should
really care about zones.
--
Michal Hocko
SUSE Labs
^ permalink raw reply
* [PATCH net-next] virtio-net: mark PM functions as __maybe_unused
From: Arnd Bergmann @ 2017-07-25 15:35 UTC (permalink / raw)
To: Michael S. Tsirkin, Jason Wang
Cc: Willem de Bruijn, Arnd Bergmann, netdev,
Sebastian Andrzej Siewior, John Fastabend, linux-kernel,
virtualization, Eric Dumazet, David S. Miller
After removing the reset function, the freeze and restore functions
are now unused when CONFIG_PM_SLEEP is disabled:
drivers/net/virtio_net.c:1881:12: error: 'virtnet_restore_up' defined but not used [-Werror=unused-function]
static int virtnet_restore_up(struct virtio_device *vdev)
drivers/net/virtio_net.c:1859:13: error: 'virtnet_freeze_down' defined but not used [-Werror=unused-function]
static void virtnet_freeze_down(struct virtio_device *vdev)
A more robust way to do this is to remove the #ifdef around the callers
and instead mark them as __maybe_unused. The compiler will now just
silently drop the unused code.
Fixes: 4941d472bf95 ("virtio-net: do not reset during XDP set")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
drivers/net/virtio_net.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index d4751ce23b4f..1902701e15a9 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -2702,8 +2702,7 @@ static void virtnet_remove(struct virtio_device *vdev)
free_netdev(vi->dev);
}
-#ifdef CONFIG_PM_SLEEP
-static int virtnet_freeze(struct virtio_device *vdev)
+static __maybe_unused int virtnet_freeze(struct virtio_device *vdev)
{
struct virtnet_info *vi = vdev->priv;
@@ -2714,7 +2713,7 @@ static int virtnet_freeze(struct virtio_device *vdev)
return 0;
}
-static int virtnet_restore(struct virtio_device *vdev)
+static __maybe_unused int virtnet_restore(struct virtio_device *vdev)
{
struct virtnet_info *vi = vdev->priv;
int err;
@@ -2730,7 +2729,6 @@ static int virtnet_restore(struct virtio_device *vdev)
return 0;
}
-#endif
static struct virtio_device_id id_table[] = {
{ VIRTIO_ID_NET, VIRTIO_DEV_ANY_ID },
--
2.9.0
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox