[git pull] two radeon fixes.

[Dave Airlie]

Hi Linus,

Please pull the 'drm-next' branch from
ssh://master.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git drm-next

These fix one regression in kms and a bug on the blit path.

Dave.

 drivers/gpu/drm/radeon/r600_blit.c     |    2 +-
 drivers/gpu/drm/radeon/r600_blit_kms.c |    2 +-
 drivers/gpu/drm/radeon/radeon.h        |   59 +-------------------
 drivers/gpu/drm/radeon/radeon_drv.h    |   65 +---------------------
 drivers/gpu/drm/radeon/radeon_family.h |   97 ++++++++++++++++++++++++++++++++
 5 files changed, 102 insertions(+), 123 deletions(-)
 create mode 100644 drivers/gpu/drm/radeon/radeon_family.h

commit 5b31aee9d72f529ee6b60e8d66967f817a0e39fc
Author: Andre Maasikas <amaasikas@xxxxxxxxx>
Date:   Mon Sep 21 08:59:41 2009 -0400

    drm/radeon/r600: set correct pitch for 4 byte copy
    
    [agd5f: also fix the non-kms path]
    
    Signed-off-by: Alex Deucher <alexdeucher@xxxxxxxxx>

commit c214271563c00f2721c5111e27b53bf06dabc6e4
Author: Dave Airlie <airlied@xxxxxxxx>
Date:   Tue Sep 22 08:50:10 2009 +1000

    drm/radeon: consolidate family flags used in pciids.
    
    having these separate was pointless and introduced a bug when
    one got updated without the other.
    
    Signed-off-by: Dave Airlie <airlied@xxxxxxxxxx>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/