Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0c498638 authored by Jiri Kosina's avatar Jiri Kosina
Browse files

gma500: push through device driver tree 



This is partial revert of e44ba033 ("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: default avatarJiri Kosina <jkosina@suse.cz>
parent e1f91f82

drivers/staging/gma500/psb_2d.c

+1 −0
Original line number Diff line number Diff line
@@ -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)

drivers/staging/gma500/psb_gtt.c

+4 −4
Original line number Diff line number Diff line
@@ -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 @@ static int psb_gtt_attach_pages(struct gtt_range *gt) 
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 */