dri-devel October 2012

dri-devel@lists.freedesktop.org

139 participants
712 discussions

[PATCH] drm/omap: Fix release of refill engine
by Andy Gross 12 Oct '12

12 Oct '12

During asynchronous refills, we don't wait for the refill to finish. However, we cannot release the engine back to the idle list until it has actually completed the refill operation. The engine release will now be done in the IRQ handler, but only for asynchronous refill operations. Synchronous refills will continue to release the engine after they unblock from waiting on the refill. Signed-off-by: Andy Gross <andy.gross(a)ti.com> --- drivers/staging/omapdrm/omap_dmm_priv.h | 5 ++- drivers/staging/omapdrm/omap_dmm_tiler.c | 77 ++++++++++++++++++++--------- 2 files changed, 57 insertions(+), 25 deletions(-) diff --git a/drivers/staging/omapdrm/omap_dmm_priv.h b/drivers/staging/omapdrm/omap_dmm_priv.h index 09ebc50..5ea73305 100644 --- a/drivers/staging/omapdrm/omap_dmm_priv.h +++ b/drivers/staging/omapdrm/omap_dmm_priv.h @@ -141,6 +141,8 @@ struct refill_engine { /* only one trans per engine for now */ struct dmm_txn txn; + unsigned int async; + wait_queue_head_t wait_for_refill; struct list_head idle_node; @@ -158,10 +160,11 @@ struct dmm { dma_addr_t refill_pa; /* refill engines */ - struct semaphore engine_sem; + wait_queue_head_t engine_queue; struct list_head idle_head; struct refill_engine *engines; int num_engines; + atomic_t engine_counter; /* container information */ int container_width; diff --git a/drivers/staging/omapdrm/omap_dmm_tiler.c b/drivers/staging/omapdrm/omap_dmm_tiler.c index 7c19c5c..2fc9218 100644 --- a/drivers/staging/omapdrm/omap_dmm_tiler.c +++ b/drivers/staging/omapdrm/omap_dmm_tiler.c @@ -29,7 +29,6 @@ #include <linux/mm.h> #include <linux/time.h> #include <linux/list.h> -#include <linux/semaphore.h> #include "omap_dmm_tiler.h" #include "omap_dmm_priv.h" @@ -120,6 +119,18 @@ static int wait_status(struct refill_engine *engine, uint32_t wait_mask) return 0; } +static void release_engine(struct refill_engine *engine) +{ + unsigned long flags; + + spin_lock_irqsave(&list_lock, flags); + list_add(&engine->idle_node, &omap_dmm->idle_head); + spin_unlock_irqrestore(&list_lock, flags); + + atomic_inc(&omap_dmm->engine_counter); + wake_up_interruptible(&omap_dmm->engine_queue); +} + static irqreturn_t omap_dmm_irq_handler(int irq, void *arg) { struct dmm *dmm = arg; @@ -130,9 +141,13 @@ static irqreturn_t omap_dmm_irq_handler(int irq, void *arg) writel(status, dmm->base + DMM_PAT_IRQSTATUS); for (i = 0; i < dmm->num_engines; i++) { - if (status & DMM_IRQSTAT_LST) + if (status & DMM_IRQSTAT_LST) { wake_up_interruptible(&dmm->engines[i].wait_for_refill); + if (&dmm->engines[i].async) + release_engine(&dmm->engines[i]); + } + status >>= 8; } @@ -146,17 +161,24 @@ static struct dmm_txn *dmm_txn_init(struct dmm *dmm, struct tcm *tcm) { struct dmm_txn *txn = NULL; struct refill_engine *engine = NULL; + int ret; + unsigned long flags; + - down(&dmm->engine_sem); + /* wait until an engine is available */ + ret = wait_event_interruptible(omap_dmm->engine_queue, + atomic_add_unless(&omap_dmm->engine_counter, -1, 0)); + if (ret) + return ERR_PTR(ret); /* grab an idle engine */ - spin_lock(&list_lock); + spin_lock_irqsave(&list_lock, flags); if (!list_empty(&dmm->idle_head)) { engine = list_entry(dmm->idle_head.next, struct refill_engine, idle_node); list_del(&engine->idle_node); } - spin_unlock(&list_lock); + spin_unlock_irqrestore(&list_lock, flags); BUG_ON(!engine); @@ -174,7 +196,7 @@ static struct dmm_txn *dmm_txn_init(struct dmm *dmm, struct tcm *tcm) * Add region to DMM transaction. If pages or pages[i] is NULL, then the * corresponding slot is cleared (ie. dummy_pa is programmed) */ -static int dmm_txn_append(struct dmm_txn *txn, struct pat_area *area, +static void dmm_txn_append(struct dmm_txn *txn, struct pat_area *area, struct page **pages, uint32_t npages, uint32_t roll) { dma_addr_t pat_pa = 0; @@ -208,7 +230,7 @@ static int dmm_txn_append(struct dmm_txn *txn, struct pat_area *area, txn->last_pat = pat; - return 0; + return; } /** @@ -238,6 +260,9 @@ static int dmm_txn_commit(struct dmm_txn *txn, bool wait) goto cleanup; } + /* mark whether it is async to denote list management in IRQ handler */ + engine->async = wait ? 0 : 1; + /* kick reload */ writel(engine->refill_pa, dmm->base + reg[PAT_DESCR][engine->id]); @@ -252,11 +277,10 @@ static int dmm_txn_commit(struct dmm_txn *txn, bool wait) } cleanup: - spin_lock(&list_lock); - list_add(&engine->idle_node, &dmm->idle_head); - spin_unlock(&list_lock); + /* only place engine back on list if we are done with it */ + if (ret || wait) + release_engine(engine); - up(&omap_dmm->engine_sem); return ret; } @@ -270,6 +294,7 @@ static int fill(struct tcm_area *area, struct page **pages, struct tcm_area slice, area_s; struct dmm_txn *txn; + txn = dmm_txn_init(omap_dmm, area->tcm); if (IS_ERR_OR_NULL(txn)) return PTR_ERR(txn); @@ -280,16 +305,13 @@ static int fill(struct tcm_area *area, struct page **pages, .x1 = slice.p1.x, .y1 = slice.p1.y, }; - ret = dmm_txn_append(txn, &p_area, pages, npages, roll); - if (ret) - goto fail; + dmm_txn_append(txn, &p_area, pages, npages, roll); roll += tcm_sizeof(slice); } ret = dmm_txn_commit(txn, wait); -fail: return ret; } @@ -326,6 +348,7 @@ struct tiler_block *tiler_reserve_2d(enum tiler_fmt fmt, uint16_t w, struct tiler_block *block = kzalloc(sizeof(*block), GFP_KERNEL); u32 min_align = 128; int ret; + unsigned long flags; BUG_ON(!validfmt(fmt)); @@ -347,9 +370,9 @@ struct tiler_block *tiler_reserve_2d(enum tiler_fmt fmt, uint16_t w, } /* add to allocation list */ - spin_lock(&list_lock); + spin_lock_irqsave(&list_lock, flags); list_add(&block->alloc_node, &omap_dmm->alloc_head); - spin_unlock(&list_lock); + spin_unlock_irqrestore(&list_lock, flags); return block; } @@ -358,6 +381,7 @@ struct tiler_block *tiler_reserve_1d(size_t size) { struct tiler_block *block = kzalloc(sizeof(*block), GFP_KERNEL); int num_pages = (size + PAGE_SIZE - 1) >> PAGE_SHIFT; + unsigned long flags; if (!block) return ERR_PTR(-ENOMEM); @@ -370,9 +394,9 @@ struct tiler_block *tiler_reserve_1d(size_t size) return ERR_PTR(-ENOMEM); } - spin_lock(&list_lock); + spin_lock_irqsave(&list_lock, flags); list_add(&block->alloc_node, &omap_dmm->alloc_head); - spin_unlock(&list_lock); + spin_unlock_irqrestore(&list_lock, flags); return block; } @@ -381,13 +405,14 @@ struct tiler_block *tiler_reserve_1d(size_t size) int tiler_release(struct tiler_block *block) { int ret = tcm_free(&block->area); + unsigned long flags; if (block->area.tcm) dev_err(omap_dmm->dev, "failed to release block\n"); - spin_lock(&list_lock); + spin_lock_irqsave(&list_lock, flags); list_del(&block->alloc_node); - spin_unlock(&list_lock); + spin_unlock_irqrestore(&list_lock, flags); kfree(block); return ret; @@ -507,16 +532,17 @@ static int omap_dmm_remove(struct platform_device *dev) { struct tiler_block *block, *_block; int i; + unsigned long flags; if (omap_dmm) { /* free all area regions */ - spin_lock(&list_lock); + spin_lock_irqsave(&list_lock, flags); list_for_each_entry_safe(block, _block, &omap_dmm->alloc_head, alloc_node) { list_del(&block->alloc_node); kfree(block); } - spin_unlock(&list_lock); + spin_unlock_irqrestore(&list_lock, flags); for (i = 0; i < omap_dmm->num_lut; i++) if (omap_dmm->tcm && omap_dmm->tcm[i]) @@ -560,6 +586,8 @@ static int omap_dmm_probe(struct platform_device *dev) INIT_LIST_HEAD(&omap_dmm->alloc_head); INIT_LIST_HEAD(&omap_dmm->idle_head); + init_waitqueue_head(&omap_dmm->engine_queue); + /* lookup hwmod data - base address and irq */ mem = platform_get_resource(dev, IORESOURCE_MEM, 0); if (!mem) { @@ -588,6 +616,8 @@ static int omap_dmm_probe(struct platform_device *dev) omap_dmm->container_width = 256; omap_dmm->container_height = 128; + atomic_set(&omap_dmm->engine_counter, omap_dmm->num_engines); + /* read out actual LUT width and height */ pat_geom = readl(omap_dmm->base + DMM_PAT_GEOMETRY); omap_dmm->lut_width = ((pat_geom >> 16) & 0xF) << 5; @@ -651,7 +681,6 @@ static int omap_dmm_probe(struct platform_device *dev) goto fail; } - sema_init(&omap_dmm->engine_sem, omap_dmm->num_engines); for (i = 0; i < omap_dmm->num_engines; i++) { omap_dmm->engines[i].id = i; omap_dmm->engines[i].dmm = omap_dmm; -- 1.7.5.4

