lkml.org 
[lkml]   [2010]   [Nov]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 1/2] Use existing defines for NV50 hotplug registers
    Date
    This doesn't change code at all, but it makes it a lot easier
    to understand.

    Signed-off-by: Andy Lutomirski <luto@mit.edu>
    Cc: <stable@kernel.org>
    ---
    drivers/gpu/drm/nouveau/nv50_display.c | 8 ++++----
    1 files changed, 4 insertions(+), 4 deletions(-)

    diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c
    index 612fa6d..83a7d27 100644
    --- a/drivers/gpu/drm/nouveau/nv50_display.c
    +++ b/drivers/gpu/drm/nouveau/nv50_display.c
    @@ -453,8 +453,8 @@ static int nv50_display_disable(struct drm_device *dev)
    nv_wr32(dev, NV50_PDISPLAY_INTR_EN, 0x00000000);

    /* disable hotplug interrupts */
    - nv_wr32(dev, 0xe054, 0xffffffff);
    - nv_wr32(dev, 0xe050, 0x00000000);
    + nv_wr32(dev, NV50_PCONNECTOR_HOTPLUG_CTRL, 0xffffffff);
    + nv_wr32(dev, NV50_PCONNECTOR_HOTPLUG_INTR, 0x00000000);
    if (dev_priv->chipset >= 0x90) {
    nv_wr32(dev, 0xe074, 0xffffffff);
    nv_wr32(dev, 0xe070, 0x00000000);
    @@ -1014,7 +1014,7 @@ nv50_display_irq_hotplug_bh(struct work_struct *work)
    uint32_t unplug_mask, plug_mask, change_mask;
    uint32_t hpd0, hpd1 = 0;

    - hpd0 = nv_rd32(dev, 0xe054) & nv_rd32(dev, 0xe050);
    + hpd0 = nv_rd32(dev, NV50_PCONNECTOR_HOTPLUG_CTRL) & nv_rd32(dev, NV50_PCONNECTOR_HOTPLUG_INTR);
    if (dev_priv->chipset >= 0x90)
    hpd1 = nv_rd32(dev, 0xe074) & nv_rd32(dev, 0xe070);

    @@ -1058,7 +1058,7 @@ nv50_display_irq_hotplug_bh(struct work_struct *work)
    helper->dpms(connector->encoder, DRM_MODE_DPMS_OFF);
    }

    - nv_wr32(dev, 0xe054, nv_rd32(dev, 0xe054));
    + nv_wr32(dev, NV50_PCONNECTOR_HOTPLUG_CTRL, nv_rd32(dev, NV50_PCONNECTOR_HOTPLUG_CTRL));
    if (dev_priv->chipset >= 0x90)
    nv_wr32(dev, 0xe074, nv_rd32(dev, 0xe074));

    --
    1.7.3.2


    \
     
     \ /
      Last update: 2010-11-10 22:35    [W:0.023 / U:3.564 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site