Further clean up and setup

PATCH In review Alan Cox 3 participants 15 messages Apr 19, 2011 – Apr 26, 2011 Staging

Share & tools

Alan Cox

author

2011-04-19 14:47 UTC #0 lore raw

cover Further clean up and setup

This begins to put meaningful code into the buffer management. It's in theory pretty much all there now but needs a fair bit of debug before it'll actually do anything useful. We also strip out a lot of the old GTT code we no longer need and the last remnants of the TTM stuff.
---

Alan Cox (8):
gma500: allow non stolen page backed framebuffer
gma500: prune some unused variables
gma500: GEM - now we have the basics we shall stick pins in it
gma500: GEMify the frame buffer base bits
gma500: Begin the GEMification of the cursor code
gma500: Add support for inserting and removing pages from the GART
gma500: begin adding GEM
gma500: add the ability to request backed space or not

 drivers/staging/gma500/Makefile            |    2 
 drivers/staging/gma500/mrst_crtc.c         |   15 
 drivers/staging/gma500/psb_2d.c            |    4 
 drivers/staging/gma500/psb_drm.h           |   11 
 drivers/staging/gma500/psb_drv.c           |   46 +
 drivers/staging/gma500/psb_drv.h           |   25 -
 drivers/staging/gma500/psb_fb.c            |  301 +++----
 drivers/staging/gma500/psb_fb.h            |    5 
 drivers/staging/gma500/psb_gem.c           |  209 +++++
 drivers/staging/gma500/psb_gtt.c           | 1215 ++++++++--------------------
 drivers/staging/gma500/psb_gtt.h           |   70 --
 drivers/staging/gma500/psb_intel_display.c |  116 +--
 drivers/staging/gma500/psb_intel_drv.h     |   13 
 drivers/staging/gma500/psb_intel_lvds.c    |   14 
 drivers/staging/gma500/psb_powermgmt.c     |    5 
 drivers/staging/gma500/psb_pvr_glue.c      |   73 --
 drivers/staging/gma500/psb_pvr_glue.h      |   25 -
 17 files changed, 801 insertions(+), 1348 deletions(-)
 create mode 100644 drivers/staging/gma500/psb_gem.c
 delete mode 100644 drivers/staging/gma500/psb_pvr_glue.c
 delete mode 100644 drivers/staging/gma500/psb_pvr_glue.h

Signature · 3 lines

Carry on carry on, there's nothing to be done on days like these
In the ruins and the rage, planting flowers for new days
In the ruins and the rage, we carry on

Alan Cox

author

2011-04-19 14:48 UTC #1 lore raw

PATCH 1/8 gma500: add the ability to request backed space or not

We will will need this for doing a GEM allocator. It should also avoid any crashes with the current code if the stolen area is too small.

Signed-off-by Alan Cox <[email protected]>

---

 drivers/staging/gma500/psb_fb.c  |    4 ++--
 drivers/staging/gma500/psb_gtt.c |   17 ++++++++++++++---
 drivers/staging/gma500/psb_gtt.h |    2 +-
 3 files changed, 17 insertions(+), 6 deletions(-)

drivers/staging/gma500/psb_fb.c +2 -2