2 2

[PATCH libdrm][RESEND] radeon: fix unused-function warning
by Andreas Boll 12 Oct '12

12 Oct '12

radeon_cs_gem.c:333:13: warning: 'cs_gem_dump_bof' defined but not used [-Wunused-function] --- radeon/radeon_cs_gem.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/radeon/radeon_cs_gem.c b/radeon/radeon_cs_gem.c index 9834bcf..b963140 100644 --- a/radeon/radeon_cs_gem.c +++ b/radeon/radeon_cs_gem.c @@ -330,6 +330,7 @@ static int cs_gem_end(struct radeon_cs_int *cs, return 0; } +#if CS_BOF_DUMP static void cs_gem_dump_bof(struct radeon_cs_int *cs) { struct cs_gem *csg = (struct cs_gem*)cs; @@ -415,6 +416,7 @@ out_err: bof_decref(device_id); bof_decref(root); } +#endif static int cs_gem_emit(struct radeon_cs_int *cs) { -- 1.7.4.1

1 0

[pull] drm-intel-fixes
by Daniel Vetter 12 Oct '12

12 Oct '12

Hi Dave, A bit of paranoid-WARNs fallout from modeset, otherwise just small fixlets: - some register magic to fix hsw crw (Paulo&Ben) - fix backlight destruction for cpu edp (Jani) - fix gen ch7xxx dvo ->get_hw_state - fixup the plane->pipe fixup code, the broken version massively angers the modeset sanity checks - kill pipe A quirk for i855gm, otherwise I get a black screen with the above patch - fixup for gem_get_page helper (Chris) - fixup guardband clipping w/a (Ken), without this mesa master can erronously drop vertices on snb, mesa 9.0 has the optimization reverted - another pageflip vs. modeset fix - kill bogus BUG_ON which broke ums+gem from Willy Tarreau (gasp, people are still using this!) Otherwise I have some voodoo memory barriers from Chris and the ugly cpu_reloc stuff (which somehow seems to work on 3.7). And there's also some undue amount of modeset sanity check noises on i830M that I need to look at a bit closer. Cheers, Daniel PS: The last-minute rebase is because of a missing cc: stable tag. The following changes since commit f8f2ac9a76b0f80a6763ca316116a7bab8486997: drm/i915: Fix GT_MODE default value (2012-10-04 18:44:13 +0200) are available in the git repository at: git://people.freedesktop.org/~danvet/drm-intel drm-intel-fixes for you to fetch changes up to be3cd5e37716bcf1579f63bdd919345a1f9692b9: drm/i915: fix non-DP-D eDP backlight cleanup and module reload (2012-10-12 10:59:12 +0200) ---------------------------------------------------------------- Chris Wilson (2): drm/i915: Disallow preallocation of requests drm/i915: fixup i915_gem_object_get_page inline helper Daniel Vetter (5): drm/i915: paper over a pipe-enable vs pageflip race drm/i915: disable wc gtt pte mappings on gen2 drm/i915: rip out the pipe A quirk for i855gm drm/i915: fixup the plane->pipe fixup code drm/i915/dvo-ch7xxx: fix get_hw_state Jani Nikula (1): drm/i915: fix non-DP-D eDP backlight cleanup and module reload Kenneth Graunke (1): drm/i915: Set guardband clipping workaround bit in the right register. Rodrigo Vivi (1): drm/i915: HSW CRW stability magic Willy Tarreau (1): drm/i915: remove useless BUG_ON which caused a regression in 3.5. drivers/char/agp/intel-gtt.c | 2 +- drivers/gpu/drm/i915/dvo_ch7xxx.c | 6 +-- drivers/gpu/drm/i915/i915_drv.h | 9 ++++- drivers/gpu/drm/i915/i915_gem.c | 19 +++++---- drivers/gpu/drm/i915/i915_reg.h | 2 +- drivers/gpu/drm/i915/intel_display.c | 47 ++++++++++++++++------ drivers/gpu/drm/i915/intel_dp.c | 3 +- drivers/gpu/drm/i915/intel_overlay.c | 72 +++++++--------------------------- drivers/gpu/drm/i915/intel_pm.c | 4 +- 9 files changed, 76 insertions(+), 88 deletions(-) -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch

1 0

[PATCH] radeon: Prevent confusion when fimware loading fails
by Daniel J Blueman 12 Oct '12

12 Oct '12

When firmware loading fails eg due to running a newer kernel and hardware on an older distro, prevent the user confusing this subsequent warning backtrace with the real issue further up, ie "failed to load firmware", which doesn't produce a backtrace. Signed-off-by: Daniel J Blueman <daniel(a)quora.org> --- drivers/gpu/drm/radeon/evergreen.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c index e93b80a..444cdf5 100644 --- a/drivers/gpu/drm/radeon/evergreen.c +++ b/drivers/gpu/drm/radeon/evergreen.c @@ -2416,7 +2416,7 @@ int evergreen_irq_set(struct radeon_device *rdev) u32 afmt1 = 0, afmt2 = 0, afmt3 = 0, afmt4 = 0, afmt5 = 0, afmt6 = 0; if (!rdev->irq.installed) { - WARN(1, "Can't enable IRQ/MSI because no handler is installed\n"); + dev_warn(rdev->dev, "not enabling IRQ/MSI as no handler is installed\n"); return -EINVAL; } /* don't enable anything if the ih is disabled */ -- 1.7.9.5

1 0

Re: Re: [PATCH 2/2] drm: exynos: moved exynos drm hdmi device registration to drm driver
by RAHUL SHARMA 12 Oct '12

12 Oct '12

On Fri, Oct 12, 2012 at 6:22 AM, Inki Dae <inki.dae(a)samsung.com> wrote: > > > 2012? 10? 12? ???? Rahul Sharma?? ??: > >> This patch moved the exynos-drm-hdmi platform device registration to the >> drm >> driver. When DT is enabled, platform devices needs to be registered within >> the >> driver code. This patch fits the requirement of both DT and Non DT based >> drm >> drivers. >> >> Signed-off-by: Rahul Sharma <rahul.sharma(a)samsung.com> >> --- >> drivers/gpu/drm/exynos/exynos_drm_drv.c | 15 ++++++++++++++- >> 1 files changed, 14 insertions(+), 1 deletions(-) >> >> diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.c >> b/drivers/gpu/drm/exynos/exynos_drm_drv.c >> index 4200f15..643c47f 100644 >> --- a/drivers/gpu/drm/exynos/exynos_drm_drv.c >> +++ b/drivers/gpu/drm/exynos/exynos_drm_drv.c >> @@ -53,6 +53,9 @@ >> /* platform device pointer for eynos drm device. */ >> static struct platform_device *exynos_drm_pdev; >> >> +/* platform device pointer for common drm hdmi device. */ >> +static struct platform_device *exynos_drm_hdmi_pdev; > > > Is exynos_drm_hdmi_pdev related to exynos_drm_drv? I don't really like such > thing. let's comply with layer rule. so how about moving > exynos_drm_hdmi_pdev into exynos_drm_hdmi layer and just calling > platform_device_hdmi_register instead of platform_device_register_simple? > for this, exynos_drm_hdmi_pdev should be defined and declared in > exynos_drm_hdmi layer. it means that we have one wrapper to common hdmi > layer. > Sure Mr. Dae, I will move exynos_drm_hdmi_pdev to exynos_drm_hdmi.c and wrap platform_device_register_simple in platform_device_hdmi_register in v1. regards, Rahul Sharma >> + >> static int exynos_drm_load(struct drm_device *dev, unsigned long flags) >> { >> struct exynos_drm_private *private; >> @@ -329,6 +332,13 @@ static int __init exynos_drm_init(void) >> ret = platform_driver_register(&exynos_drm_common_hdmi_driver); >> if (ret < 0) >> goto out_common_hdmi; >> + >> + exynos_drm_hdmi_pdev = platform_device_register_simple( >> + "exynos-drm-hdmi", -1, NULL, 0); >> + if (IS_ERR_OR_NULL(exynos_drm_hdmi_pdev)) { >> + ret = PTR_ERR(exynos_drm_hdmi_pdev); >> + goto out_common_hdmi_dev; >> + } >> #endif >> >> #ifdef CONFIG_DRM_EXYNOS_VIDI >> @@ -366,11 +376,13 @@ out_g2d: >> #endif >> >> #ifdef CONFIG_DRM_EXYNOS_VIDI >> -out_vidi: >> platform_driver_unregister(&vidi_driver); >> +out_vidi: >> #endif >> >> #ifdef CONFIG_DRM_EXYNOS_HDMI >> + platform_device_unregister(exynos_drm_hdmi_pdev); >> +out_common_hdmi_dev: >> platform_driver_unregister(&exynos_drm_common_hdmi_driver); >> out_common_hdmi: >> platform_driver_unregister(&mixer_driver); >> @@ -399,6 +411,7 @@ static void __exit exynos_drm_exit(void) >> #endif >> >> #ifdef CONFIG_DRM_EXYNOS_HDMI >> + platform_device_unregister(exynos_drm_hdmi_pdev); > > > ditto. let's call platform_device_hdmi_unregister instead. > >> >> platform_driver_unregister(&exynos_drm_common_hdmi_driver); >> platform_driver_unregister(&mixer_driver); >> platform_driver_unregister(&hdmi_driver); >> -- >> 1.7.0.4 >> >> _______________________________________________ >> dri-devel mailing list >> dri-devel(a)lists.freedesktop.org >> http://lists.freedesktop.org/mailman/listinfo/dri-devel > > > _______________________________________________ > dri-devel mailing list > dri-devel(a)lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/dri-devel >

1 0

[PATCH] drm/omap: Use writecombine for descriptors
by Andy Gross 12 Oct '12

12 Oct '12

Use writecombine for descriptor and PAT programming memory. Signed-off-by: Andy Gross <andy.gross(a)ti.com> --- drivers/staging/omapdrm/omap_dmm_tiler.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/omapdrm/omap_dmm_tiler.c b/drivers/staging/omapdrm/omap_dmm_tiler.c index fda9efc..7c19c5c 100644 --- a/drivers/staging/omapdrm/omap_dmm_tiler.c +++ b/drivers/staging/omapdrm/omap_dmm_tiler.c @@ -525,7 +525,7 @@ static int omap_dmm_remove(struct platform_device *dev) kfree(omap_dmm->engines); if (omap_dmm->refill_va) - dma_free_coherent(omap_dmm->dev, + dma_free_writecombine(omap_dmm->dev, REFILL_BUFFER_SIZE * omap_dmm->num_engines, omap_dmm->refill_va, omap_dmm->refill_pa); @@ -633,7 +633,7 @@ static int omap_dmm_probe(struct platform_device *dev) omap_dmm->dummy_pa = page_to_phys(omap_dmm->dummy_page); /* alloc refill memory */ - omap_dmm->refill_va = dma_alloc_coherent(&dev->dev, + omap_dmm->refill_va = dma_alloc_writecombine(&dev->dev, REFILL_BUFFER_SIZE * omap_dmm->num_engines, &omap_dmm->refill_pa, GFP_KERNEL); if (!omap_dmm->refill_va) { -- 1.7.5.4

1 0

[PATCH] drm/omap: Remove shadow lut usage
by Andy Gross 12 Oct '12

12 Oct '12

Removing extraneous shadow lut maintenance. There is no need for this to be in place until power management is added to the driver, and this extra copy degrades performance for no gain. Signed-off-by: Andy Gross <andy.gross(a)ti.com> --- drivers/staging/omapdrm/omap_dmm_priv.h | 6 ------ drivers/staging/omapdrm/omap_dmm_tiler.c | 24 +----------------------- 2 files changed, 1 insertions(+), 29 deletions(-) diff --git a/drivers/staging/omapdrm/omap_dmm_priv.h b/drivers/staging/omapdrm/omap_dmm_priv.h index 08b22e9..09ebc50 100644 --- a/drivers/staging/omapdrm/omap_dmm_priv.h +++ b/drivers/staging/omapdrm/omap_dmm_priv.h @@ -141,9 +141,6 @@ struct refill_engine { /* only one trans per engine for now */ struct dmm_txn txn; - /* offset to lut associated with container */ - u32 *lut_offset; - wait_queue_head_t wait_for_refill; struct list_head idle_node; @@ -176,9 +173,6 @@ struct dmm { /* array of LUT - TCM containers */ struct tcm **tcm; - /* LUT table storage */ - u32 *lut; - /* allocation list and lock */ struct list_head alloc_head; }; diff --git a/drivers/staging/omapdrm/omap_dmm_tiler.c b/drivers/staging/omapdrm/omap_dmm_tiler.c index 3ae3955..fda9efc 100644 --- a/drivers/staging/omapdrm/omap_dmm_tiler.c +++ b/drivers/staging/omapdrm/omap_dmm_tiler.c @@ -184,9 +184,6 @@ static int dmm_txn_append(struct dmm_txn *txn, struct pat_area *area, int columns = (1 + area->x1 - area->x0); int rows = (1 + area->y1 - area->y0); int i = columns*rows; - u32 *lut = omap_dmm->lut + (engine->tcm->lut_id * omap_dmm->lut_width * - omap_dmm->lut_height) + - (area->y0 * omap_dmm->lut_width) + area->x0; pat = alloc_dma(txn, sizeof(struct pat), &pat_pa); @@ -209,10 +206,6 @@ static int dmm_txn_append(struct dmm_txn *txn, struct pat_area *area, page_to_phys(pages[n]) : engine->dmm->dummy_pa; } - /* fill in lut with new addresses */ - for (i = 0; i < rows; i++, lut += omap_dmm->lut_width) - memcpy(lut, &data[i*columns], columns * sizeof(u32)); - txn->last_pat = pat; return 0; @@ -539,8 +532,6 @@ static int omap_dmm_remove(struct platform_device *dev) if (omap_dmm->dummy_page) __free_page(omap_dmm->dummy_page); - vfree(omap_dmm->lut); - if (omap_dmm->irq > 0) free_irq(omap_dmm->irq, omap_dmm); @@ -556,7 +547,7 @@ static int omap_dmm_probe(struct platform_device *dev) { int ret = -EFAULT, i; struct tcm_area area = {0}; - u32 hwinfo, pat_geom, lut_table_size; + u32 hwinfo, pat_geom; struct resource *mem; omap_dmm = kzalloc(sizeof(*omap_dmm), GFP_KERNEL); @@ -628,16 +619,6 @@ static int omap_dmm_probe(struct platform_device *dev) */ writel(0x7e7e7e7e, omap_dmm->base + DMM_PAT_IRQENABLE_SET); - lut_table_size = omap_dmm->lut_width * omap_dmm->lut_height * - omap_dmm->num_lut; - - omap_dmm->lut = vmalloc(lut_table_size * sizeof(*omap_dmm->lut)); - if (!omap_dmm->lut) { - dev_err(&dev->dev, "could not allocate lut table\n"); - ret = -ENOMEM; - goto fail; - } - omap_dmm->dummy_page = alloc_page(GFP_KERNEL | __GFP_DMA32); if (!omap_dmm->dummy_page) { dev_err(&dev->dev, "could not allocate dummy page\n"); @@ -720,9 +701,6 @@ static int omap_dmm_probe(struct platform_device *dev) .p1.y = omap_dmm->container_height - 1, }; - for (i = 0; i < lut_table_size; i++) - omap_dmm->lut[i] = omap_dmm->dummy_pa; - /* initialize all LUTs to dummy page entries */ for (i = 0; i < omap_dmm->num_lut; i++) { area.tcm = omap_dmm->tcm[i]; -- 1.7.5.4

1 0

[PATCH 2/2] drm: exynos: moved exynos drm hdmi device registration to drm driver
by Rahul Sharma 12 Oct '12

12 Oct '12

This patch moved the exynos-drm-hdmi platform device registration to the drm driver. When DT is enabled, platform devices needs to be registered within the driver code. This patch fits the requirement of both DT and Non DT based drm drivers. Signed-off-by: Rahul Sharma <rahul.sharma(a)samsung.com> --- drivers/gpu/drm/exynos/exynos_drm_drv.c | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.c b/drivers/gpu/drm/exynos/exynos_drm_drv.c index 4200f15..643c47f 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_drv.c +++ b/drivers/gpu/drm/exynos/exynos_drm_drv.c @@ -53,6 +53,9 @@ /* platform device pointer for eynos drm device. */ static struct platform_device *exynos_drm_pdev; +/* platform device pointer for common drm hdmi device. */ +static struct platform_device *exynos_drm_hdmi_pdev; + static int exynos_drm_load(struct drm_device *dev, unsigned long flags) { struct exynos_drm_private *private; @@ -329,6 +332,13 @@ static int __init exynos_drm_init(void) ret = platform_driver_register(&exynos_drm_common_hdmi_driver); if (ret < 0) goto out_common_hdmi; + + exynos_drm_hdmi_pdev = platform_device_register_simple( + "exynos-drm-hdmi", -1, NULL, 0); + if (IS_ERR_OR_NULL(exynos_drm_hdmi_pdev)) { + ret = PTR_ERR(exynos_drm_hdmi_pdev); + goto out_common_hdmi_dev; + } #endif #ifdef CONFIG_DRM_EXYNOS_VIDI @@ -366,11 +376,13 @@ out_g2d: #endif #ifdef CONFIG_DRM_EXYNOS_VIDI -out_vidi: platform_driver_unregister(&vidi_driver); +out_vidi: #endif #ifdef CONFIG_DRM_EXYNOS_HDMI + platform_device_unregister(exynos_drm_hdmi_pdev); +out_common_hdmi_dev: platform_driver_unregister(&exynos_drm_common_hdmi_driver); out_common_hdmi: platform_driver_unregister(&mixer_driver); @@ -399,6 +411,7 @@ static void __exit exynos_drm_exit(void) #endif #ifdef CONFIG_DRM_EXYNOS_HDMI + platform_device_unregister(exynos_drm_hdmi_pdev); platform_driver_unregister(&exynos_drm_common_hdmi_driver); platform_driver_unregister(&mixer_driver); platform_driver_unregister(&hdmi_driver); -- 1.7.0.4

2 1

[Bug 26891] Radeon KMS fails with inaccessible AtomBIOS on systems with (U)EFI boot
by bugzilla-daemon＠freedesktop.org 11 Oct '12

11 Oct '12

https://bugs.freedesktop.org/show_bug.cgi?id=26891 --- Comment #43 from Austin Lund <austin.lund(a)gmail.com> --- Seems to be my bad. I've got some extra patches that aren't in 3.6 to make this EFI stub booting thing work (not that the actual graphics switching works for me at the moment). They can be downloaded here: http://people.canonical.com/~sforshee/apple-gmux-patches/ However, I've been just rebasing them in my git tree for a while so I don't know if they cleanly apply. -- You are receiving this mail because: You are the assignee for the bug.

1 0

[PATCH 0/2] add exynos-drm platform device registration to driver
by Rahul Sharma 11 Oct '12

11 Oct '12

This patch adds drm-exynos and drm-exynos-hdmi device registration to the drm driver. It was happening in machine init code earlier which is not acceptable for dt enabled platforms. Patch which cleans the respective code from arch/arm is "arm: exynos: removing exynos-drm device registration from non-dt platforms" is posted to linux-samsung-soc mailing list. This patchset is based on branch exynos-drm-next at git://git.infradead.org/users/kmpark/linux-samsung (linux v3.6-rc4) Rahul Sharma (2): drm: exynos: moved exynos drm device registration to drm driver drm: exynos: moved exynos drm hdmi device registration to drm driver drivers/gpu/drm/exynos/exynos_drm_drv.c | 31 ++++++++++++++++++++++++++++++- 1 files changed, 30 insertions(+), 1 deletions(-)

1 1

← Newer
1
...
58
59
60
61
62
63
64
...
72
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel October 2012