mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Kamal Mostafa <kamal@canonical.com>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org,
	kernel-team@lists.ubuntu.com
Cc: Alex Deucher <alexander.deucher@amd.com>,
	Kamal Mostafa <kamal@canonical.com>
Subject: [PATCH 16/75] drm/radeon: allow selection of alignment in the sub-allocator
Date: Tue, 30 Jul 2013 08:16:45 -0700	[thread overview]
Message-ID: <1375197464-27962-17-git-send-email-kamal@canonical.com> (raw)
In-Reply-To: <1375197464-27962-1-git-send-email-kamal@canonical.com>

3.8.13.6 -stable review patch.  If anyone has any objections, please let me know.

------------------

From: Alex Deucher <alexander.deucher@amd.com>

commit 6c4f978b357bc779c703fda1f200e9179623d3e9 upstream.

There are cases where we need more than 4k alignment.  No
functional change with this commit.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
---
 drivers/gpu/drm/radeon/radeon.h        | 1 +
 drivers/gpu/drm/radeon/radeon_gart.c   | 1 +
 drivers/gpu/drm/radeon/radeon_object.h | 2 +-
 drivers/gpu/drm/radeon/radeon_ring.c   | 1 +
 drivers/gpu/drm/radeon/radeon_sa.c     | 7 ++++---
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
index a08f657..aa2d2e2 100644
--- a/drivers/gpu/drm/radeon/radeon.h
+++ b/drivers/gpu/drm/radeon/radeon.h
@@ -387,6 +387,7 @@ struct radeon_sa_manager {
 	uint64_t		gpu_addr;
 	void			*cpu_ptr;
 	uint32_t		domain;
+	uint32_t		align;
 };
 
 struct radeon_sa_bo;