index 0bad4e0..e06365b 100644
@@ -479,8 +479,8 @@ static int psbfb_create(struct psb_fbdev *fbdev,
 	size = mode_cmd.pitch * mode_cmd.height;
 	aligned_size = ALIGN(size, PAGE_SIZE);
 
-	/* Allocate the framebuffer in the GTT */
-	backing = psb_gtt_alloc_range(dev, aligned_size, "fb");
+	/* Allocate the framebuffer in the GTT with stolen page backing */
+	backing = psb_gtt_alloc_range(dev, aligned_size, "fb", 1);
 	if (backing == NULL)
 	        return -ENOMEM;

drivers/staging/gma500/psb_gtt.c +14 -3

index a97e7be..69323f9 100644
@@ -972,6 +972,7 @@ struct gtt_range *psb_gtt_lookup_handle(struct drm_device *dev, int handle)
  *	@dev: Our DRM device
  *	@len: length (bytes) of address space required
  *	@name: resource name
+ *	@backed: resource should be backed by stolen pages
  *
  *	Ask the kernel core to find us a suitable range of addresses
  *	to use for a GTT mapping.

@@ -981,12 +982,23 @@ struct gtt_range *psb_gtt_lookup_handle(struct drm_device *dev, int handle)
  *	as in use.
  */
 struct gtt_range *psb_gtt_alloc_range(struct drm_device *dev, int len,
-							const char *name)
+						const char *name, int backed)
 {
 	struct drm_psb_private *dev_priv = dev->dev_private;
 	struct gtt_range *gt;
 	struct resource *r = dev_priv->gtt_mem;
 	int ret;
+	unsigned long start, end;
+	
+	if (backed) {
+	        /* The start of the GTT is the stolen pages */
+	        start = r->start;
+	        end = r->start + dev_priv->pg->stolen_size - 1;
+        } else {
+                /* The rest we will use for GEM backed objects */
+                start = r->start + dev_priv->pg->stolen_size;
+                end = -1;
+        }
 
 	gt = kzalloc(sizeof(struct gtt_range), GFP_KERNEL);
 	if (gt == NULL)

@@ -996,8 +1008,7 @@ struct gtt_range *psb_gtt_alloc_range(struct drm_device *dev, int len,
 	kref_init(&gt->kref);
 
 	ret = allocate_resource(dev_priv->gtt_mem, &gt->resource,
-				len, 0, -1, /*r->start, r->end - 1, */
-				PAGE_SIZE, NULL, NULL);
+				len, start, end, PAGE_SIZE, NULL, NULL);
 	if (ret == 0) {
 	        gt->offset = gt->resource.start - r->start;
 		return gt;

drivers/staging/gma500/psb_gtt.h +1 -1

index 010ef70..dc2259c 100644
@@ -105,7 +105,7 @@ extern int psb_gtt_release_handle(struct drm_device *dev, struct gtt_range *gt);
 extern struct gtt_range *psb_gtt_lookup_handle(struct drm_device *dev,
 							int handle);
 extern struct gtt_range *psb_gtt_alloc_range(struct drm_device *dev, int len,
-							const char *name);
+						const char *name, int backed);
 extern void psb_gtt_kref_put(struct gtt_range *gt);
 extern void psb_gtt_free_range(struct drm_device *dev, struct gtt_range *gt);

Greg KH

2011-04-20 20:41 UTC #2 lore raw

Re: [PATCH 1/8] gma500: add the ability to request backed space or not

Quoted 4 lines · Alan Cox

We will will need this for doing a GEM allocator. It should also avoid any crashes with the current code if the stolen area is too small.
Signed-off-by Alan Cox <[email protected]>

What tree did you make this against?

When applying it, I get the following error from git:

Applying: gma500: add the ability to request backed space or not /home/linux/linux/work/staging-2.6/.git/rebase-apply/patch:47: trailing whitespace.

error: patch failed: drivers/staging/gma500/psb_fb.c:479
error: drivers/staging/gma500/psb_fb.c: patch does not apply
error: patch failed: drivers/staging/gma500/psb_gtt.c:972
error: drivers/staging/gma500/psb_gtt.c: patch does not apply
error: patch failed: drivers/staging/gma500/psb_gtt.h:105
error: drivers/staging/gma500/psb_gtt.h: patch does not apply Patch failed at 0001 gma500: add the ability to request backed space or not

Care to redo this series and resend them so I can apply them?

thanks,

greg k-h

Alan Cox

2011-04-20 21:20 UTC #3 lore raw

Re: [PATCH 1/8] gma500: add the ability to request backed space or not

Quoted 7 lines · On Wed, 20 Apr 2011 13:31:17 -0700 Greg KH <[email protected]> wrote:

Quoted 4 lines · Alan Cox
We will will need this for doing a GEM allocator. It should also avoid any crashes with the current code if the stolen area is too small.
Signed-off-by Alan Cox <[email protected]>
What tree did you make this against?

Against -next and the previous patches I sent you. Have you been stripping white space automatically again. That will break follow up patches if so.

I'll try and take a look at it at some point but it may well be mid May.

Alan

Greg KH

2011-04-21 05:05 UTC #4 lore raw

Re: [PATCH 1/8] gma500: add the ability to request backed space or not

Quoted 7 lines · Alan Cox

Quoted 4 lines · On Wed, 20 Apr 2011 13:31:17 -0700 Greg KH <[email protected]> wrote:
Quoted 3 lines · Alan Cox
We will will need this for doing a GEM allocator. It should also avoid any crashes with the current code if the stolen area is too small.

Quoted 7 lines

Quoted 3 lines
Quoted 1 line
Signed-off-by Alan Cox <[email protected]>
What tree did you make this against?
Against -next and the previous patches I sent you. Have you been stripping white space automatically again. That will break follow up patches if so.

No, I have not stripped any more whitespace since the first problems that this caused on the driver.

thanks,

greg k-h

Greg KH

2011-04-21 05:06 UTC #5 lore raw

Re: [PATCH 1/8] gma500: add the ability to request backed space or not

In reply to Alan Cox

Quoted 7 lines · Alan Cox

Quoted 4 lines · On Wed, 20 Apr 2011 13:31:17 -0700 Greg KH <[email protected]> wrote:
Quoted 3 lines · Alan Cox
We will will need this for doing a GEM allocator. It should also avoid any crashes with the current code if the stolen area is too small.

Quoted 7 lines

Quoted 3 lines
Quoted 1 line
Signed-off-by Alan Cox <[email protected]>
What tree did you make this against?
Against -next and the previous patches I sent you. Have you been stripping white space automatically again. That will break follow up patches if so.

Ok, I'm stupid, I missed that you sent me patches already for this driver, and didn't apply them first. Sorry about that, I'll try it again tomorrow when I have more sleep...

thanks,

greg k-h

Alan Cox

2011-04-21 08:48 UTC #6 lore raw

Re: [PATCH 1/8] gma500: add the ability to request backed space or not

Quoted 5 lines

Quoted 3 lines
Against -next and the previous patches I sent you. Have you been stripping white space automatically again. That will break follow up patches if so.
Ok, I'm stupid, I missed that you sent me patches already for this

ITYAM "my superhero powers seem to have faded slightly today"

Quoted 2 lines

driver, and didn't apply them first. Sorry about that, I'll try it again tomorrow when I have more sleep...

Ok cool - that would explain it.

Alan

Greg KH

2011-04-26 00:15 UTC #7 lore raw

Re: [PATCH 1/8] gma500: add the ability to request backed space or not

Quoted 4 lines · Alan Cox

Quoted 4 lines
Quoted 3 lines
Against -next and the previous patches I sent you. Have you been stripping white space automatically again. That will break follow up patches if so.

Quoted 8 lines

Quoted 1 line
Ok, I'm stupid, I missed that you sent me patches already for this
ITYAM "my superhero powers seem to have faded slightly today"
Quoted 2 lines
driver, and didn't apply them first. Sorry about that, I'll try it again tomorrow when I have more sleep...
Ok cool - that would explain it.

Yes, it worked when I applied the first round of patches first, they should now all be queued up.

sorry for the noise,

greg k-h

Alan Cox

author

2011-04-19 14:48 UTC #8 lore raw

PATCH 2/8 gma500: begin adding GEM

In reply to Alan Cox

This puts in place the infrastructure for GEM allocators. Our implementation is fairly simplistic at this point and we don't deal with things like evicting objects from the GART to make space, nor compaction.

We extent our gtt_range struct to include a GEM object and that allows GEM to do all the handle management and most of the memory mapping work for us.

This patch also doesn't load GEM pages into the GART so the GEM side isn't very useful. Before we can do that a fair bit of work is needed reworking the internal GTT code.

Signed-off-by Alan Cox <[email protected]>

---

 drivers/staging/gma500/Makefile  |    1 
 drivers/staging/gma500/psb_drv.c |   18 +++
 drivers/staging/gma500/psb_drv.h |   16 +++
 drivers/staging/gma500/psb_fb.c  |  198 ++++++++++++++----------------------
 drivers/staging/gma500/psb_gem.c |  207 ++++++++++++++++++++++++++++++++++++++
 drivers/staging/gma500/psb_gtt.c |   85 +---------------
 drivers/staging/gma500/psb_gtt.h |   17 +--
 7 files changed, 318 insertions(+), 224 deletions(-)
 create mode 100644 drivers/staging/gma500/psb_gem.c

drivers/staging/gma500/Makefile +1 -0

index e00557e..0c4f7b6 100644
@@ -5,6 +5,7 @@ ccflags-y += -Iinclude/drm
 
 psb_gfx-y += psb_bl.o \
 	  psb_drv.o \
+	  psb_gem.o \
 	  psb_fb.o \
 	  psb_2d.o \
 	  psb_gtt.o \

drivers/staging/gma500/psb_drv.c +15 -3

index d87e00d..d871061 100644
@@ -1405,9 +1405,15 @@ static const struct dev_pm_ops psb_pm_ops = {
 	.runtime_idle = psb_runtime_idle,
 };
 
+static struct vm_operations_struct psb_gem_vm_ops = {
+	.fault = psb_gem_fault,
+	.open = drm_gem_vm_open,
+	.close = drm_gem_vm_close,
+};
+
 static struct drm_driver driver = {
 	.driver_features = DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED | \
-			   DRIVER_IRQ_VBL | DRIVER_MODESET,
+			   DRIVER_IRQ_VBL | DRIVER_MODESET| DRIVER_GEM ,
 	.load = psb_driver_load,
 	.unload = psb_driver_unload,

@@ -1421,13 +1427,19 @@ static struct drm_driver driver = {
 	.enable_vblank = psb_enable_vblank,
 	.disable_vblank = psb_disable_vblank,
 	.get_vblank_counter = psb_get_vblank_counter,
-	.firstopen = NULL,
 	.lastclose = psb_lastclose,
 	.open = psb_driver_open,
+	.preclose = psb_driver_preclose,
 	.postclose = psb_driver_close,
 	.reclaim_buffers = drm_core_reclaim_buffers,
 
-	.preclose = psb_driver_preclose,
+	.gem_init_object = psb_gem_init_object,
+	.gem_free_object = psb_gem_free_object,
+	.gem_vm_ops = &psb_gem_vm_ops,
+	.dumb_create = psb_gem_dumb_create,
+	.dumb_map_offset = psb_gem_dumb_map_gtt,
+	.dumb_destroy = psb_gem_dumb_destroy,
+
 	.fops = {
 		 .owner = THIS_MODULE,
 		 .open = psb_open,

drivers/staging/gma500/psb_drv.h +14 -2

index 9da6a33..aa68ae7 100644
@@ -243,7 +243,6 @@ struct drm_psb_private {
 
 	struct mutex gtt_mutex;
 	struct resource *gtt_mem;	/* Our PCI resource */
-	struct gtt_range *gtt_handles[GTT_MAX];
 
 	struct psb_mmu_driver *mmu;
 	struct psb_mmu_pd *pf_pd;

@@ -627,9 +626,22 @@ extern const struct drm_connector_helper_funcs
 					psb_intel_lvds_connector_helper_funcs;
 extern const struct drm_connector_funcs psb_intel_lvds_connector_funcs;
 
+/* psb_gem.c */
+extern int psb_gem_init_object(struct drm_gem_object *obj);
+extern void psb_gem_free_object(struct drm_gem_object *obj);
+extern int psb_gem_get_aperture(struct drm_device *dev, void *data,
+				struct drm_file *file);
+extern int psb_gem_dumb_create(struct drm_file *file, struct drm_device *dev,
+			struct drm_mode_create_dumb *args);
+extern int psb_gem_dumb_destroy(struct drm_file *file, struct drm_device *dev,
+			uint32_t handle);
+extern int psb_gem_dumb_map_gtt(struct drm_file *file, struct drm_device *dev,
+			 uint32_t handle, uint64_t *offset);
+extern int psb_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf);
+
 
 /*
- *Debug print bits setting
+ * Debug print bits setting
  */
 #define PSB_D_GENERAL (1 << 0)
 #define PSB_D_INIT    (1 << 1)

drivers/staging/gma500/psb_fb.c +74 ~~-124~~

237 lines not on this page · raw message

drivers/staging/gma500/psb_gem.c new file +207 -0

207 lines not on this page · raw message

drivers/staging/gma500/psb_gtt.c +4 ~~-81~~

112 lines not on this page · raw message

drivers/staging/gma500/psb_gtt.h +3 ~~-14~~

index dc2259c..1b5bec0 100644
@@ -87,23 +87,12 @@ extern void psb_gtt_mm_takedown(void);
 struct gtt_range {
 	struct resource resource;
 	u32 offset;
-	int handle;
 	struct kref kref;
+        struct drm_gem_object gem;	/* GEM high level stuff */
+        int in_gart;			/* Currently in the GART */
+        int stolen;			/* Backed from stolen RAM */
 };
 
-/* Most GTT handles we allow allocation of - for now five is fine: we need
-   - Two framebuffers
-   - Maybe an upload area
-   - One cursor (eventually)
-   - One fence page (possibly)
-*/
-
-#define	GTT_MAX		5
-
-extern int psb_gtt_alloc_handle(struct drm_device *dev, struct gtt_range *gt);
-extern int psb_gtt_release_handle(struct drm_device *dev, struct gtt_range *gt);
-extern struct gtt_range *psb_gtt_lookup_handle(struct drm_device *dev,
-							int handle);
 extern struct gtt_range *psb_gtt_alloc_range(struct drm_device *dev, int len,
 						const char *name, int backed);
 extern void psb_gtt_kref_put(struct gtt_range *gt);

Alan Cox

author

2011-04-19 14:48 UTC #9 lore raw

PATCH 3/8 gma500: Add support for inserting and removing pages from the GART

In reply to Alan Cox

There are two chunks of code we need to do this. The first one is the code to insert and remove the pages from the GART, the second is the code to build page table lists from the GEM object. Surprisingly this latter one doesn't seem to have a nice GEM helper.

While we are at it we can begin dismantling the semi redundant struct pg, and finish pruning out the old now unused gtt code as well as the last bits of helper glue from the old driver base.

Signed-off-by Alan Cox <[email protected]>

---

 drivers/staging/gma500/Makefile            |    1 
 drivers/staging/gma500/psb_drv.c           |   24 -
 drivers/staging/gma500/psb_drv.h           |    7 
 drivers/staging/gma500/psb_fb.c            |   34 -
 drivers/staging/gma500/psb_gtt.c           | 1108 ++++++++--------------------
 drivers/staging/gma500/psb_gtt.h           |   52 -
 drivers/staging/gma500/psb_intel_display.c |    7 
 drivers/staging/gma500/psb_powermgmt.c     |    5 
 drivers/staging/gma500/psb_pvr_glue.c      |   73 --
 drivers/staging/gma500/psb_pvr_glue.h      |   25 -
 10 files changed, 338 insertions(+), 998 deletions(-)
 delete mode 100644 drivers/staging/gma500/psb_pvr_glue.c
 delete mode 100644 drivers/staging/gma500/psb_pvr_glue.h

drivers/staging/gma500/Makefile +0 -1

index 0c4f7b6..db73ec6 100644
@@ -17,7 +17,6 @@ psb_gfx-y += psb_bl.o \
 	  psb_intel_modes.o \
 	  psb_intel_sdvo.o \
 	  psb_lid.o \
-	  psb_pvr_glue.o \
 	  psb_mmu.o \
 	  psb_powermgmt.o \
 	  psb_irq.o \

drivers/staging/gma500/psb_drv.c +8 ~~-16~~

index d871061..f501cd7 100644
@@ -499,15 +499,15 @@ static int psb_driver_unload(struct drm_device *dev)
 
 			down_read(&pg->sem);
 			psb_mmu_remove_pfn_sequence(
-					psb_mmu_get_default_pd
-					(dev_priv->mmu),
-					pg->mmu_gatt_start,
-					pg->vram_stolen_size >> PAGE_SHIFT);
+				psb_mmu_get_default_pd
+				(dev_priv->mmu),
+				pg->mmu_gatt_start,
+				dev_priv->vram_stolen_size >> PAGE_SHIFT);
 			up_read(&pg->sem);
 			psb_mmu_driver_takedown(dev_priv->mmu);
 			dev_priv->mmu = NULL;
 		}
-		psb_gtt_takedown(dev_priv->pg, 1);
+		psb_gtt_takedown(dev);
 		if (dev_priv->scratch_page) {
 			__free_page(dev_priv->scratch_page);
 			dev_priv->scratch_page = NULL;

@@ -592,15 +592,7 @@ static int psb_driver_load(struct drm_device *dev, unsigned long chipset)
 
 	set_pages_uc(dev_priv->scratch_page, 1);
 
-	dev_priv->pg = psb_gtt_alloc(dev);
-	if (!dev_priv->pg)
-		goto out_err;
-
-	ret = psb_gtt_init(dev_priv->pg, 0);
-	if (ret)
-		goto out_err;
-
-	ret = psb_gtt_mm_init(dev_priv->pg);
+	ret = psb_gtt_init(dev, 0);
 	if (ret)
 		goto out_err;

@@ -955,8 +947,8 @@ static int psb_stolen_memory_ioctl(struct drm_device *dev, void *data,
 	struct drm_psb_private *dev_priv = psb_priv(dev);
 	struct drm_psb_stolen_memory_arg *arg = data;
 
-	arg->base = dev_priv->pg->stolen_base;
-	arg->size = dev_priv->pg->vram_stolen_size;
+	arg->base = dev_priv->stolen_base;
+	arg->size = dev_priv->vram_stolen_size;
 
 	return 0;
 }

drivers/staging/gma500/psb_drv.h +7 -0

index aa68ae7..4c983ff 100644
@@ -240,6 +240,13 @@ struct drm_psb_private {
 	/* GTT Memory manager */
 	struct psb_gtt_mm *gtt_mm;
 	struct page *scratch_page;
+	u32 *gtt_map;
+	uint32_t stolen_base;
+	void *vram_addr;
+	unsigned long vram_stolen_size;
+	int gtt_initialized;
+	u16 gmch_ctrl;		/* Saved GTT setup */
+	u32 pge_ctl;
 
 	struct mutex gtt_mutex;
 	struct resource *gtt_mem;	/* Our PCI resource */

drivers/staging/gma500/psb_fb.c +9 ~~-25~~

index ffbbbb6..eaf960e 100644
@@ -37,7 +37,6 @@
 #include "psb_intel_reg.h"
 #include "psb_intel_drv.h"
 #include "psb_fb.h"
-#include "psb_pvr_glue.h"
 
 static void psb_user_framebuffer_destroy(struct drm_framebuffer *fb);
 static int psb_user_framebuffer_create_handle(struct drm_framebuffer *fb,

@@ -191,8 +190,7 @@ static int psbfb_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
 	struct psb_framebuffer *psbfb = vma->vm_private_data;
 	struct drm_device *dev = psbfb->base.dev;
 	struct drm_psb_private *dev_priv = dev->dev_private;
-	struct psb_gtt *pg = dev_priv->pg;
-	unsigned long phys_addr = (unsigned long)pg->stolen_base;
+	unsigned long phys_addr = (unsigned long)dev_priv->stolen_base;
 
 	page_num = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;

@@ -241,7 +239,6 @@ static int psbfb_mmap(struct fb_info *info, struct vm_area_struct *vma)
 	char *fb_screen_base = NULL;
 	struct drm_device *dev = psbfb->base.dev;
 	struct drm_psb_private *dev_priv = dev->dev_private;
-	struct psb_gtt *pg = dev_priv->pg;
 
 	if (vma->vm_pgoff != 0)
 		return -EINVAL;

@@ -254,10 +251,11 @@ static int psbfb_mmap(struct fb_info *info, struct vm_area_struct *vma)
 	fb_screen_base = (char *)info->screen_base;
 
 	DRM_DEBUG("vm_pgoff 0x%lx, screen base %p vram_addr %p\n",
-				vma->vm_pgoff, fb_screen_base, pg->vram_addr);
+				vma->vm_pgoff, fb_screen_base,
+                                dev_priv->vram_addr);
 
         /* FIXME: ultimately this needs to become 'if entirely stolen memory' */
-	if (1 || fb_screen_base == pg->vram_addr) {
+	if (1 || fb_screen_base == dev_priv->vram_addr) {
 		vma->vm_ops = &psbfb_vm_ops;
 		vma->vm_private_data = (void *)psbfb;
 		vma->vm_flags |= VM_RESERVED | VM_IO |

@@ -349,7 +347,6 @@ static int psbfb_create(struct psb_fbdev *fbdev,
 {
 	struct drm_device *dev = fbdev->psb_fb_helper.dev;
 	struct drm_psb_private *dev_priv = dev->dev_private;
-	struct psb_gtt *pg = dev_priv->pg;
 	struct fb_info *info;
 	struct drm_framebuffer *fb;
 	struct psb_framebuffer *psbfb;

@@ -409,7 +406,7 @@ static int psbfb_create(struct psb_fbdev *fbdev,
 	/* Accessed via stolen memory directly, This only works for stolem
 	   memory however. Need to address this once we start using gtt
 	   pages we allocate */
-	info->screen_base = (char *)pg->vram_addr + backing->offset;
+	info->screen_base = (char *)dev_priv->vram_addr + backing->offset;
 	info->screen_size = size;
 	memset(info->screen_base, 0, size);

@@ -735,32 +732,19 @@ static void psb_setup_outputs(struct drm_device *dev)
 	}
 }
 
+/* FIXME: rewrite these in terms of the gtt_range and GEM objects
+   rather than faking them as we do now */
+
 static void *psb_bo_from_handle(struct drm_device *dev,
 				struct drm_file *file_priv,
 				unsigned int handle)
 {
-	void *psKernelMemInfo = NULL;
-	void * hKernelMemInfo = (void *)handle;
-	int ret;
-
-	ret = psb_get_meminfo_by_handle(hKernelMemInfo, &psKernelMemInfo);
-	if (ret) {
-		DRM_ERROR("Cannot get meminfo for handle 0x%x\n",
-			  (u32)hKernelMemInfo);
-		return NULL;
-	}
-
-	return (void *)psKernelMemInfo;
+	return NULL;
 }
 
 static size_t psb_bo_size(struct drm_device *dev, void *bof)
 {
-#if 0
-	void *psKernelMemInfo	= (void *)bof;
-	return (size_t)psKernelMemInfo->ui32AllocSize;
-#else
 	return 0;
-#endif
 }
 
 static size_t psb_bo_offset(struct drm_device *dev, void *bof)

drivers/staging/gma500/psb_gtt.c +300 ~~-808~~

1,179 lines not on this page · raw message

drivers/staging/gma500/psb_gtt.h +6 ~~-46~~

80 lines not on this page · raw message

drivers/staging/gma500/psb_intel_display.c +6 -1

index b462f32..6e14657 100644
@@ -1014,6 +1014,8 @@ static void psb_intel_crtc_restore(struct drm_crtc *crtc)
 		REG_WRITE(paletteReg + (i << 2), crtc_state->savePalette[i]);
 }
 
+#if 0
+/* FIXME */
 static int psb_intel_crtc_cursor_set(struct drm_crtc *crtc,
 				 struct drm_file *file_priv,
 				 uint32_t handle,

@@ -1092,7 +1094,7 @@ static int psb_intel_crtc_cursor_set(struct drm_crtc *crtc,
 
 	addr = page_offset << PAGE_SHIFT;
 
-	addr += pg->stolen_base;
+	addr += dev_priv->stolen_base;
 
 	psb_intel_crtc->cursor_addr = addr;

@@ -1146,6 +1148,7 @@ static int psb_intel_crtc_cursor_move(struct drm_crtc *crtc, int x, int y)
 	}
 	return 0;
 }
+#endif
 
 static void psb_intel_crtc_gamma_set(struct drm_crtc *crtc, u16 *red,
 			 u16 *green, u16 *blue, uint32_t type, uint32_t size)

@@ -1329,8 +1332,10 @@ static const struct drm_crtc_helper_funcs psb_intel_helper_funcs = {
 const struct drm_crtc_funcs psb_intel_crtc_funcs = {
 	.save = psb_intel_crtc_save,
 	.restore = psb_intel_crtc_restore,
+/* FIXME 
 	.cursor_set = psb_intel_crtc_cursor_set,
 	.cursor_move = psb_intel_crtc_cursor_move,
+*/	
 	.gamma_set = psb_intel_crtc_gamma_set,
 	.set_config = psb_crtc_set_config,
 	.destroy = psb_intel_crtc_destroy,

drivers/staging/gma500/psb_powermgmt.c +2 -3

index fc0ed7a..1495415 100644
@@ -269,7 +269,6 @@ static void gma_resume_display(struct pci_dev *pdev)
 {
 	struct drm_device *dev = pci_get_drvdata(pdev);
 	struct drm_psb_private *dev_priv = dev->dev_private;
-	struct psb_gtt *pg = dev_priv->pg;
 
 	if (dev_priv->suspended == false)
 		return;

@@ -277,9 +276,9 @@ static void gma_resume_display(struct pci_dev *pdev)
 	/* turn on the display power island */
 	power_up(dev);
 
-	PSB_WVDC32(pg->pge_ctl | _PSB_PGETBL_ENABLED, PSB_PGETBL_CTL);
+	PSB_WVDC32(dev_priv->pge_ctl | _PSB_PGETBL_ENABLED, PSB_PGETBL_CTL);
 	pci_write_config_word(pdev, PSB_GMCH_CTRL,
-			pg->gmch_ctrl | _PSB_GMCH_ENABLED);
+			dev_priv->gmch_ctrl | _PSB_GMCH_ENABLED);
 
 	/* Don't reinitialize the GTT as it is unnecessary.  The gtt is
 	 * stored in memory so it will automatically be restored.  All

drivers/staging/gma500/psb_pvr_glue.c deleted +0 ~~-73~~

73 lines not on this page · raw message

drivers/staging/gma500/psb_pvr_glue.h deleted +0 ~~-25~~

deleted file mode 100644
index dee8cb2..0000000
@@ -1,25 +0,0 @@
-/*
- * Copyright (c) 2009, Intel Corporation.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- *
- */
-
-#include "psb_drv.h"
-
-extern int psb_get_meminfo_by_handle(void * hKernelMemInfo,
-				void **ppsKernelMemInfo);
-extern u32 psb_get_tgid(void);
-extern int psb_get_pages_by_mem_handle(void * hOSMemHandle,
-					struct page ***pages);

Alan Cox

author

2011-04-19 14:48 UTC #10 lore raw

PATCH 4/8 gma500: Begin the GEMification of the cursor code

In reply to Alan Cox

Do a first pass over the cursor code and rework it to use GEM objects for the cursor buffer as we need.

Signed-off-by Alan Cox <[email protected]>

---

 drivers/staging/gma500/psb_fb.c            |   32 ++--------------
 drivers/staging/gma500/psb_intel_display.c |   56 +++++++++++-----------------
 drivers/staging/gma500/psb_intel_drv.h     |   13 +------
 3 files changed, 26 insertions(+), 75 deletions(-)

drivers/staging/gma500/psb_fb.c +3 ~~-29~~

index eaf960e..4ea39d6 100644
@@ -732,39 +732,17 @@ static void psb_setup_outputs(struct drm_device *dev)
 	}
 }
 
-/* FIXME: rewrite these in terms of the gtt_range and GEM objects
+/* FIXME: rewrite this in terms of the gtt_range and GEM objects
    rather than faking them as we do now */
 
-static void *psb_bo_from_handle(struct drm_device *dev,
-				struct drm_file *file_priv,
-				unsigned int handle)
-{
-	return NULL;
-}
-
-static size_t psb_bo_size(struct drm_device *dev, void *bof)
-{
-	return 0;
-}
-
-static size_t psb_bo_offset(struct drm_device *dev, void *bof)
+static size_t psb_bo_offset(struct drm_device *dev, void *obj)
 {
 	struct psb_framebuffer *psbfb
-		= (struct psb_framebuffer *)bof;
+		= (struct psb_framebuffer *)obj;
 
 	return (size_t)psbfb->offset;
 }
 
-static int psb_bo_pin_for_scanout(struct drm_device *dev, void *bo)
-{
-	 return 0;
-}
-
-static int psb_bo_unpin_for_scanout(struct drm_device *dev, void *bo)
-{
-	return 0;
-}
-
 void psb_modeset_init(struct drm_device *dev)
 {
 	struct drm_psb_private *dev_priv =

@@ -774,11 +752,7 @@ void psb_modeset_init(struct drm_device *dev)
 
 	PSB_DEBUG_ENTRY("\n");
 	/* Init mm functions */
-	mode_dev->bo_from_handle = psb_bo_from_handle;
-	mode_dev->bo_size = psb_bo_size;
 	mode_dev->bo_offset = psb_bo_offset;
-	mode_dev->bo_pin_for_scanout = psb_bo_pin_for_scanout;
-	mode_dev->bo_unpin_for_scanout = psb_bo_unpin_for_scanout;
 
 	drm_mode_config_init(dev);

drivers/staging/gma500/psb_intel_display.c +21 ~~-35~~

144 lines not on this page · raw message

drivers/staging/gma500/psb_intel_drv.h +2 ~~-11~~

index f6229c5..6006ddd 100644
@@ -76,13 +76,7 @@ struct psb_intel_mode_device {
 	/*
 	 * Abstracted memory manager operations
 	 */
-	void *(*bo_from_handle) (struct drm_device *dev,
-				 struct drm_file *file_priv,
-				 unsigned int handle);
-	 size_t(*bo_size) (struct drm_device *dev, void *bo);
 	 size_t(*bo_offset) (struct drm_device *dev, void *bo);
-	int (*bo_pin_for_scanout) (struct drm_device *dev, void *bo);
-	int (*bo_unpin_for_scanout) (struct drm_device *dev, void *bo);
 
 	/*
 	 * Cursor

@@ -156,11 +150,8 @@ struct psb_intel_crtc {
 	/* a mode_set for fbdev users on this crtc */
 	struct drm_mode_set mode_set;
 
-	/* current bo we scanout from */
-	void *scanout_bo;
-
-	/* current bo we cursor from */
-	void *cursor_bo;
+	/* GEM object that holds our cursor */
+	struct drm_gem_object *cursor_obj;
 
 	struct drm_display_mode saved_mode;
 	struct drm_display_mode saved_adjusted_mode;

Alan Cox

author

2011-04-19 14:49 UTC #11 lore raw

PATCH 5/8 gma500: GEMify the frame buffer base bits

In reply to Alan Cox

This then kills off the old bo_ interfaces

Signed-off-by Alan Cox <[email protected]>

---

 drivers/staging/gma500/mrst_crtc.c         |   15 +++++++--------
 drivers/staging/gma500/psb_2d.c            |    4 ++--
 drivers/staging/gma500/psb_drm.h           |   11 -----------
 drivers/staging/gma500/psb_drv.c           |    4 ++--
 drivers/staging/gma500/psb_drv.h           |    2 --
 drivers/staging/gma500/psb_fb.c            |   24 +++++-------------------
 drivers/staging/gma500/psb_fb.h            |    5 +----
 drivers/staging/gma500/psb_intel_display.c |   14 +++++++-------
 8 files changed, 24 insertions(+), 55 deletions(-)

drivers/staging/gma500/mrst_crtc.c +7 -8

index 664d0e7..e4a0c03 100644
@@ -530,9 +530,8 @@ int mrst_pipe_set_base(struct drm_crtc *crtc,
 	/* struct drm_i915_master_private *master_priv; */
 	struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);
 	struct psb_framebuffer *psbfb = to_psb_fb(crtc->fb);
-	struct psb_intel_mode_device *mode_dev = psb_intel_crtc->mode_dev;
 	int pipe = psb_intel_crtc->pipe;
-	unsigned long Start, Offset;
+	unsigned long start, offset;
 	/* FIXME: check if we need this surely MRST is pipe 0 only */
 	int dspbase = (pipe == 0 ? DSPALINOFF : DSPBBASE);
 	int dspsurf = (pipe == 0 ? DSPASURF : DSPBSURF);

@@ -552,8 +551,8 @@ int mrst_pipe_set_base(struct drm_crtc *crtc,
 	if (!gma_power_begin(dev, true))
 		return 0;
 
-	Start = mode_dev->bo_offset(dev, psbfb);
-	Offset = y * crtc->fb->pitch + x * (crtc->fb->bits_per_pixel / 8);
+	start = psbfb->gtt->offset;
+	offset = y * crtc->fb->pitch + x * (crtc->fb->bits_per_pixel / 8);
 
 	REG_WRITE(dspstride, crtc->fb->pitch);

@@ -581,14 +580,14 @@ int mrst_pipe_set_base(struct drm_crtc *crtc,
 	}
 	REG_WRITE(dspcntr_reg, dspcntr);
 
-	DRM_DEBUG("Writing base %08lX %08lX %d %d\n", Start, Offset, x, y);
+	DRM_DEBUG("Writing base %08lX %08lX %d %d\n", start, offset, x, y);
 	if (0 /* FIXMEAC - check what PSB needs */) {
-		REG_WRITE(dspbase, Offset);
+		REG_WRITE(dspbase, offset);
 		REG_READ(dspbase);
-		REG_WRITE(dspsurf, Start);
+		REG_WRITE(dspsurf, start);
 		REG_READ(dspsurf);
 	} else {
-		REG_WRITE(dspbase, Start + Offset);
+		REG_WRITE(dspbase, start + offset);
 		REG_READ(dspbase);
 	}

drivers/staging/gma500/psb_2d.c +2 -2

index 29959de..0bd834c 100644
@@ -160,7 +160,7 @@ static void psbfb_fillrect_accel(struct fb_info *info,
 	if (!fb)
 		return;
 
-	offset = psbfb->offset;
+	offset = psbfb->gtt->offset;
 	stride = fb->pitch;
 
 	switch (fb->depth) {

@@ -303,7 +303,7 @@ static void psbfb_copyarea_accel(struct fb_info *info,
 	if (!fb)
 		return;
 
-	offset = psbfb->offset;
+	offset = psbfb->gtt->offset;
 	stride = fb->pitch;
 
 	switch (fb->depth) {

drivers/staging/gma500/psb_drm.h +0 ~~-11~~

index 28862c7..49ffdd5 100644
@@ -219,17 +219,6 @@ struct drm_psb_register_rw_arg {
 	u32 subpicture_disable_mask;
 };
 
-struct psb_gtt_mapping_arg {
-	void *hKernelMemInfo;
-	u32 offset_pages;
-};
-
-struct drm_psb_getpageaddrs_arg {
-	u32 handle;
-	unsigned long *page_addrs;
-	unsigned long gtt_offset;
-};
-
 /* Controlling the kernel modesetting buffers */
 
 #define DRM_PSB_KMS_OFF		0x00

drivers/staging/gma500/psb_drv.c +2 -2

index f501cd7..01f6ed7 100644
@@ -870,11 +870,11 @@ static int psb_mode_operation_ioctl(struct drm_device *dev, void *data,
 		psb_fb = to_psb_fb(drm_fb);
 
 		if (gma_power_begin(dev, 0)) {
-			REG_WRITE(DSPASURF, psb_fb->offset);
+			REG_WRITE(DSPASURF, psb_fb->gtt->offset);
 			REG_READ(DSPASURF);
 			gma_power_end(dev);
 		} else {
-			dev_priv->saveDSPASURF = psb_fb->offset;
+			dev_priv->saveDSPASURF = psb_fb->gtt->offset;
 		}
 
 		return 0;

drivers/staging/gma500/psb_drv.h +0 -2

index 4c983ff..e19a454 100644
@@ -35,8 +35,6 @@
 /*Append new drm mode definition here, align with libdrm definition*/
 #define DRM_MODE_SCALE_NO_SCALE   2
 
-extern struct ttm_bo_driver psb_ttm_bo_driver;
-
 enum {
 	CHIP_PSB_8108 = 0,
 	CHIP_PSB_8109 = 1,

drivers/staging/gma500/psb_fb.c +5 ~~-19~~

index 4ea39d6..f36e83f 100644
@@ -310,7 +310,7 @@ static struct fb_ops psbfb_ops = {
 
 static struct drm_framebuffer *psb_framebuffer_create
 			(struct drm_device *dev, struct drm_mode_fb_cmd *r,
-			 void *mm_private)
+			 struct gtt_range *gt)
 {
 	struct psb_framebuffer *fb;
 	int ret;

@@ -326,7 +326,7 @@ static struct drm_framebuffer *psb_framebuffer_create
 
 	drm_helper_mode_fill_fb_struct(&fb->base, r);
 
-	fb->mem = mm_private;
+	fb->gtt = gt;
 
 	return &fb->base;

@@ -380,7 +380,6 @@ static int psbfb_create(struct psb_fbdev *fbdev,
 		goto out_err1;
 	}
 	psbfb = to_psb_fb(fb);
-	psbfb->size = size;
 
 	info = framebuffer_alloc(sizeof(struct psb_fbdev), device);
 	if (!info) {

@@ -524,7 +523,7 @@ int psb_fbdev_destroy(struct drm_device *dev, struct psb_fbdev *fbdev)
 
 	if (fbdev->psb_fb_helper.fbdev) {
 		info = fbdev->psb_fb_helper.fbdev;
-		psb_gtt_free_range(dev, psbfb->mem);
+		psb_gtt_free_range(dev, psbfb->gtt);
 		unregister_framebuffer(info);
 		iounmap(info->screen_base);
 		framebuffer_release(info);

@@ -611,7 +610,7 @@ static int psb_user_framebuffer_create_handle(struct drm_framebuffer *fb,
 					      unsigned int *handle)
 {
         struct psb_framebuffer *psbfb = to_psb_fb(fb);
-        struct gtt_range *r = psbfb->mem;
+        struct gtt_range *r = psbfb->gtt;
         return drm_gem_handle_create(file_priv, &r->gem, handle);
 }

@@ -626,7 +625,7 @@ static void psb_user_framebuffer_destroy(struct drm_framebuffer *fb)
 {
 	struct drm_device *dev = fb->dev;
 	struct psb_framebuffer *psbfb = to_psb_fb(fb);
-	struct gtt_range *r = psbfb->mem;
+	struct gtt_range *r = psbfb->gtt;
 
 	if (psbfb->fbdev)
 		psbfb_remove(dev, fb);

@@ -732,17 +731,6 @@ static void psb_setup_outputs(struct drm_device *dev)
 	}
 }
 
-/* FIXME: rewrite this in terms of the gtt_range and GEM objects
-   rather than faking them as we do now */
-
-static size_t psb_bo_offset(struct drm_device *dev, void *obj)
-{
-	struct psb_framebuffer *psbfb
-		= (struct psb_framebuffer *)obj;
-
-	return (size_t)psbfb->offset;
-}
-
 void psb_modeset_init(struct drm_device *dev)
 {
 	struct drm_psb_private *dev_priv =

@@ -751,8 +739,6 @@ void psb_modeset_init(struct drm_device *dev)
 	int i;
 
 	PSB_DEBUG_ENTRY("\n");
-	/* Init mm functions */
-	mode_dev->bo_offset = psb_bo_offset;
 
 	drm_mode_config_init(dev);

drivers/staging/gma500/psb_fb.h +1 -4

index b943a9f..c8ec0d6 100644
@@ -32,10 +32,7 @@ struct psb_framebuffer {
 	struct drm_framebuffer base;
 	struct address_space *addr_space;
 	struct fb_info *fbdev;
-	struct gtt_range *mem;
-	void * hKernelMemInfo;
-	uint32_t size;
-	uint32_t offset;
+	struct gtt_range *gtt;
 };
 
 struct psb_fbdev {

drivers/staging/gma500/psb_intel_display.c +7 -7

index 697e1c3..4d384d5 100644
@@ -343,7 +343,7 @@ int psb_intel_pipe_set_base(struct drm_crtc *crtc,
 	struct psb_framebuffer *psbfb = to_psb_fb(crtc->fb);
 	struct psb_intel_mode_device *mode_dev = psb_intel_crtc->mode_dev;
 	int pipe = psb_intel_crtc->pipe;
-	unsigned long Start, Offset;
+	unsigned long start, offset;
 	int dspbase = (pipe == 0 ? DSPABASE : DSPBBASE);
 	int dspsurf = (pipe == 0 ? DSPASURF : DSPBSURF);
 	int dspstride = (pipe == 0) ? DSPASTRIDE : DSPBSTRIDE;

@@ -362,8 +362,8 @@ int psb_intel_pipe_set_base(struct drm_crtc *crtc,
 	if (!gma_power_begin(dev, true))
 		return 0;
 
-	Start = mode_dev->bo_offset(dev, psbfb);
-	Offset = y * crtc->fb->pitch + x * (crtc->fb->bits_per_pixel / 8);
+	start = psbfb->gtt->offset;
+	offset = y * crtc->fb->pitch + x * (crtc->fb->bits_per_pixel / 8);
 
 	REG_WRITE(dspstride, crtc->fb->pitch);

@@ -391,14 +391,14 @@ int psb_intel_pipe_set_base(struct drm_crtc *crtc,
 	}
 	REG_WRITE(dspcntr_reg, dspcntr);
 
-	DRM_DEBUG("Writing base %08lX %08lX %d %d\n", Start, Offset, x, y);
+	DRM_DEBUG("Writing base %08lX %08lX %d %d\n", start, offset, x, y);
 	if (0 /* FIXMEAC - check what PSB needs */) {
-		REG_WRITE(dspbase, Offset);
+		REG_WRITE(dspbase, offset);
 		REG_READ(dspbase);
-		REG_WRITE(dspsurf, Start);
+		REG_WRITE(dspsurf, start);
 		REG_READ(dspsurf);
 	} else {
-		REG_WRITE(dspbase, Start + Offset);
+		REG_WRITE(dspbase, start + offset);
 		REG_READ(dspbase);
 	}

Alan Cox

author

2011-04-19 14:49 UTC #12 lore raw

PATCH 6/8 gma500: GEM - now we have the basics we shall stick pins in it

In reply to Alan Cox

Signed-off-by Alan Cox <[email protected]>

---

 drivers/staging/gma500/psb_gtt.c           |   70 +++++++++++++++++++++-------
 drivers/staging/gma500/psb_gtt.h           |   13 ++---
 drivers/staging/gma500/psb_intel_display.c |   33 ++++++++-----
 3 files changed, 80 insertions(+), 36 deletions(-)

drivers/staging/gma500/psb_gtt.c +53 ~~-17~~

index 090d30e..a991c12 100644
@@ -66,7 +66,6 @@ u32 *psb_gtt_entry(struct drm_device *dev, struct gtt_range *r)
 	return dev_priv->gtt_map + (offset >> PAGE_SHIFT);
 }
 
-
 /**
  *	psb_gtt_insert	-	put an object into the GART
  *	@dev: our DRM device

@@ -77,21 +76,19 @@ u32 *psb_gtt_entry(struct drm_device *dev, struct gtt_range *r)
  *
  *	FIXME: gtt lock ?
  */
-int psb_gtt_insert(struct drm_device *dev, struct gtt_range *r)
+static int psb_gtt_insert(struct drm_device *dev, struct gtt_range *r)
 {
 	u32 *gtt_slot, pte;
 	int numpages = (r->resource.end + 1 - r->resource.start) >> PAGE_SHIFT;
 	struct page **pages;
 	int i;
 
-	if (r->stolen)
-		return 0;
 	if (r->pages == NULL) {
 		WARN_ON(1);
 		return -EINVAL;
 	}
 
-	WARN_ON(r->in_gart);	/* refcount these maybe ? */
+	WARN_ON(r->stolen);	/* refcount these maybe ? */
 
 	gtt_slot = psb_gtt_entry(dev, r);
 	pages = r->pages;

@@ -118,16 +115,14 @@ int psb_gtt_insert(struct drm_device *dev, struct gtt_range *r)
  *	page table entries with the dummy page
  */
 
-void psb_gtt_remove(struct drm_device *dev, struct gtt_range *r)
+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 = (r->resource.end + 1 - r->resource.start) >> PAGE_SHIFT;
 	int i;
 
-	if (r->stolen)
-		return;
-	WARN_ON(!r->in_gart);
+	WARN_ON(r->stolen);
 
 	gtt_slot = psb_gtt_entry(dev, r);
 	pte = psb_gtt_mask_pte(page_to_pfn(dev_priv->scratch_page), 0);;

@@ -146,7 +141,7 @@ void psb_gtt_remove(struct drm_device *dev, struct gtt_range *r)
  *	Pin and build an in kernel list of the pages that back our GEM object.
  *	While we hold this the pages cannot be swapped out
  */
-int psb_gtt_attach_pages(struct gtt_range *gt)
+static int psb_gtt_attach_pages(struct gtt_range *gt)
 {
 	struct inode *inode;
 	struct address_space *mapping;

@@ -189,13 +184,11 @@ err:
  *	must have been removed from the GART as they could now be paged out
  *	and move bus address.
  */
-void psb_gtt_detach_pages(struct gtt_range *gt)
+static void psb_gtt_detach_pages(struct gtt_range *gt)
 {
 	int i;
 	int pages = (gt->resource.end + 1 - gt->resource.start) >> PAGE_SHIFT;
 
-	WARN_ON(gt->in_gart);
-
 	for (i = 0; i < pages; i++) {
 		/* FIXME: do we need to force dirty */
 		set_page_dirty(gt->pages[i]);

@@ -207,6 +200,50 @@ void psb_gtt_detach_pages(struct gtt_range *gt)
 }
 
 /*
+ *	Manage pinning of resources into the GART
+ */
+
+int psb_gtt_pin(struct drm_device *dev, struct gtt_range *gt)
+{
+	int ret;
+	struct drm_psb_private *dev_priv = dev->dev_private;
+
+	mutex_lock(&dev_priv->gtt_mutex);
+
+	if (gt->in_gart == 0 && gt->stolen == 0) {
+		ret = psb_gtt_attach_pages(gt);
+		if (ret < 0)
+			goto out;
+		ret = psb_gtt_insert(dev, gt);
+		if (ret < 0) {
+			psb_gtt_detach_pages(gt);
+			goto out;
+		}
+	}
+	gt->in_gart++;
+out:
+	mutex_unlock(&dev_priv->gtt_mutex);
+	return ret;
+}
+
+void psb_gtt_unpin(struct drm_device *dev, struct gtt_range *gt)
+{
+	struct drm_psb_private *dev_priv = dev->dev_private;
+
+	mutex_lock(&dev_priv->gtt_mutex);
+
+	WARN_ON(!gt->in_gart);
+
+	gt->in_gart--;
+	if (gt->in_gart == 0 && gt->stolen == 0) {
+		psb_gtt_remove(dev, gt);
+		psb_gtt_detach_pages(gt);
+	}
+
+	mutex_unlock(&dev_priv->gtt_mutex);
+}
+	
+/*
  *	GTT resource allocator - allocate and manage GTT address space
  */

@@ -265,10 +302,7 @@ struct gtt_range *psb_gtt_alloc_range(struct drm_device *dev, int len,
 static void psb_gtt_destroy(struct kref *kref)
 {
 	struct gtt_range *gt = container_of(kref, struct gtt_range, kref);
-	if (gt->in_gart && !gt->stolen)
-		psb_gtt_remove(gt->gem.dev, gt);
-	if (gt->pages)
-		psb_gtt_detach_pages(gt);
+	WARN_ON(gt->in_gart && !gt->stolen);
 	release_resource(&gt->resource);
 	kfree(gt);
 }

@@ -345,6 +379,8 @@ int psb_gtt_init(struct drm_device *dev, int resume)
 	int ret = 0;
 	uint32_t pte;
 
+	mutex_init(&dev_priv->gtt_mutex);
+
 	dev_priv->pg = pg = psb_gtt_alloc(dev);
 	if (pg == NULL)
 	        return -ENOMEM;

drivers/staging/gma500/psb_gtt.h +6 -7

index b5d6530..dc553e0 100644
@@ -44,18 +44,17 @@ struct gtt_range {
 	struct resource resource;
 	u32 offset;
 	struct kref kref;
-        struct drm_gem_object gem;	/* GEM high level stuff */
-        int in_gart;			/* Currently in the GART */
-        int stolen;			/* Backed from stolen RAM */
-        struct page **pages;		/* Backing pages if present */
+	struct drm_gem_object gem;	/* GEM high level stuff */
+	int in_gart;			/* Currently in the GART (ref ct) */
+        bool stolen;			/* Backed from stolen RAM */
+	struct page **pages;		/* Backing pages if present */
 };
 
-extern int psb_gtt_insert(struct drm_device *dev, struct gtt_range *r);
-extern void psb_gtt_remove(struct drm_device *dev, struct gtt_range *r);
-
 extern struct gtt_range *psb_gtt_alloc_range(struct drm_device *dev, int len,
 						const char *name, int backed);
 extern void psb_gtt_kref_put(struct gtt_range *gt);
 extern void psb_gtt_free_range(struct drm_device *dev, struct gtt_range *gt);
+extern int psb_gtt_pin(struct drm_device *dev, struct gtt_range *gt);
+extern void psb_gtt_unpin(struct drm_device *dev, struct gtt_range *gt);
 
 #endif

drivers/staging/gma500/psb_intel_display.c +21 ~~-12~~

index 4d384d5..b5a36d2 100644
@@ -341,7 +341,6 @@ int psb_intel_pipe_set_base(struct drm_crtc *crtc,
 	/* struct drm_i915_master_private *master_priv; */
 	struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);
 	struct psb_framebuffer *psbfb = to_psb_fb(crtc->fb);
-	struct psb_intel_mode_device *mode_dev = psb_intel_crtc->mode_dev;
 	int pipe = psb_intel_crtc->pipe;
 	unsigned long start, offset;
 	int dspbase = (pipe == 0 ? DSPABASE : DSPBBASE);

@@ -1020,8 +1019,6 @@ static int psb_intel_crtc_cursor_set(struct drm_crtc *crtc,
 				 uint32_t width, uint32_t height)
 {
 	struct drm_device *dev = crtc->dev;
-	struct drm_psb_private *dev_priv =
-				(struct drm_psb_private *)dev->dev_private;
 	struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);
 	int pipe = psb_intel_crtc->pipe;
 	uint32_t control = (pipe == 0) ? CURACNTR : CURBCNTR;

@@ -1048,6 +1045,9 @@ static int psb_intel_crtc_cursor_set(struct drm_crtc *crtc,
 
 		/* Unpin the old GEM object */
 		if (psb_intel_crtc->cursor_obj) {
+                	gt = container_of(psb_intel_crtc->cursor_obj,
+                	                        struct gtt_range, gem);
+			psb_gtt_unpin(crtc->dev, gt);
 			drm_gem_object_unreference(psb_intel_crtc->cursor_obj);
 			psb_intel_crtc->cursor_obj = NULL;
 		}

@@ -1070,19 +1070,17 @@ static int psb_intel_crtc_cursor_set(struct drm_crtc *crtc,
 		return -ENOMEM;
 	}
 
-	/*insert this bo into gtt*/
-	DRM_DEBUG("%s: map meminfo for hw cursor. handle %x\n",
-						__func__, handle);
+	gt = container_of(obj, struct gtt_range, gem);
 
-/* Pin : FIXME
+	/* Pin the memory into the GTT */
+	ret = psb_gtt_pin(crtc->dev, gt);
 	if (ret) {
-		DRM_ERROR("Can not map meminfo to GTT. handle 0x%x\n", handle);
+		DRM_ERROR("Can not pin down handle 0x%x\n", handle);
 		return ret;
 	}
-*/
-	gt = container_of(obj, struct gtt_range, gem);
 
-	addr = gt->resource.start;
+
+	addr = gt->offset;	/* Or resource.start ??? */
 
 	psb_intel_crtc->cursor_addr = addr;

@@ -1099,6 +1097,9 @@ static int psb_intel_crtc_cursor_set(struct drm_crtc *crtc,
 
 	/* unpin the old bo */
 	if (psb_intel_crtc->cursor_obj && psb_intel_crtc->cursor_obj != obj) {
+               	gt = container_of(psb_intel_crtc->cursor_obj,
+               	                        struct gtt_range, gem);
+		psb_gtt_unpin(crtc->dev, gt);
 		drm_gem_object_unreference(psb_intel_crtc->cursor_obj);
 		psb_intel_crtc->cursor_obj = obj;
 	}

@@ -1301,8 +1302,16 @@ struct drm_display_mode *psb_intel_crtc_mode_get(struct drm_device *dev,
 static void psb_intel_crtc_destroy(struct drm_crtc *crtc)
 {
 	struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);
+	struct gtt_range *gt;
 
-	/* FIXME: do we need to put the final GEM cursor ? */
+	/* Unpin the old GEM object */
+	if (psb_intel_crtc->cursor_obj) {
+		gt = container_of(psb_intel_crtc->cursor_obj,
+						struct gtt_range, gem);
+		psb_gtt_unpin(crtc->dev, gt);
+		drm_gem_object_unreference(psb_intel_crtc->cursor_obj);
+		psb_intel_crtc->cursor_obj = NULL;
+	}
 	kfree(psb_intel_crtc->crtc_state);
 	drm_crtc_cleanup(crtc);
 	kfree(psb_intel_crtc);

Alan Cox

author

2011-04-19 14:49 UTC #13 lore raw

PATCH 7/8 gma500: prune some unused variables

In reply to Alan Cox

Signed-off-by Alan Cox <[email protected]>

---

 drivers/staging/gma500/psb_intel_lvds.c |   14 +++++---------
 1 files changed, 5 insertions(+), 9 deletions(-)

drivers/staging/gma500/psb_intel_lvds.c +5 -9

index 28e04a3..b0a225b 100644
@@ -32,13 +32,6 @@
 #include "psb_powermgmt.h"
 #include <linux/pm_runtime.h>
 
-/* MRST defines start */
-uint8_t blc_freq;
-uint8_t blc_minbrightness;
-uint8_t blc_i2caddr;
-uint8_t blc_brightnesscmd;
-int lvds_backlight;		/* restore backlight to this value */
-
 u32 CoreClock;
 u32 PWMControlRegFreq;

@@ -97,8 +90,11 @@ static u32 psb_intel_lvds_get_max_backlight(struct drm_device *dev)
 	return retVal;
 }
 
-/**
+/*
  * Set LVDS backlight level by I2C command
+ *
+ * FIXME: at some point we need to both track this for PM and also
+ * disable runtime pm on MRST if the brightness is nil (ie blanked)
  */
 static int psb_lvds_i2c_set_brightness(struct drm_device *dev,
 					unsigned int level)

@@ -131,7 +127,7 @@ static int psb_lvds_i2c_set_brightness(struct drm_device *dev,
 
 	if (i2c_transfer(&lvds_i2c_bus->adapter, msgs, 1) == 1) {
 		DRM_DEBUG("I2C set brightness.(command, value) (%d, %d)\n",
-			blc_brightnesscmd,
+			dev_priv->lvds_bl->brightnesscmd,
 			blc_i2c_brightness);
 		return 0;
 	}

Alan Cox

author

2011-04-19 14:49 UTC #14 lore raw

PATCH 8/8 gma500: allow non stolen page backed framebuffer

In reply to Alan Cox

For Moorestown at least we may not have stolen RAM with which to back the initial framebuffer. Allow a GEM backing.

At this point we should have all the bits in place needed to make it work once it has been debugged.

Signed-off-by Alan Cox <[email protected]>

---

 drivers/staging/gma500/psb_fb.c            |   43 ++++++++++++++++++++++++++--
 drivers/staging/gma500/psb_gem.c           |    2 +
 drivers/staging/gma500/psb_gtt.c           |    1 -
 drivers/staging/gma500/psb_intel_display.c |   36 +++++++++++++++--------
 4 files changed, 65 insertions(+), 17 deletions(-)

drivers/staging/gma500/psb_fb.c +40 -3

index f36e83f..ae097cd 100644
@@ -336,6 +336,38 @@ err:
 }
 
 /**
+ *	psbfb_alloc		-	allocate frame buffer memory
+ *	@dev: the DRM device
+ *	@aligned_size: space needed
+ *
+ *	Allocate the frame buffer. In the usual case we get a GTT range that
+ *	is stolen memory backed and life is simple. If there isn't sufficient
+ *	stolen memory or the system has no stolen memory we allocate a range
+ *	and back it with a GEM object.
+ *
+ *	In this case the GEM object has no handle. 
+ */
+static struct gtt_range *psbfb_alloc(struct drm_device *dev, int aligned_size)
+{
+	struct gtt_range *backing;
+	/* Begin by trying to use stolen memory backing */
+	backing = psb_gtt_alloc_range(dev, aligned_size, "fb", 1);
+	if (backing)
+		return backing;
+	/* Next try using GEM host memory */
+	backing = psb_gtt_alloc_range(dev, aligned_size, "fb(gem)", 0);
+	if (backing == NULL)
+		return NULL;
+
+	/* Now back it with an object */
+	if (drm_gem_object_init(dev, &backing->gem, aligned_size) != 0) {
+		psb_gtt_free_range(dev, backing);
+		return NULL;
+	}
+	return backing;
+}
+	
+/**
  *	psbfb_create		-	create a framebuffer
  *	@fbdev: the framebuffer device
  *	@sizes: specification of the layout

@@ -368,7 +400,7 @@ static int psbfb_create(struct psb_fbdev *fbdev,
 	aligned_size = ALIGN(size, PAGE_SIZE);
 
 	/* Allocate the framebuffer in the GTT with stolen page backing */
-	backing = psb_gtt_alloc_range(dev, aligned_size, "fb", 1);
+	backing = psbfb_alloc(dev, aligned_size);
 	if (backing == NULL)
 	        return -ENOMEM;

@@ -523,7 +555,13 @@ int psb_fbdev_destroy(struct drm_device *dev, struct psb_fbdev *fbdev)
 
 	if (fbdev->psb_fb_helper.fbdev) {
 		info = fbdev->psb_fb_helper.fbdev;
-		psb_gtt_free_range(dev, psbfb->gtt);
+		/* FIXME: this is a bit more inside knowledge than I'd like
+		   but I don't see how to make a fake GEM object of the
+		   stolen space nicely */
+		if (psbfb->gtt->stolen)
+			psb_gtt_free_range(dev, psbfb->gtt);
+		else
+			drm_gem_object_unreference(&psbfb->gtt->gem);
 		unregister_framebuffer(info);
 		iounmap(info->screen_base);
 		framebuffer_release(info);

@@ -571,7 +609,6 @@ void psb_fbdev_fini(struct drm_device *dev)
 	dev_priv->fbdev = NULL;
 }
 
-
 static void psbfb_output_poll_changed(struct drm_device *dev)
 {
 	struct drm_psb_private *dev_priv = dev->dev_private;

drivers/staging/gma500/psb_gem.c +2 -0

index 0438bf4..d47c187 100644
@@ -39,6 +39,8 @@ int psb_gem_init_object(struct drm_gem_object *obj)
 
 void psb_gem_free_object(struct drm_gem_object *obj)
 {
+	struct gtt_range *gtt = container_of(obj, struct gtt_range, gem);
+	psb_gtt_free_range(obj->dev, gtt);
 	drm_gem_object_release(obj);
 }

drivers/staging/gma500/psb_gtt.c +0 -1

index a991c12..10d772a 100644
@@ -298,7 +298,6 @@ struct gtt_range *psb_gtt_alloc_range(struct drm_device *dev, int len,
 	return NULL;
 }
 
-
 static void psb_gtt_destroy(struct kref *kref)
 {
 	struct gtt_range *gt = container_of(kref, struct gtt_range, kref);

drivers/staging/gma500/psb_intel_display.c +23 ~~-13~~

index b5a36d2..9e1446f 100644
@@ -361,7 +361,13 @@ int psb_intel_pipe_set_base(struct drm_crtc *crtc,
 	if (!gma_power_begin(dev, true))
 		return 0;
 
+	/* We are displaying this buffer, make sure it is actually loaded
+	   into the GTT */
+	ret = psb_gtt_pin(dev, psbfb->gtt);
+	if (ret < 0)
+		goto psb_intel_pipe_set_base_exit;
 	start = psbfb->gtt->offset;
+
 	offset = y * crtc->fb->pitch + x * (crtc->fb->bits_per_pixel / 8);
 
 	REG_WRITE(dspstride, crtc->fb->pitch);

@@ -386,10 +392,12 @@ int psb_intel_pipe_set_base(struct drm_crtc *crtc,
 	default:
 		DRM_ERROR("Unknown color depth\n");
 		ret = -EINVAL;
+		psb_gtt_unpin(dev, psbfb->gtt);
 		goto psb_intel_pipe_set_base_exit;
 	}
 	REG_WRITE(dspcntr_reg, dspcntr);
 
+
 	DRM_DEBUG("Writing base %08lX %08lX %d %d\n", start, offset, x, y);
 	if (0 /* FIXMEAC - check what PSB needs */) {
 		REG_WRITE(dspbase, offset);

@@ -401,10 +409,12 @@ int psb_intel_pipe_set_base(struct drm_crtc *crtc,
 		REG_READ(dspbase);
 	}
 
-psb_intel_pipe_set_base_exit:
+	/* If there was a previous display we can now unpin it */
+	if (old_fb)
+		psb_gtt_unpin(dev, to_psb_fb(old_fb)->gtt);
 
+psb_intel_pipe_set_base_exit:
 	gma_power_end(dev);
-
 	return ret;
 }

@@ -1037,7 +1047,7 @@ static int psb_intel_crtc_cursor_set(struct drm_crtc *crtc,
 		/* turn off the cursor */
 		temp = CURSOR_MODE_DISABLE;
 
-        	if (gma_power_begin(dev, false)) {
+		if (gma_power_begin(dev, false)) {
 			REG_WRITE(control, temp);
 			REG_WRITE(base, 0);
 			gma_power_end(dev);

@@ -1045,8 +1055,8 @@ static int psb_intel_crtc_cursor_set(struct drm_crtc *crtc,
 
 		/* Unpin the old GEM object */
 		if (psb_intel_crtc->cursor_obj) {
-                	gt = container_of(psb_intel_crtc->cursor_obj,
-                	                        struct gtt_range, gem);
+			gt = container_of(psb_intel_crtc->cursor_obj,
+							struct gtt_range, gem);
 			psb_gtt_unpin(crtc->dev, gt);
 			drm_gem_object_unreference(psb_intel_crtc->cursor_obj);
 			psb_intel_crtc->cursor_obj = NULL;

@@ -1089,7 +1099,7 @@ static int psb_intel_crtc_cursor_set(struct drm_crtc *crtc,
 	temp |= (pipe << 28);
 	temp |= CURSOR_MODE_64_ARGB_AX | MCURSOR_GAMMA_ENABLE;
 
-       	if (gma_power_begin(dev, false)) {
+	if (gma_power_begin(dev, false)) {
 		REG_WRITE(control, temp);
 		REG_WRITE(base, addr);
 		gma_power_end(dev);

@@ -1097,8 +1107,8 @@ static int psb_intel_crtc_cursor_set(struct drm_crtc *crtc,
 
 	/* unpin the old bo */
 	if (psb_intel_crtc->cursor_obj && psb_intel_crtc->cursor_obj != obj) {
-               	gt = container_of(psb_intel_crtc->cursor_obj,
-               	                        struct gtt_range, gem);
+		gt = container_of(psb_intel_crtc->cursor_obj,
+							struct gtt_range, gem);
 		psb_gtt_unpin(crtc->dev, gt);
 		drm_gem_object_unreference(psb_intel_crtc->cursor_obj);
 		psb_intel_crtc->cursor_obj = obj;

@@ -1130,7 +1140,7 @@ static int psb_intel_crtc_cursor_move(struct drm_crtc *crtc, int x, int y)
 
 	addr = psb_intel_crtc->cursor_addr;
 
-       	if (gma_power_begin(dev, false)) {
+	if (gma_power_begin(dev, false)) {
 		REG_WRITE((pipe == 0) ? CURAPOS : CURBPOS, temp);
 		REG_WRITE((pipe == 0) ? CURABASE : CURBBASE, addr);
 		gma_power_end(dev);

@@ -1183,7 +1193,7 @@ static int psb_intel_crtc_clock_get(struct drm_device *dev,
 	bool is_lvds;
 	struct drm_psb_private *dev_priv = dev->dev_private;
 
-       	if (gma_power_begin(dev, false)) {
+	if (gma_power_begin(dev, false)) {
 		dpll = REG_READ((pipe == 0) ? DPLL_A : DPLL_B);
 		if ((dpll & DISPLAY_RATE_SELECT_FPA1) == 0)
 			fp = REG_READ((pipe == 0) ? FPA0 : FPB0);

@@ -1262,7 +1272,7 @@ struct drm_display_mode *psb_intel_crtc_mode_get(struct drm_device *dev,
 	int vsync;
 	struct drm_psb_private *dev_priv = dev->dev_private;
 
-       	if (gma_power_begin(dev, false)) {
+	if (gma_power_begin(dev, false)) {
 		htot = REG_READ((pipe == 0) ? HTOTAL_A : HTOTAL_B);
 		hsync = REG_READ((pipe == 0) ? HSYNC_A : HSYNC_B);
 		vtot = REG_READ((pipe == 0) ? VTOTAL_A : VTOTAL_B);

@@ -1387,10 +1397,10 @@ void psb_intel_crtc_init(struct drm_device *dev, int pipe,
 	psb_intel_crtc->cursor_addr = 0;
 
 	if (IS_MRST(dev))
-        	drm_crtc_helper_add(&psb_intel_crtc->base,
+		drm_crtc_helper_add(&psb_intel_crtc->base,
 				    &mrst_helper_funcs);
 	else
-        	drm_crtc_helper_add(&psb_intel_crtc->base,
+		drm_crtc_helper_add(&psb_intel_crtc->base,
 				    &psb_intel_helper_funcs);
 
 	/* Setup the array of drm_connector pointer array */