gma500: push through device driver tree

This is partial revert of e44ba033c ("treewide: remove duplicate
includes") and 28f65c11 ("treewide: Convert uses of struct resource
to resource_size(ptr)") as these changes will be merged through Alan->Greg
together with other gma500 bits.

Signed-off-by: Jiri Kosina <jkosina@suse.cz>

diff --git a/drivers/staging/gma500/psb_2d.c b/drivers/staging/gma500/psb_2d.c
index 3aee8fc3734f471d14f7516ce205a0235cfff703..0bd834c982d3b909fad8d7a463ad1e0b47130902 100644 (file)
--- a/drivers/staging/gma500/psb_2d.c
+++ b/drivers/staging/gma500/psb_2d.c
@@ -38,6 +38,7 @@
 
 #include "psb_drv.h"
 #include "psb_reg.h"
+#include "psb_drv.h"
 #include "psb_fb.h"
 
 void psb_spank(struct drm_psb_private *dev_priv)

diff --git a/drivers/staging/gma500/psb_gtt.c b/drivers/staging/gma500/psb_gtt.c
index 280f9d4454685bee5f85fbea889da19c20185f9b..74c5a6569d08674bba05a49888d131a459b74f9a 100644 (file)
--- a/drivers/staging/gma500/psb_gtt.c
+++ b/drivers/staging/gma500/psb_gtt.c
@@ -80,7 +80,7 @@ static int psb_gtt_insert(struct drm_device *dev, struct gtt_range *r)
 {
         struct drm_psb_private *dev_priv = dev->dev_private;
        u32 *gtt_slot, pte;
-       int numpages = resource_size(&r->resource) >> PAGE_SHIFT;
+       int numpages = (r->resource.end + 1 - r->resource.start) >> PAGE_SHIFT;
        struct page **pages;
        int i;
 
@@ -121,7 +121,7 @@ static void psb_gtt_remove(struct drm_device *dev, struct gtt_range *r)
 {
        struct drm_psb_private *dev_priv = dev->dev_private;
        u32 *gtt_slot, pte;
-       int numpages = resource_size(&r->resource) >> PAGE_SHIFT;
+       int numpages = (r->resource.end + 1 - r->resource.start) >> PAGE_SHIFT;
        int i;
 
        WARN_ON(r->stolen);
@@ -149,7 +149,7 @@ static int psb_gtt_attach_pages(struct gtt_range *gt)
        struct address_space *mapping;
        int i;
        struct page *p;
-       int pages = resource_size(&gt->resource) >> PAGE_SHIFT;
+       int pages = (gt->resource.end + 1 - gt->resource.start) >> PAGE_SHIFT;
 
        WARN_ON(gt->pages);
 
@@ -191,7 +191,7 @@ err:
 static void psb_gtt_detach_pages(struct gtt_range *gt)
 {
        int i;
-       int pages = resource_size(&gt->resource) >> PAGE_SHIFT;
+       int pages = (gt->resource.end + 1 - gt->resource.start) >> PAGE_SHIFT;
 
        for (i = 0; i < pages; i++) {
                /* FIXME: do we need to force dirty */