diff --git a/drivers/gpu/drm/radeon/radeon_gart.c b/drivers/gpu/drm/radeon/radeon_gart.c
index daf9710..dfa0ca1 100644
--- a/drivers/gpu/drm/radeon/radeon_gart.c
+++ b/drivers/gpu/drm/radeon/radeon_gart.c
@@ -467,6 +467,7 @@ int radeon_vm_manager_init(struct radeon_device *rdev)
 		size *= 2;
 		r = radeon_sa_bo_manager_init(rdev, &rdev->vm_manager.sa_manager,
 					      RADEON_GPU_PAGE_ALIGN(size),
+					      RADEON_GPU_PAGE_SIZE,
 					      RADEON_GEM_DOMAIN_VRAM);
 		if (r) {
 			dev_err(rdev->dev, "failed to allocate vm bo (%dKB)\n",
diff --git a/drivers/gpu/drm/radeon/radeon_object.h b/drivers/gpu/drm/radeon/radeon_object.h
index 5fc86b0..ec18ad5 100644
--- a/drivers/gpu/drm/radeon/radeon_object.h
+++ b/drivers/gpu/drm/radeon/radeon_object.h
@@ -158,7 +158,7 @@ static inline void * radeon_sa_bo_cpu_addr(struct radeon_sa_bo *sa_bo)
 
 extern int radeon_sa_bo_manager_init(struct radeon_device *rdev,
 				     struct radeon_sa_manager *sa_manager,
-				     unsigned size, u32 domain);
+				     unsigned size, u32 align, u32 domain);
 extern void radeon_sa_bo_manager_fini(struct radeon_device *rdev,
 				      struct radeon_sa_manager *sa_manager);
 extern int radeon_sa_bo_manager_start(struct radeon_device *rdev,
diff --git a/drivers/gpu/drm/radeon/radeon_ring.c b/drivers/gpu/drm/radeon/radeon_ring.c
index 3760eff..cac9f20 100644
--- a/drivers/gpu/drm/radeon/radeon_ring.c
+++ b/drivers/gpu/drm/radeon/radeon_ring.c
@@ -205,6 +205,7 @@ int radeon_ib_pool_init(struct radeon_device *rdev)
 	}
 	r = radeon_sa_bo_manager_init(rdev, &rdev->ring_tmp_bo,
 				      RADEON_IB_POOL_SIZE*64*1024,
+				      RADEON_GPU_PAGE_SIZE,
 				      RADEON_GEM_DOMAIN_GTT);
 	if (r) {
 		return r;
diff --git a/drivers/gpu/drm/radeon/radeon_sa.c b/drivers/gpu/drm/radeon/radeon_sa.c
index 0abe5a9..f0bac68 100644
--- a/drivers/gpu/drm/radeon/radeon_sa.c
+++ b/drivers/gpu/drm/radeon/radeon_sa.c
@@ -49,7 +49,7 @@ static void radeon_sa_bo_try_free(struct radeon_sa_manager *sa_manager);
 
 int radeon_sa_bo_manager_init(struct radeon_device *rdev,
 			      struct radeon_sa_manager *sa_manager,
-			      unsigned size, u32 domain)
+			      unsigned size, u32 align, u32 domain)
 {
 	int i, r;
 
@@ -57,13 +57,14 @@ int radeon_sa_bo_manager_init(struct radeon_device *rdev,
 	sa_manager->bo = NULL;
 	sa_manager->size = size;
 	sa_manager->domain = domain;
+	sa_manager->align = align;
 	sa_manager->hole = &sa_manager->olist;
 	INIT_LIST_HEAD(&sa_manager->olist);
 	for (i = 0; i < RADEON_NUM_RINGS; ++i) {
 		INIT_LIST_HEAD(&sa_manager->flist[i]);
 	}
 
-	r = radeon_bo_create(rdev, size, RADEON_GPU_PAGE_SIZE, true,
+	r = radeon_bo_create(rdev, size, align, true,
 			     domain, NULL, &sa_manager->bo);
 	if (r) {
 		dev_err(rdev->dev, "(%d) failed to allocate bo for manager\n", r);
@@ -317,7 +318,7 @@ int radeon_sa_bo_new(struct radeon_device *rdev,
 	unsigned tries[RADEON_NUM_RINGS];
 	int i, r;
 
-	BUG_ON(align > RADEON_GPU_PAGE_SIZE);
+	BUG_ON(align > sa_manager->align);
 	BUG_ON(size > sa_manager->size);
 
 	*sa_bo = kmalloc(sizeof(struct radeon_sa_bo), GFP_KERNEL);
-- 
1.8.1.2


  parent reply	other threads:[~2013-07-30 15:18 UTC|newest]

Thread overview: 76+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-07-30 15:16 [ 3.8.y.z extended stable ] Linux 3.8.13.6 stable review Kamal Mostafa
2013-07-30 15:16 ` [PATCH 01/75] xen/blkback: Check device permissions before allowing OP_DISCARD Kamal Mostafa
2013-07-30 15:16 ` [PATCH 02/75] ASoC: sglt5000: Fix the default value of CHIP_SSS_CTRL Kamal Mostafa
2013-07-30 15:16 ` [PATCH 03/75] ASoC: sglt5000: Fix SGTL5000_PLL_FRAC_DIV_MASK Kamal Mostafa
2013-07-30 15:16 ` [PATCH 04/75] drm/i915: Correct obj->mm_list link to dev_priv->dev_priv->mm.inactive_list Kamal Mostafa
2013-07-30 15:16 ` [PATCH 05/75] drm/i915: fix up ring cleanup for the i830/i845 CS tlb w/a Kamal Mostafa
2013-07-30 15:16 ` [PATCH 06/75] Partially revert "drm/i915: unconditionally use mt forcewake on hsw/ivb" Kamal Mostafa
2013-07-30 15:16 ` [PATCH 07/75] drm/i915: Fix write-read race with multiple rings Kamal Mostafa
2013-07-30 15:16 ` [PATCH 08/75] drm/i915: merge {i965, sandybridge}_write_fence_reg() Kamal Mostafa
2013-07-30 15:16 ` [PATCH 09/75] drm/i915: Fix incoherence with fence updates on Sandybridge+ Kamal Mostafa
2013-07-30 15:16 ` [PATCH 10/75] Revert "drm/i915: Workaround incoherence between fences and LLC across multiple CPUs" Kamal Mostafa
2013-07-30 15:16 ` [PATCH 11/75] drm/i915: rename sdvox_reg to hdmi_reg on HDMI context Kamal Mostafa
2013-07-30 15:16 ` [PATCH 12/75] drm/i915: don't setup hdmi for port D edp in ddi_init Kamal Mostafa
2013-07-30 15:16 ` [PATCH 13/75] drm/i915: Preserve the DDI_A_4_LANES bit from the bios Kamal Mostafa
2013-07-30 15:16 ` [PATCH 14/75] drm/radeon/hdmi: make sure we have an afmt block assigned Kamal Mostafa
2013-07-30 15:16 ` [PATCH 15/75] drm/radeon: allocate SA bo in the requested domain Kamal Mostafa
2013-07-30 15:16 ` Kamal Mostafa [this message]
2013-07-30 15:16 ` [PATCH 17/75] ACPI / memhotplug: Fix a stale pointer in error path Kamal Mostafa
2013-07-30 15:16 ` [PATCH 18/75] PM / Sleep: avoid 'autosleep' in shutdown progress Kamal Mostafa
2013-07-30 15:16 ` [PATCH 19/75] ext4: fix error handling in ext4_ext_truncate() Kamal Mostafa
2013-07-30 15:16 ` [PATCH 20/75] radeon kms: do not flush uninitialized hotplug work Kamal Mostafa
2013-07-30 15:16 ` [PATCH 21/75] ALSA: asihpi: Fix unlocked snd_pcm_stop() call Kamal Mostafa
2013-07-30 15:16 ` [PATCH 22/75] ALSA: atiixp: " Kamal Mostafa
2013-07-30 15:16 ` [PATCH 23/75] ALSA: 6fire: " Kamal Mostafa
2013-07-30 15:16 ` [PATCH 24/75] ALSA: ua101: " Kamal Mostafa
2013-07-30 15:16 ` [PATCH 25/75] ALSA: usx2y: " Kamal Mostafa
2013-07-30 15:16 ` [PATCH 26/75] ALSA: pxa2xx: " Kamal Mostafa
2013-07-30 15:16 ` [PATCH 27/75] ASoC: atmel: " Kamal Mostafa
2013-07-30 15:16 ` [PATCH 28/75] ASoC: s6000: " Kamal Mostafa
2013-07-30 15:16 ` [PATCH 29/75] [media] saa7134: " Kamal Mostafa
2013-07-30 15:16 ` [PATCH 30/75] staging: line6: " Kamal Mostafa
2013-07-30 15:17 ` [PATCH 31/75] x86, suspend: Handle CPUs which fail to #GP on RDMSR Kamal Mostafa
2013-07-30 15:17 ` [PATCH 32/75] ALSA: hda - Add new GPU codec ID to snd-hda Kamal Mostafa
2013-07-30 18:42 ` [PATCH 33/75] drm/i915: fix long-standing SNB regression in power consumption after resume v2 Kamal Mostafa
2013-07-30 18:44 ` [PATCH 34/75] ACPI / video: ignore BIOS initial backlight value for Fujitsu E753 Kamal Mostafa
2013-07-30 18:44 ` [PATCH 35/75] arm64: mm: don't treat user cache maintenance faults as writes Kamal Mostafa
2013-07-30 18:44 ` [PATCH 36/75] Btrfs: fix lock leak when resuming snapshot deletion Kamal Mostafa
2013-07-30 18:44 ` [PATCH 37/75] Btrfs: re-add root to dead root list if we stop dropping it Kamal Mostafa
2013-07-30 18:44 ` [PATCH 38/75] drm/i915: inverted brightness quirk for Acer Aspire 4736Z Kamal Mostafa
2013-07-30 18:44 ` [PATCH 39/75] drm/i915: quirk no PCH_PWM_ENABLE for Dell XPS13 backlight Kamal Mostafa
2013-07-30 18:44 ` [PATCH 40/75] drm/i915: Serialize almost all register access Kamal Mostafa
2013-07-30 18:44 ` [PATCH 41/75] drm/i915: fix up gt init sequence fallout Kamal Mostafa
2013-07-30 18:44 ` [PATCH 42/75] powerpc/modules: Module CRC relocation fix causes perf issues Kamal Mostafa
2013-07-30 18:44 ` [PATCH 43/75] [PATCH] sparc32: vm_area_struct access for old Sun SPARCs Kamal Mostafa
2013-07-30 18:44 ` [PATCH 44/75] sparc64 address-congruence property Kamal Mostafa
2013-07-30 18:44 ` [PATCH 45/75] sparc: tsb must be flushed before tlb Kamal Mostafa
2013-07-30 18:44 ` [PATCH 46/75] bridge: fix switched interval for MLD Query types Kamal Mostafa
2013-07-30 18:44 ` [PATCH 47/75] ipv4: Fixed MD5 key lookups when adding/ removing MD5 to/ from TCP sockets Kamal Mostafa
2013-07-30 18:44 ` [PATCH 48/75] ipv6: don't call addrconf_dst_alloc again when enable lo Kamal Mostafa
2013-07-30 18:44 ` [PATCH 49/75] macvtap: fix recovery from gup errors Kamal Mostafa
2013-07-30 18:44 ` [PATCH 50/75] ipv6: ip6_sk_dst_check() must not assume ipv6 dst Kamal Mostafa
2013-07-30 18:44 ` [PATCH 51/75] af_key: fix info leaks in notify messages Kamal Mostafa
2013-07-30 18:44 ` [PATCH 52/75] sh_eth: fix unhandled RFE interrupt Kamal Mostafa
2013-07-30 18:44 ` [PATCH 53/75] neighbour: fix a race in neigh_destroy() Kamal Mostafa
2013-07-30 18:44 ` [PATCH 54/75] x25: Fix broken locking in ioctl error paths Kamal Mostafa
2013-07-30 18:44 ` [PATCH 55/75] net: Swap ver and type in pppoe_hdr Kamal Mostafa
2013-07-30 18:45 ` [PATCH 56/75] vti: remove duplicated code to fix a memory leak Kamal Mostafa
2013-07-30 18:45 ` [PATCH 57/75] ipv6,mcast: always hold idev->lock before mca_lock Kamal Mostafa
2013-07-30 18:45 ` [PATCH 58/75] l2tp: add missing .owner to struct pppox_proto Kamal Mostafa
2013-07-30 18:45 ` [PATCH 59/75] ipv6: call udp_push_pending_frames when uncorking a socket with AF_INET pending data Kamal Mostafa
2013-07-30 18:45 ` [PATCH 60/75] ipv6: ip6_append_data_mtu did not care about pmtudisc and frag_size Kamal Mostafa
2013-07-30 18:45 ` [PATCH 61/75] sunvnet: vnet_port_remove must call unregister_netdev Kamal Mostafa
2013-07-30 18:45 ` [PATCH 62/75] ifb: fix rcu_sched self-detected stalls Kamal Mostafa
2013-07-30 18:45 ` [PATCH 63/75] tuntap: correctly linearize skb when zerocopy is used Kamal Mostafa
2013-07-30 18:45 ` [PATCH 64/75] macvtap: " Kamal Mostafa
2013-07-30 18:45 ` [PATCH 65/75] ipv6: in case of link failure remove route directly instead of letting it expire Kamal Mostafa
2013-07-30 18:45 ` [PATCH 66/75] 9p: fix off by one causing access violations and memory corruption Kamal Mostafa
2013-07-30 18:45 ` [PATCH 67/75] dummy: fix oops when loading the dummy failed Kamal Mostafa
2013-07-30 18:45 ` [PATCH 68/75] ifb: fix oops when loading the ifb failed Kamal Mostafa
2013-07-30 18:45 ` [PATCH 69/75] ipv6: only static routes qualify for equal cost multipathing Kamal Mostafa
2013-07-30 18:45 ` [PATCH 70/75] atl1e: fix dma mapping warnings Kamal Mostafa
2013-07-30 18:45 ` [PATCH 71/75] atl1e: unmap partially mapped skb on dma error and free skb Kamal Mostafa
2013-07-30 18:45 ` [PATCH 72/75] ipv4: set transport header earlier Kamal Mostafa
2013-07-30 18:45 ` [PATCH 73/75] tuntap: do not zerocopy if iov needs more pages than MAX_SKB_FRAGS Kamal Mostafa
2013-07-30 18:45 ` [PATCH 74/75] macvtap: " Kamal Mostafa
2013-07-30 18:45 ` [PATCH 75/75] vlan: fix a race in egress prio management Kamal Mostafa

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1375197464-27962-17-git-send-email-kamal@canonical.com \
    --to=kamal@canonical.com \
    --cc=alexander.deucher@amd.com \
    --cc=kernel-team@lists.ubuntu.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®