| Message ID | 1358541034-20327-4-git-send-email-ben@bwidawsk.net (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Jan 18, 2013 at 12:30:34PM -0800, Ben Widawsky wrote: > It is no longer used in the i915 code, so isolate it from the shared > struct. > > This was originally part of: > commit 0e275518f325418d559c05327775bff894b237f7 > Author: Ben Widawsky <ben@bwidawsk.net> > Date: Mon Jan 14 13:35:33 2013 -0800 > > agp/intel: decouple more of the agp-i915 sharing > > Reviewed-by: Rodrigo Vivi <rodrigo.vivi@gmail.com> > Signed-off-by: Ben Widawsky <ben@bwidawsk.net> > > That commit had some other hunks which can't be used due to issues > Daniel found in previous commits. > > Recommend to squash this in to: > commit 42389dbda7398dac0ceadef327d51dc5509f9399 > Author: Ben Widawsky <ben@bwidawsk.net> > Date: Fri Jan 11 13:50:28 2013 -0800 > > drm/i915: Remove use on gma_bus_addr on gen6+ > > Signed-off-by: Ben Widawsky <ben@bwidawsk.net> All slurped into dinq, thanks for the patches. -Daniel
On Fri, Jan 18, 2013 at 10:18:24PM +0100, Daniel Vetter wrote: > On Fri, Jan 18, 2013 at 12:30:34PM -0800, Ben Widawsky wrote: > > It is no longer used in the i915 code, so isolate it from the shared > > struct. > > > > This was originally part of: > > commit 0e275518f325418d559c05327775bff894b237f7 > > Author: Ben Widawsky <ben@bwidawsk.net> > > Date: Mon Jan 14 13:35:33 2013 -0800 > > > > agp/intel: decouple more of the agp-i915 sharing > > > > Reviewed-by: Rodrigo Vivi <rodrigo.vivi@gmail.com> > > Signed-off-by: Ben Widawsky <ben@bwidawsk.net> > > > > That commit had some other hunks which can't be used due to issues > > Daniel found in previous commits. > > > > Recommend to squash this in to: > > commit 42389dbda7398dac0ceadef327d51dc5509f9399 > > Author: Ben Widawsky <ben@bwidawsk.net> > > Date: Fri Jan 11 13:50:28 2013 -0800 > > > > drm/i915: Remove use on gma_bus_addr on gen6+ > > > > Signed-off-by: Ben Widawsky <ben@bwidawsk.net> > > All slurped into dinq, thanks for the patches. > -Daniel It seems the accidentally dropped hunk you caught is indeed a problem on my machine. I've submitted a patch to revert it. Sorry.
diff --git a/drivers/char/agp/intel-gtt.c b/drivers/char/agp/intel-gtt.c index b452414..ff5f348 100644 --- a/drivers/char/agp/intel-gtt.c +++ b/drivers/char/agp/intel-gtt.c @@ -79,6 +79,7 @@ static struct _intel_private { int refcount; /* Whether i915 needs to use the dmar apis or not. */ unsigned int needs_dmar : 1; + phys_addr_t gma_bus_addr; } intel_private; #define INTEL_GTT_GEN intel_private.driver->gen @@ -625,7 +626,7 @@ static int intel_gtt_init(void) pci_read_config_dword(intel_private.pcidev, I915_GMADDR, &gma_addr); - intel_private.base.gma_bus_addr = (gma_addr & PCI_BASE_ADDRESS_MEM_MASK); + intel_private.gma_bus_addr = (gma_addr & PCI_BASE_ADDRESS_MEM_MASK); return 0; } @@ -781,7 +782,7 @@ static int intel_fake_agp_configure(void) return -EIO; intel_private.clear_fake_agp = true; - agp_bridge->gart_bus_addr = intel_private.base.gma_bus_addr; + agp_bridge->gart_bus_addr = intel_private.gma_bus_addr; return 0; } diff --git a/include/drm/intel-gtt.h b/include/drm/intel-gtt.h index 984105c..769b6c7 100644 --- a/include/drm/intel-gtt.h +++ b/include/drm/intel-gtt.h @@ -11,8 +11,6 @@ struct intel_gtt { /* Part of the gtt that is mappable by the cpu, for those chips where * this is not the full gtt. */ unsigned int gtt_mappable_entries; - /* needed for ioremap in drm/i915 */ - phys_addr_t gma_bus_addr; } *intel_gtt_get(void); int intel_gmch_probe(struct pci_dev *bridge_pdev, struct pci_dev *gpu_pdev,
It is no longer used in the i915 code, so isolate it from the shared struct. This was originally part of: commit 0e275518f325418d559c05327775bff894b237f7 Author: Ben Widawsky <ben@bwidawsk.net> Date: Mon Jan 14 13:35:33 2013 -0800 agp/intel: decouple more of the agp-i915 sharing Reviewed-by: Rodrigo Vivi <rodrigo.vivi@gmail.com> Signed-off-by: Ben Widawsky <ben@bwidawsk.net> That commit had some other hunks which can't be used due to issues Daniel found in previous commits. Recommend to squash this in to: commit 42389dbda7398dac0ceadef327d51dc5509f9399 Author: Ben Widawsky <ben@bwidawsk.net> Date: Fri Jan 11 13:50:28 2013 -0800 drm/i915: Remove use on gma_bus_addr on gen6+ Signed-off-by: Ben Widawsky <ben@bwidawsk.net> --- drivers/char/agp/intel-gtt.c | 5 +++-- include/drm/intel-gtt.h | 2 -- 2 files changed, 3 insertions(+), 4 deletions(-)