[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <CAErSpo4z1VmYwrCQv+vgyNET+1eFirEV3hAnbpF78DW+N18Nig@mail.gmail.com>
Date: Mon, 7 Oct 2013 12:30:25 -0600
From: Bjorn Helgaas <bhelgaas@...gle.com>
To: "Deucher, Alexander" <Alexander.Deucher@....com>
Cc: Yijing Wang <wangyijing@...wei.com>,
David Airlie <airlied@...ux.ie>,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
"linux-pci@...r.kernel.org" <linux-pci@...r.kernel.org>,
Hanjun Guo <guohanjun@...wei.com>,
"Koenig, Christian" <Christian.Koenig@....com>
Subject: Re: [PATCH 6/6] radeon: Use pcie_get_readrq() and pcie_set_readrq()
to simplify code
On Mon, Oct 7, 2013 at 6:15 AM, Deucher, Alexander
<Alexander.Deucher@....com> wrote:
>> -----Original Message-----
>> From: Bjorn Helgaas [mailto:bhelgaas@...gle.com]
>> Sent: Friday, October 04, 2013 4:45 PM
>> To: Yijing Wang
>> Cc: David Airlie; linux-kernel@...r.kernel.org; linux-pci@...r.kernel.org;
>> Hanjun Guo; Deucher, Alexander; Koenig, Christian
>> Subject: Re: [PATCH 6/6] radeon: Use pcie_get_readrq() and
>> pcie_set_readrq() to simplify code
>>
>> [-cc unrelated folks, +cc Alex, Christian]
>>
>> On Mon, Sep 9, 2013 at 7:13 AM, Yijing Wang <wangyijing@...wei.com>
>> wrote:
>> > Use pcie_get_readrq() and pcie_set_readrq() functions to simplify code.
>> >
>> > Signed-off-by: Yijing Wang <wangyijing@...wei.com>
>>
>> I believe the following patch is correct, and I'd be happy to merge it
>> via the PCI tree along with the rest of this series.
>>
>> But it'd be better to have an ack from Alex, and he might prefer to
>> merge it directly.
>
> Patch looks correct to me. Feel free to merge it via the pci tree.
>
> Reviewed-by: Alex Deucher <alexander.deucher@....com>
Thanks, I'll add your Reviewed-by and merge it.
Bjorn
>> > ---
>> > drivers/gpu/drm/radeon/evergreen.c | 19 ++++++-------------
>> > 1 files changed, 6 insertions(+), 13 deletions(-)
>> >
>> > diff --git a/drivers/gpu/drm/radeon/evergreen.c
>> b/drivers/gpu/drm/radeon/evergreen.c
>> > index d5b49e3..b191f92 100644
>> > --- a/drivers/gpu/drm/radeon/evergreen.c
>> > +++ b/drivers/gpu/drm/radeon/evergreen.c
>> > @@ -1169,23 +1169,16 @@ int evergreen_set_uvd_clocks(struct
>> radeon_device *rdev, u32 vclk, u32 dclk)
>> >
>> > void evergreen_fix_pci_max_read_req_size(struct radeon_device *rdev)
>> > {
>> > - u16 ctl, v;
>> > - int err;
>> > -
>> > - err = pcie_capability_read_word(rdev->pdev, PCI_EXP_DEVCTL, &ctl);
>> > - if (err)
>> > - return;
>> > -
>> > - v = (ctl & PCI_EXP_DEVCTL_READRQ) >> 12;
>> > + int readrq;
>> > + u16 v;
>> >
>> > + readrq = pcie_get_readrq(rdev->pdev);
>> > + v = ffs(readrq) - 8;
>> > /* if bios or OS sets MAX_READ_REQUEST_SIZE to an invalid value, fix it
>> > * to avoid hangs or perfomance issues
>> > */
>> > - if ((v == 0) || (v == 6) || (v == 7)) {
>> > - ctl &= ~PCI_EXP_DEVCTL_READRQ;
>> > - ctl |= (2 << 12);
>> > - pcie_capability_write_word(rdev->pdev, PCI_EXP_DEVCTL, ctl);
>> > - }
>> > + if ((v == 0) || (v == 6) || (v == 7))
>> > + pcie_set_readrq(rdev->pdev, 512);
>> > }
>> >
>> > static bool dce4_is_in_vblank(struct radeon_device *rdev, int crtc)
>> > --
>> > 1.7.1
>> >
>> >
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists