dri-devel August 2014

dri-devel@lists.freedesktop.org

156 participants
988 discussions

Start a nNew thread

[drm/exynos] g2d: error handling and other things
by Tobias Jakobi 04 Aug '14

04 Aug '14

Again, sorry for the noise. These two patches should now really fix what they're supposed to fix. - Tobias

3 6

[LIBDRM PATCH 1/3] omap: Use symbol visibility.
by Maarten Lankhorst 04 Aug '14

04 Aug '14

No changes to exported symbols. Signed-off-by: Maarten Lankhorst <maarten.lankhorst(a)canonical.com> --- omap/Makefile.am | 1 + omap/omap_drm.c | 46 ++++++++++++++++++++++++++-------------------- 2 files changed, 27 insertions(+), 20 deletions(-) diff --git a/omap/Makefile.am b/omap/Makefile.am index c77520b..0778bdd 100644 --- a/omap/Makefile.am +++ b/omap/Makefile.am @@ -1,5 +1,6 @@ AM_CFLAGS = \ $(WARN_CFLAGS) \ + $(VISIBILITY_CFLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/omap \ $(PTHREADSTUBS_CFLAGS) \ diff --git a/omap/omap_drm.c b/omap/omap_drm.c index 89f1491..8b4ec46 100644 --- a/omap/omap_drm.c +++ b/omap/omap_drm.c @@ -39,6 +39,7 @@ #include <unistd.h> #include <pthread.h> +#include <libdrm.h> #include <xf86drm.h> #include <xf86atomic.h> @@ -91,7 +92,7 @@ static struct omap_device * omap_device_new_impl(int fd) return dev; } -struct omap_device * omap_device_new(int fd) +drm_public struct omap_device * omap_device_new(int fd) { struct omap_device *dev = NULL; @@ -114,13 +115,13 @@ struct omap_device * omap_device_new(int fd) return dev; } -struct omap_device * omap_device_ref(struct omap_device *dev) +drm_public struct omap_device * omap_device_ref(struct omap_device *dev) { atomic_inc(&dev->refcnt); return dev; } -void omap_device_del(struct omap_device *dev) +drm_public void omap_device_del(struct omap_device *dev) { if (!atomic_dec_and_test(&dev->refcnt)) return; @@ -131,7 +132,8 @@ void omap_device_del(struct omap_device *dev) free(dev); } -int omap_get_param(struct omap_device *dev, uint64_t param, uint64_t *value) +drm_public int +omap_get_param(struct omap_device *dev, uint64_t param, uint64_t *value) { struct drm_omap_param req = { .param = param, @@ -148,7 +150,8 @@ int omap_get_param(struct omap_device *dev, uint64_t param, uint64_t *value) return 0; } -int omap_set_param(struct omap_device *dev, uint64_t param, uint64_t value) +drm_public int +omap_set_param(struct omap_device *dev, uint64_t param, uint64_t value) { struct drm_omap_param req = { .param = param, @@ -226,8 +229,8 @@ fail: /* allocate a new (un-tiled) buffer object */ -struct omap_bo * omap_bo_new(struct omap_device *dev, - uint32_t size, uint32_t flags) +drm_public struct omap_bo * +omap_bo_new(struct omap_device *dev, uint32_t size, uint32_t flags) { union omap_gem_size gsize = { .bytes = size, @@ -239,8 +242,9 @@ struct omap_bo * omap_bo_new(struct omap_device *dev, } /* allocate a new buffer object */ -struct omap_bo * omap_bo_new_tiled(struct omap_device *dev, - uint32_t width, uint32_t height, uint32_t flags) +drm_public struct omap_bo * +omap_bo_new_tiled(struct omap_device *dev, uint32_t width, + uint32_t height, uint32_t flags) { union omap_gem_size gsize = { .tiled = { @@ -254,7 +258,7 @@ struct omap_bo * omap_bo_new_tiled(struct omap_device *dev, return omap_bo_new_impl(dev, gsize, flags); } -struct omap_bo * omap_bo_ref(struct omap_bo *bo) +drm_public struct omap_bo *omap_bo_ref(struct omap_bo *bo) { atomic_inc(&bo->refcnt); return bo; @@ -280,7 +284,8 @@ static int get_buffer_info(struct omap_bo *bo) } /* import a buffer object from DRI2 name */ -struct omap_bo * omap_bo_from_name(struct omap_device *dev, uint32_t name) +drm_public struct omap_bo * +omap_bo_from_name(struct omap_device *dev, uint32_t name) { struct omap_bo *bo = NULL; struct drm_gem_open req = { @@ -313,7 +318,8 @@ fail: * fd so caller should close() the fd when it is otherwise done * with it (even if it is still using the 'struct omap_bo *') */ -struct omap_bo * omap_bo_from_dmabuf(struct omap_device *dev, int fd) +drm_public struct omap_bo * +omap_bo_from_dmabuf(struct omap_device *dev, int fd) { struct omap_bo *bo = NULL; struct drm_prime_handle req = { @@ -344,7 +350,7 @@ fail: } /* destroy a buffer object */ -void omap_bo_del(struct omap_bo *bo) +drm_public void omap_bo_del(struct omap_bo *bo) { if (!bo) { return; @@ -377,7 +383,7 @@ void omap_bo_del(struct omap_bo *bo) } /* get the global flink/DRI2 buffer name */ -int omap_bo_get_name(struct omap_bo *bo, uint32_t *name) +drm_public int omap_bo_get_name(struct omap_bo *bo, uint32_t *name) { if (!bo->name) { struct drm_gem_flink req = { @@ -398,7 +404,7 @@ int omap_bo_get_name(struct omap_bo *bo, uint32_t *name) return 0; } -uint32_t omap_bo_handle(struct omap_bo *bo) +drm_public uint32_t omap_bo_handle(struct omap_bo *bo) { return bo->handle; } @@ -406,7 +412,7 @@ uint32_t omap_bo_handle(struct omap_bo *bo) /* caller owns the dmabuf fd that is returned and is responsible * to close() it when done */ -int omap_bo_dmabuf(struct omap_bo *bo) +drm_public int omap_bo_dmabuf(struct omap_bo *bo) { if (!bo->fd) { struct drm_prime_handle req = { @@ -425,7 +431,7 @@ int omap_bo_dmabuf(struct omap_bo *bo) return dup(bo->fd); } -uint32_t omap_bo_size(struct omap_bo *bo) +drm_public uint32_t omap_bo_size(struct omap_bo *bo) { if (!bo->size) { get_buffer_info(bo); @@ -433,7 +439,7 @@ uint32_t omap_bo_size(struct omap_bo *bo) return bo->size; } -void * omap_bo_map(struct omap_bo *bo) +drm_public void *omap_bo_map(struct omap_bo *bo) { if (!bo->map) { if (!bo->offset) { @@ -449,7 +455,7 @@ void * omap_bo_map(struct omap_bo *bo) return bo->map; } -int omap_bo_cpu_prep(struct omap_bo *bo, enum omap_gem_op op) +drm_public int omap_bo_cpu_prep(struct omap_bo *bo, enum omap_gem_op op) { struct drm_omap_gem_cpu_prep req = { .handle = bo->handle, @@ -459,7 +465,7 @@ int omap_bo_cpu_prep(struct omap_bo *bo, enum omap_gem_op op) DRM_OMAP_GEM_CPU_PREP, &req, sizeof(req)); } -int omap_bo_cpu_fini(struct omap_bo *bo, enum omap_gem_op op) +drm_public int omap_bo_cpu_fini(struct omap_bo *bo, enum omap_gem_op op) { struct drm_omap_gem_cpu_fini req = { .handle = bo->handle, -- 2.0.0

1 2

[PULL] drm-intel-next
by Daniel Vetter 04 Aug '14

04 Aug '14

Hi Dave, Final feature pull for 3.17. drm-intel-next-2014-07-25: - Ditch UMS support (well just the config option for now) - Prep work for future platforms (Sonika Jindal, Damien) - runtime pm/soix fixes (Paulo, Jesse) - psr tracking improvements, locking fixes, now enabled by default! - rps fixes for chv (Deepak, Ville) - drm core patches for rotation support (Ville, Sagar Kamble) - the i915 parts unfortunately didn't make it yet - userptr fixes (Chris) - minimum backlight brightness (Jani), acked long ago by Matthew Garret on irc - I've forgotten about this patch :( QA is a bit unhappy about the DP MST stuff since it broke hpd testing a bit, but otherwise looks sane. I've backmerged drm-next to resolve conflicts with the mst stuff, which means the new tag itself doesn't contain the overview as usual. Cheers, Daniel The following changes since commit e05444be705b5c7c7f85d7722b6f97f3a6732d54: drm/i915: fix initial fbdev setup warnings (2014-07-24 10:27:42 +1000) are available in the git repository at: git://anongit.freedesktop.org/drm-intel tags/drm-intel-next-2014-07-25-merged for you to fetch changes up to 4dac3edfe68e5e1b3c2216b84ba160572420fa40: Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next (2014-07-29 20:49:36 +0200) ---------------------------------------------------------------- Armin Reese (1): drm/i915: Do not unmap object unless no other VMAs reference it Ben Widawsky (2): drm/i915/error: Check the potential ctx obj's vm drm/i915: Reorder ctx unref on ppgtt cleanup Borun Fu (1): drm/i915: Power gating display wells during i915_pm_suspend Chris Wilson (5): drm/i915: Handle failure to kick out a conflicting fb driver drm/i915: Abandon oom quickly if killed by a signal drm/i915: Initialise userptr mmu_notifier serial to 1 drm/i915: Allow overlapping userptr objects drm/i915/userptr: Keep spin_lock/unlock in the same block Damien Lespiau (3): drm/i915: PM irq enabling is generic on gen8, too drm/i915: Also give the sprite width for WM computation drm/i915: Make the WRPLL names const Daniel Vetter (14): drm/i915: ddi: enable runtime pm during dpms drm/i915: Run psr_setup unconditionally drm/i915: Add a FIXME about drrs/psr interactions drm/i915: Track the psr dp connector in dev_priv->psr.enabled drm/i915: Don't try to disable psr harder from the work item drm/i915: Lock down psr sw/hw state tracking drm/i915: More checks for psr.enabled drm/i915: Add locking to psr code drm/i915: Fix up PSR frontbuffer tracking drm/i915: Improve PSR debugfs output drm/i915: Remove redundant HAS_PSR checks drm/i915: Use genX_ prefix for gt irq enable/disable functions drm/i915: Ditch UMS config option Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next Deepak S (9): drm/i915: Read guaranteed freq for valleyview drm/i915: Add RP0/RP1/RPn render P state thresholds in VLV sysfs drm/i915: populate mem_freq/cz_clock for chv drm/i915: CHV GPU frequency to opcode functions drm/i915/chv: Add basic PM interrupt support for CHV drm/i915: Add RP1 render P state thresholds in CHV drm/i915: Force GPU Freq to lowest while suspending. drm/i915/chv: Drop WaGsvBringDownFreqInRc6 drm/i915: Fix printing proper min/min/rpe values in debugfs Fengguang Wu (1): drm/i915: byt_gpu_freq() can be static Jani Nikula (2): drm/i915: extract backlight minimum brightness from VBT drm/i915: respect the VBT minimum backlight brightness Jesse Barnes (5): drm/i915: don't warn if IRQs are disabled when shutting down display IRQs drm/i915: add helper for checking whether IRQs are enabled drm/i915: set pm._irqs_disabled at IRQ init time drm/i915: clear pm._irqs_disabled field after installing IRQs drm/i915: mark IRQs as disabled on unload Mika Kuoppala (1): drm/i915/chv: calculate rc6 residency correctly Paulo Zanoni (7): drm/i915: remove useless runtime PM get calls drm/i915: don't write powered down IRQ registers on Gen 8 drm/i915: HSW_BLC_PWM2_CTL doesn't exist on BDW drm/i915: extract and improve gen8_irq_power_well_post_enable drm/i915: reorganize the unclaimed register detection code drm/i915: BDW can also detect unclaimed registers drm/i915: remove plane/cursor/pipe assertions from intel_crtc_disable Rodrigo Vivi (2): drm/i915: Enable PSR by default. drm/i915: Fix possible overflow when recording semaphore states. Sagar Kamble (2): Documentation: drm: Removing placeholders for generic drm properties description Documentation: drm: describing rotation property Sonika Jindal (8): drm/i915: Adding HAS_GMCH_DISPLAY macro drm/i915: Allowing changing of wm latencies for valid platforms drm/i915: Returning the right VGA control reg for platforms drm/i915: Writing proper check for reading of pipe status reg drm/i915: Avoid incorrect returning for some platforms drm/i915: Setting legacy palette correctly for different platforms drm/i915: Returning from increase/decrease of pllclock when invalid drm/i915: Replace HAS_PCH_SPLIT which incorrectly lets some platforms in Vandana Kannan (4): drm/crtc: Add property for aspect ratio drm/edid: Check for user aspect ratio input drm/i915: Add aspect ratio property for HDMI Documentation/drm: Describing aspect ratio property Ville Syrjälä (9): drm/i915: Don't disable PPGTT for CHV based in PCI rev drm/i915: Use the cached min/min/rpe values in the vlv debugfs code drm/i915: Call encoder->post_disable() in intel_sanitize_encoder() drm: Move DRM_ROTATE bits out of omapdrm into drm_crtc.h drm: Add support_bits parameter to drm_property_create_bitmask() drm: Add drm_mode_create_rotation_property() drm/omap: Switch omapdrm over to drm_mode_create_rotation_property() drm: Add drm_rect rotation functions drm: Add drm_rotation_simplify() Documentation/DocBook/drm.tmpl | 77 ++++-------- drivers/gpu/drm/drm_crtc.c | 98 ++++++++++++++- drivers/gpu/drm/drm_edid.c | 10 +- drivers/gpu/drm/drm_rect.c | 140 ++++++++++++++++++++++ drivers/gpu/drm/i915/Kconfig | 12 -- drivers/gpu/drm/i915/i915_debugfs.c | 35 +++--- drivers/gpu/drm/i915/i915_dma.c | 20 +++- drivers/gpu/drm/i915/i915_drv.c | 11 +- drivers/gpu/drm/i915/i915_drv.h | 29 +++-- drivers/gpu/drm/i915/i915_gem.c | 13 +- drivers/gpu/drm/i915/i915_gem_context.c | 6 +- drivers/gpu/drm/i915/i915_gem_gtt.c | 3 +- drivers/gpu/drm/i915/i915_gem_userptr.c | 149 ++++++++++++++++------- drivers/gpu/drm/i915/i915_gpu_error.c | 24 ++-- drivers/gpu/drm/i915/i915_irq.c | 68 +++++++---- drivers/gpu/drm/i915/i915_params.c | 10 +- drivers/gpu/drm/i915/i915_reg.h | 8 +- drivers/gpu/drm/i915/i915_sysfs.c | 57 +++++++-- drivers/gpu/drm/i915/intel_bios.c | 3 +- drivers/gpu/drm/i915/intel_crt.c | 4 - drivers/gpu/drm/i915/intel_ddi.c | 2 +- drivers/gpu/drm/i915/intel_display.c | 78 ++++++------ drivers/gpu/drm/i915/intel_dp.c | 205 +++++++++++++++++++------------- drivers/gpu/drm/i915/intel_drv.h | 40 +++++-- drivers/gpu/drm/i915/intel_hdmi.c | 35 +++++- drivers/gpu/drm/i915/intel_opregion.c | 2 +- drivers/gpu/drm/i915/intel_panel.c | 160 ++++++++++++++++++++++--- drivers/gpu/drm/i915/intel_pm.c | 202 +++++++++++++++++++++++++------ drivers/gpu/drm/i915/intel_ringbuffer.c | 12 +- drivers/gpu/drm/i915/intel_sprite.c | 15 ++- drivers/gpu/drm/i915/intel_uncore.c | 30 +++-- drivers/gpu/drm/omapdrm/omap_drv.h | 7 -- drivers/gpu/drm/omapdrm/omap_plane.c | 17 ++- include/drm/drm_crtc.h | 17 ++- include/drm/drm_rect.h | 6 + include/uapi/drm/drm_mode.h | 5 + 36 files changed, 1182 insertions(+), 428 deletions(-) -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch

2 1

[libdrm PATCH 1/3] nouveau: Only export public functions.
by Maarten Lankhorst 04 Aug '14

04 Aug '14

This hides all the abi16_* functions and the nouveau_debug variable, they should have been private to begin with. Signed-off-by: Maarten Lankhorst <maarten.lankhorst(a)canonical.com> --- nouveau/Makefile.am | 1 + nouveau/bufctx.c | 10 +++++----- nouveau/nouveau.c | 40 ++++++++++++++++++++-------------------- nouveau/private.h | 1 + nouveau/pushbuf.c | 20 ++++++++++---------- 5 files changed, 37 insertions(+), 35 deletions(-) diff --git a/nouveau/Makefile.am b/nouveau/Makefile.am index 206e892..73cff9f 100644 --- a/nouveau/Makefile.am +++ b/nouveau/Makefile.am @@ -1,5 +1,6 @@ AM_CFLAGS = \ $(WARN_CFLAGS) \ + $(VISIBILITY_CFLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/nouveau \ $(PTHREADSTUBS_CFLAGS) \ diff --git a/nouveau/bufctx.c b/nouveau/bufctx.c index 23d6f09..fdd3164 100644 --- a/nouveau/bufctx.c +++ b/nouveau/bufctx.c @@ -68,7 +68,7 @@ nouveau_bufctx(struct nouveau_bufctx *bctx) return (struct nouveau_bufctx_priv *)bctx; } -int +drm_public int nouveau_bufctx_new(struct nouveau_client *client, int bins, struct nouveau_bufctx **pbctx) { @@ -88,7 +88,7 @@ nouveau_bufctx_new(struct nouveau_client *client, int bins, return -ENOMEM; } -void +drm_public void nouveau_bufctx_del(struct nouveau_bufctx **pbctx) { struct nouveau_bufctx_priv *pctx = nouveau_bufctx(*pbctx); @@ -105,7 +105,7 @@ nouveau_bufctx_del(struct nouveau_bufctx **pbctx) } } -void +drm_public void nouveau_bufctx_reset(struct nouveau_bufctx *bctx, int bin) { struct nouveau_bufctx_priv *pctx = nouveau_bufctx(bctx); @@ -123,7 +123,7 @@ nouveau_bufctx_reset(struct nouveau_bufctx *bctx, int bin) pbin->relocs = 0; } -struct nouveau_bufref * +drm_public struct nouveau_bufref * nouveau_bufctx_refn(struct nouveau_bufctx *bctx, int bin, struct nouveau_bo *bo, uint32_t flags) { @@ -150,7 +150,7 @@ nouveau_bufctx_refn(struct nouveau_bufctx *bctx, int bin, return &pref->base; } -struct nouveau_bufref * +drm_public struct nouveau_bufref * nouveau_bufctx_mthd(struct nouveau_bufctx *bctx, int bin, uint32_t packet, struct nouveau_bo *bo, uint64_t data, uint32_t flags, uint32_t vor, uint32_t tor) diff --git a/nouveau/nouveau.c b/nouveau/nouveau.c index 1bede84..43f0d3c 100644 --- a/nouveau/nouveau.c +++ b/nouveau/nouveau.c @@ -62,14 +62,14 @@ debug_init(char *args) * is kept here to prevent AIGLX from crashing if the DDX is linked against * the new libdrm, but the DRI driver against the old */ -int +drm_public int nouveau_device_open_existing(struct nouveau_device **pdev, int close, int fd, drm_context_t ctx) { return -EACCES; } -int +drm_public int nouveau_device_wrap(int fd, int close, struct nouveau_device **pdev) { struct nouveau_device_priv *nvdev = calloc(1, sizeof(*nvdev)); @@ -147,7 +147,7 @@ nouveau_device_wrap(int fd, int close, struct nouveau_device **pdev) return 0; } -int +drm_public int nouveau_device_open(const char *busid, struct nouveau_device **pdev) { int ret = -ENODEV, fd = drmOpen("nouveau", busid); @@ -159,7 +159,7 @@ nouveau_device_open(const char *busid, struct nouveau_device **pdev) return ret; } -void +drm_public void nouveau_device_del(struct nouveau_device **pdev) { struct nouveau_device_priv *nvdev = nouveau_device(*pdev); @@ -173,7 +173,7 @@ nouveau_device_del(struct nouveau_device **pdev) } } -int +drm_public int nouveau_getparam(struct nouveau_device *dev, uint64_t param, uint64_t *value) { struct drm_nouveau_getparam r = { param, 0 }; @@ -183,14 +183,14 @@ nouveau_getparam(struct nouveau_device *dev, uint64_t param, uint64_t *value) return ret; } -int +drm_public int nouveau_setparam(struct nouveau_device *dev, uint64_t param, uint64_t value) { struct drm_nouveau_setparam r = { param, value }; return drmCommandWrite(dev->fd, DRM_NOUVEAU_SETPARAM, &r, sizeof(r)); } -int +drm_public int nouveau_client_new(struct nouveau_device *dev, struct nouveau_client **pclient) { struct nouveau_device_priv *nvdev = nouveau_device(dev); @@ -229,7 +229,7 @@ unlock: return ret; } -void +drm_public void nouveau_client_del(struct nouveau_client **pclient) { struct nouveau_client_priv *pcli = nouveau_client(*pclient); @@ -245,7 +245,7 @@ nouveau_client_del(struct nouveau_client **pclient) } } -int +drm_public int nouveau_object_new(struct nouveau_object *parent, uint64_t handle, uint32_t oclass, void *data, uint32_t length, struct nouveau_object **pobj) @@ -307,7 +307,7 @@ nouveau_object_new(struct nouveau_object *parent, uint64_t handle, return 0; } -void +drm_public void nouveau_object_del(struct nouveau_object **pobj) { struct nouveau_object *obj = *pobj; @@ -331,7 +331,7 @@ nouveau_object_del(struct nouveau_object **pobj) *pobj = NULL; } -void * +drm_public void * nouveau_object_find(struct nouveau_object *obj, uint32_t pclass) { while (obj && obj->oclass != pclass) { @@ -385,7 +385,7 @@ nouveau_bo_del(struct nouveau_bo *bo) free(nvbo); } -int +drm_public int nouveau_bo_new(struct nouveau_device *dev, uint32_t flags, uint32_t align, uint64_t size, union nouveau_bo_config *config, struct nouveau_bo **pbo) @@ -451,7 +451,7 @@ nouveau_bo_wrap_locked(struct nouveau_device *dev, uint32_t handle, return -ENOMEM; } -int +drm_public int nouveau_bo_wrap(struct nouveau_device *dev, uint32_t handle, struct nouveau_bo **pbo) { @@ -463,7 +463,7 @@ nouveau_bo_wrap(struct nouveau_device *dev, uint32_t handle, return ret; } -int +drm_public int nouveau_bo_name_ref(struct nouveau_device *dev, uint32_t name, struct nouveau_bo **pbo) { @@ -492,7 +492,7 @@ nouveau_bo_name_ref(struct nouveau_device *dev, uint32_t name, return ret; } -int +drm_public int nouveau_bo_name_get(struct nouveau_bo *bo, uint32_t *name) { struct drm_gem_flink req = { .handle = bo->handle }; @@ -510,7 +510,7 @@ nouveau_bo_name_get(struct nouveau_bo *bo, uint32_t *name) return 0; } -void +drm_public void nouveau_bo_ref(struct nouveau_bo *bo, struct nouveau_bo **pref) { struct nouveau_bo *ref = *pref; @@ -524,7 +524,7 @@ nouveau_bo_ref(struct nouveau_bo *bo, struct nouveau_bo **pref) *pref = bo; } -int +drm_public int nouveau_bo_prime_handle_ref(struct nouveau_device *dev, int prime_fd, struct nouveau_bo **bo) { @@ -553,7 +553,7 @@ nouveau_bo_prime_handle_ref(struct nouveau_device *dev, int prime_fd, return ret; } -int +drm_public int nouveau_bo_set_prime(struct nouveau_bo *bo, int *prime_fd) { struct nouveau_bo_priv *nvbo = nouveau_bo(bo); @@ -567,7 +567,7 @@ nouveau_bo_set_prime(struct nouveau_bo *bo, int *prime_fd) return 0; } -int +drm_public int nouveau_bo_wait(struct nouveau_bo *bo, uint32_t access, struct nouveau_client *client) { @@ -601,7 +601,7 @@ nouveau_bo_wait(struct nouveau_bo *bo, uint32_t access, return ret; } -int +drm_public int nouveau_bo_map(struct nouveau_bo *bo, uint32_t access, struct nouveau_client *client) { diff --git a/nouveau/private.h b/nouveau/private.h index 4f337ad..bf9db04 100644 --- a/nouveau/private.h +++ b/nouveau/private.h @@ -1,6 +1,7 @@ #ifndef __NOUVEAU_LIBDRM_PRIVATE_H__ #define __NOUVEAU_LIBDRM_PRIVATE_H__ +#include <libdrm.h> #include <xf86drm.h> #include <xf86atomic.h> #include <pthread.h> diff --git a/nouveau/pushbuf.c b/nouveau/pushbuf.c index 4f77881..6e703a4 100644 --- a/nouveau/pushbuf.c +++ b/nouveau/pushbuf.c @@ -529,7 +529,7 @@ pushbuf_validate(struct nouveau_pushbuf *push, bool retry) return ret; } -int +drm_public int nouveau_pushbuf_new(struct nouveau_client *client, struct nouveau_object *chan, int nr, uint32_t size, bool immediate, struct nouveau_pushbuf **ppush) @@ -600,7 +600,7 @@ nouveau_pushbuf_new(struct nouveau_client *client, struct nouveau_object *chan, return 0; } -void +drm_public void nouveau_pushbuf_del(struct nouveau_pushbuf **ppush) { struct nouveau_pushbuf_priv *nvpb = nouveau_pushbuf(*ppush); @@ -626,7 +626,7 @@ nouveau_pushbuf_del(struct nouveau_pushbuf **ppush) *ppush = NULL; } -struct nouveau_bufctx * +drm_public struct nouveau_bufctx * nouveau_pushbuf_bufctx(struct nouveau_pushbuf *push, struct nouveau_bufctx *ctx) { struct nouveau_bufctx *prev = push->bufctx; @@ -634,7 +634,7 @@ nouveau_pushbuf_bufctx(struct nouveau_pushbuf *push, struct nouveau_bufctx *ctx) return prev; } -int +drm_public int nouveau_pushbuf_space(struct nouveau_pushbuf *push, uint32_t dwords, uint32_t relocs, uint32_t pushes) { @@ -698,7 +698,7 @@ nouveau_pushbuf_space(struct nouveau_pushbuf *push, return flushed ? pushbuf_validate(push, false) : 0; } -void +drm_public void nouveau_pushbuf_data(struct nouveau_pushbuf *push, struct nouveau_bo *bo, uint64_t offset, uint64_t length) { @@ -728,14 +728,14 @@ nouveau_pushbuf_data(struct nouveau_pushbuf *push, struct nouveau_bo *bo, } } -int +drm_public int nouveau_pushbuf_refn(struct nouveau_pushbuf *push, struct nouveau_pushbuf_refn *refs, int nr) { return pushbuf_refn(push, true, refs, nr); } -void +drm_public void nouveau_pushbuf_reloc(struct nouveau_pushbuf *push, struct nouveau_bo *bo, uint32_t data, uint32_t flags, uint32_t vor, uint32_t tor) { @@ -743,13 +743,13 @@ nouveau_pushbuf_reloc(struct nouveau_pushbuf *push, struct nouveau_bo *bo, push->cur++; } -int +drm_public int nouveau_pushbuf_validate(struct nouveau_pushbuf *push) { return pushbuf_validate(push, true); } -uint32_t +drm_public uint32_t nouveau_pushbuf_refd(struct nouveau_pushbuf *push, struct nouveau_bo *bo) { struct drm_nouveau_gem_pushbuf_bo *kref; @@ -766,7 +766,7 @@ nouveau_pushbuf_refd(struct nouveau_pushbuf *push, struct nouveau_bo *bo) return flags; } -int +drm_public int nouveau_pushbuf_kick(struct nouveau_pushbuf *push, struct nouveau_object *chan) { if (!push->channel) -- 2.0.0

4 5

[GIT PULL] exynos-drm-next
by Inki Dae 04 Aug '14

04 Aug '14

Hi Dave, This pull request includes i80 interface support, module auto-loading ipp consolidation, and trivail fixups and cleanups. Summary: - Add i80 interface support. For this, we added some features to Exynos drm framework, which don't affect any other SoC and common framework because they are specific to Exynos drm. - Add module auto-loading support. For this, sub drivers of Exynos drm exports their of match tables to userspace. This allows modules to be loaded automatically based on devicetree information - Consolidate ipp driver. This patch just just includes cleanups and a littl bit refactoring codes. If there is any problem, please kindly let me know. Thanks, Inki Dae The following changes since commit 08d645c181e9b9482c249e82a061c279a986db15: agp: remove read/write stubs (2014-08-02 06:43:51 +1000) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos exynos-drm-next for you to fetch changes up to ef7ce055a9e00f6376416466b996515a27b7cb31: drm/exynos: g2d: let exynos_g2d_get_ver_ioctl fail (2014-08-04 13:39:28 +0900) ---------------------------------------------------------------- Alban Browaeys (1): drm/exynos: g2d: add exynos4212 as a compatible device. Andrzej Hajda (12): drm/exynos/ipp: remove type casting drm/exynos/ipp: remove unused field from exynos_drm_ipp_private drm/exynos/ipp: remove struct exynos_drm_ipp_private drm/exynos/ipp: correct address type drm/exynos/ipp: remove temporary variable drm/exynos/ipp: remove incorrect checks of list_first_entry result drm/exynos/ipp: simplify memory check function drm/exynos/ipp: remove useless registration checks drm/exynos/ipp: simplify ipp_find_obj drm/exynos/ipp: remove redundant messages drm/exynos/ipp: simplify ipp_create_id drm/exynos/ipp: simplify ipp_find_driver Jingoo Han (1): drm/exynos: dp: Use correct module license Joonyoung Shim (1): drm/exynos: control blending of mixer graphic layer 0 Krzysztof Kozlowski (1): drm/exynos: Fix NULL pointer exception when suspending without components Marek Szyprowski (2): drm/exynos: hdmi: make 'hdmi-en' regulator optional and keep it enabled drm/exynos: hdmi: enable exynos 4210 and 4x12 soc support Sachin Kamat (2): drm/exynos: Remove unused variable from exynos_hdmi.c drm/exynos: Remove unused variable in exynos_drm_gem.c Seung-Woo Kim (1): drm/exynos: hdmi: add null check for hdmiphy_port Sjoerd Simons (3): Subject: Revert "drm/exynos: fix module build error" Subject: Revert "drm/exynos: remove MODULE_DEVICE_TABLE definitions" drm/exynos: Add MODULE_DEVICE_TABLE entries for various components Tobias Jakobi (2): drm/exynos: g2d: make ioctls more robust drm/exynos: g2d: let exynos_g2d_get_ver_ioctl fail YoungJun Cho (12): drm/exynos: dsi: move the EoT packets configuration point drm/exynos: use wait_event_timeout() for safety usage ARM: dts: samsung-fimd: add LCD I80 interface specific properties drm/exynos: add TE handler to support LCD I80 interface drm/exynos: dsi: add TE interrupt handler to support LCD I80 interface drm/exynos: fimd: support LCD I80 interface ARM: dts: exynos_dsim: add exynos5410 compatible to DT bindings drm/exynos: dsi: add driver data to support Exynos5410/5420/5440 SoCs ARM: dts: exynos4: add system register property ARM: dts: exynos5: add system register property ARM: dts: exynos5420: add mipi-phy node ARM: dts: exynos5420: add dsi node .../devicetree/bindings/video/exynos_dsim.txt | 4 +- .../devicetree/bindings/video/exynos_mixer.txt | 5 +- .../devicetree/bindings/video/samsung-fimd.txt | 28 ++ arch/arm/boot/dts/exynos4.dtsi | 1 + arch/arm/boot/dts/exynos5.dtsi | 1 + arch/arm/boot/dts/exynos5420.dtsi | 20 ++ drivers/gpu/drm/exynos/Kconfig | 1 + drivers/gpu/drm/exynos/exynos_dp_core.c | 3 +- drivers/gpu/drm/exynos/exynos_drm_crtc.c | 15 +- drivers/gpu/drm/exynos/exynos_drm_crtc.h | 7 + drivers/gpu/drm/exynos/exynos_drm_drv.c | 4 +- drivers/gpu/drm/exynos/exynos_drm_drv.h | 10 +- drivers/gpu/drm/exynos/exynos_drm_dsi.c | 270 +++++++++++++++++-- drivers/gpu/drm/exynos/exynos_drm_fimc.c | 1 + drivers/gpu/drm/exynos/exynos_drm_fimd.c | 277 ++++++++++++++++---- drivers/gpu/drm/exynos/exynos_drm_g2d.c | 29 +- drivers/gpu/drm/exynos/exynos_drm_gem.c | 3 - drivers/gpu/drm/exynos/exynos_drm_ipp.c | 259 +++++------------- drivers/gpu/drm/exynos/exynos_drm_ipp.h | 4 +- drivers/gpu/drm/exynos/exynos_drm_rotator.c | 1 + drivers/gpu/drm/exynos/exynos_hdmi.c | 36 ++- drivers/gpu/drm/exynos/exynos_mixer.c | 57 ++-- include/video/samsung_fimd.h | 3 +- 23 files changed, 739 insertions(+), 300 deletions(-)

1 0

[Bug 81261] NVIDIA GT 745M not properly detected
by bugzilla-daemon＠bugzilla.kernel.org 04 Aug '14

04 Aug '14

https://bugzilla.kernel.org/show_bug.cgi?id=81261 Ilia Mirkin <imirkin(a)alum.mit.edu> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |imirkin(a)alum.mit.edu --- Comment #8 from Ilia Mirkin <imirkin(a)alum.mit.edu> --- There are no nouveau messages and there are NVRM messages. Do these issues happen with nouveau instead of the blob? As for not having GLX, you're probably mixing and matching xorg/mesa and nvidia blob libraries. The Xorg log all seems fine... you never actually stated anything about the problem you're having (beyond some annoying lines in dmesg which are usually a result of buggy ASL logic). And lastly using the blob basically gets you 0 support from most of the open source community. [FTR, the suggested config on that archlinux wiki page is pretty crazy... but it does seem like it could work.] So... what's the issue? Is it that the proprietary nvidia drivers don't work in some way that you expect them to? Then file a bug with nvidia. If the issue, whatever it is, is reproducible without the blob drivers, feel free to update. -- You are receiving this mail because: You are watching the assignee of the bug.

1 0

[Bug 81261] NVIDIA GT 745M not properly detected
by bugzilla-daemon＠bugzilla.kernel.org 04 Aug '14

04 Aug '14

https://bugzilla.kernel.org/show_bug.cgi?id=81261 Aaron Lu <aaron.lu(a)intel.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED CC| |aaron.lu(a)intel.com Component|Power-Video |Video(DRI - non Intel) Assignee|acpi_power-video@kernel-bug |drivers_video-dri@kernel-bu |s.osdl.org |gs.osdl.org Product|ACPI |Drivers --- Comment #7 from Aaron Lu <aaron.lu(a)intel.com> --- The error message from _ROM and _DSM all seems originated from the nouveau driver, I would suggest having the nouveau driver developer take a look first. -- You are receiving this mail because: You are watching the assignee of the bug.

1 0

[PATCH 00/19] atomic, remixed
by Daniel Vetter 03 Aug '14

03 Aug '14

Hi all, So I've figured instead of just talking I should draw up my ideas for atomic helpers and related stuff in some draft patches. Major differences compared to Rob's series: - The software side state update is done synchronously, at least when using the helper code. Drivers are free to do whatever they want, as usual. This has a bunch of nice upsides: + All the tricky locking dances can be abolished, and if the ordering and synchronization is done correctly async worker threads don't need any modeset state locking at all. I'm fairly sure that Rob's scheme won't blow up, but I much prefer we don't need it at all. + In Rob's patches any atomic operation must wait for outstanding updates to complete. Otherwise the software state isn't committed yet. With the synchronous updates we can immediately proceed with the state construction and verification and will only block right before applying the state update. And even for that drivers can implement cancellation of the previous update. This has the nice benefit that check-only operations (which compositors need to do right after having completed the current frame to know how to render the next one) can be done without blocking for completion of the previous update. - Internal interfaces for atomic updates don't need to go through properties, but can directly set the state. Drivers can always compare updates in their ->check hook later on, so we don't lose expressiveness in the interface. But the resulting code in the callers looks much better. In general I've ditched a lot of interfaces where drivers could overwrite default behaviour and boiled down the interface two state handling functions (duplicate+destroy), setting driver-private properties and check/commit. - There is a clear helper separation between core code which should be used to use the atomic interface to drivers, and helper functions. Core never uses helper functions so that we can keep the clear separation we have in all other places in the kms api. There's a set of helpers sitting in-between to implement legacy interfaces on top of atomic. Those _only_ use the core atomic interfaces. - I've added a new set of plane helpers. Mostly this was motivated to make the atomic helpers work on less stellar hardware where you can't just stream the state and then atomically commit with some GO bits. But those helpers should also be useful for more gradual transitions of drivers to the atomic interface. Since a requirement for atomic is to have universal plane support they can be used bare-bones just for that, without all the other atomic baggage (i.e. all the state tracking for crtcs/connectors). - State tracking for connectors. i915 has piles of relevant connector properties, which we want to save/restore in atomic ops (e.g. hdmi metadata and stuff). - fbdev panic locking is implemented with trylock instead of nolock. - I've thought a bit about resume. See the proposed state handling for the default reset functions and the addition of a plane reset callback. There's also a metric pile of stuff missing: - It's completely untested (except for the parts touching currently used code) since I lack suitable hw. Converting i915 is just a bit too much of a pain for a quick w/e code draft ;-) - I didn't add all the properties for things currently exposed through ioctl structures. Since the interface here doesn't force internal code to use properties for everything (which really makes things look much better) we don't have a need for that until we merge the actual atomic ioctl. So I left that out. - I didn't write code for the fbdev helper to use atomic. The w/e ran out of time for that ... - Kerneldoc is occasionally not updated or still missing. Anyway I think this draft code is good enough to explain how I'd like to address some of the concerns I have with the current atomic code. Comments, flames and ideas highly welcome. And if anyone is insane enought to try this on real hardware, that would certainly be interesting and I'm very much willing to help out as much as possible ... i915 just really isn't suitable since it won't be using the helpers, and all the other hw I have here doesn't support planes. Cheers, Daniel Daniel Vetter (18): drm: Add atomic driver interface definitions for objects drm: Add drm_plane/connector_index drm: Move modeset_lock_all helpers to drm_modeset_lock.[hc] drm: Handle legacy per-crtc locking with full acquire ctx drm: Global atomic state handling drm: Add atomic/plane helpers drm/irq: Implement a generic vblank_wait function drm/i915: Use generic vblank wait drm/plane-helper: transitional atomic plane helpers drm/crtc-helper: Transitional functions using atomic plane helpers drm: Atomic crtc/connector updates using crtc helper interfaces drm: Move ->old_fb from crtc to plane drm/atomic-helper: implementatations for legacy interfaces drm/plane-helper: Add async mode to prepare_fb drm/atomic-helpers: document how to implement async commit drm/atomic-helper: implement ->page_flip drm: trylock modest locking for fbdev panics drm/atomic-helpers: functions for state duplicate/destroy/reset Ville Syrjälä (1): drm: Add drm_crtc_vblank_waitqueue() Documentation/DocBook/drm.tmpl | 1 + drivers/gpu/drm/Makefile | 4 +- drivers/gpu/drm/drm_atomic.c | 529 ++++++++++++ drivers/gpu/drm/drm_atomic_helper.c | 1570 ++++++++++++++++++++++++++++++++++ drivers/gpu/drm/drm_crtc.c | 194 ++--- drivers/gpu/drm/drm_crtc_helper.c | 139 +++ drivers/gpu/drm/drm_fb_helper.c | 10 +- drivers/gpu/drm/drm_irq.c | 45 + drivers/gpu/drm/drm_modeset_lock.c | 204 ++++- drivers/gpu/drm/drm_plane_helper.c | 181 +++- drivers/gpu/drm/i915/intel_display.c | 41 +- include/drm/drmP.h | 13 + include/drm/drm_atomic.h | 63 ++ include/drm/drm_atomic_helper.h | 98 +++ include/drm/drm_crtc.h | 208 ++++- include/drm/drm_crtc_helper.h | 13 + include/drm/drm_modeset_lock.h | 16 + include/drm/drm_plane_helper.h | 31 + 18 files changed, 3188 insertions(+), 172 deletions(-) create mode 100644 drivers/gpu/drm/drm_atomic.c create mode 100644 drivers/gpu/drm/drm_atomic_helper.c create mode 100644 include/drm/drm_atomic.h create mode 100644 include/drm/drm_atomic_helper.h -- 2.0.1

3 25

[Bug 81021] AMD CPUs w/ Integrated Graphics (APUs) And Turbo Core Only Boost If "fglrx" Module Is Loaded
by bugzilla-daemon＠bugzilla.kernel.org 03 Aug '14

03 Aug '14

https://bugzilla.kernel.org/show_bug.cgi?id=81021 --- Comment #7 from LiNuxXer <andre.d(a)gmx.net> --- Hello Alex, (In reply to Alex Deucher from comment #6) > Turbo Core (bapm) is controlled by a microcontroller on the APU. The same > microcontroller also manages the GPU power management. On most APU systems, > turbo core is enabled by default by the sbios, but apparently on your system > it's not. Maybe there is a bios option to enable it by default on your > system. reconsidering everything you wrote and I thought I found out, I think I'll have to start from scratch. Firstly, the BIOS does have Turbo Core and Cool'n'Quiet settings, along with many others. Also. it's the latest version, and the A10-6700 is not brand new. Secondly, I noticed that even Ubuntu Server will install the radeon driver although there is no need to. Thirdly, I made a quick test with a Gentoo installer (which neither loads the radeon module nor sets the ondemand governor) and an amperemeter (to be honest: two amperemeters, because I couldn't believe the results), and this completely confused me. While the system needs 96 W while in the BIOS, this drops to 56 W as soon as Linux boots. And I can't get a lower power consumption even if I set the ondemand governor, with the freq of the four cores shown to drop from 3700 to 1800. Several reviews mention a 35 W system (!) power consumption when the A10-6700 is idle, but in this setup, the changing frequency does not have the slightest effect (which it should even have with an average power supply). I was wondering whether you could shed some additional light on this. How many settings actually influence this behaviour in total (since the BIOS also has "Cool'n'Qiet")? Is there any tool to display them? If not, would you help me to build one? Could we see some incomplete initialisation here? Is there any documentation on these settings? I'm groping in the dark here with no progress, and I may even have to exchange the HW if I don't get near the 35 W and have Turbo Core. > When the GPU driver loads and sets up the GPU power management, it > can also enable or disable bapm. When bapm and GPU power mangement (dynamic > GPU engine clock and voltage scaling, clock and powergating, etc.) are both > enabled, some systems have stability problems (sudden reboots, hangs, > graphical corruption, issues when switching between AC and battery). I would be happy with some fixed low bandwidth setting for the graphics. Saw some indivation for 33 MHz during console mode but am not sure I can rely on this information. -- You are receiving this mail because: You are watching the assignee of the bug.

1 0

Re: [PATCH] gpu/drm/ttm: Use mutex_lock_killable() for shrinker functions.
by Dave Airlie 03 Aug '14

03 Aug '14

cc'ing dri-devel. > >From e314a1a1583e585d062dfc30c8aad8bf5380510b Mon Sep 17 00:00:00 2001 > From: Tetsuo Handa <penguin-kernel(a)I-love.SAKURA.ne.jp> > Date: Mon, 19 May 2014 18:43:21 +0900 > Subject: [PATCH] gpu/drm/ttm: Use mutex_lock_killable() for shrinker functions. > > I can observe that RHEL7 environment stalls with 100% CPU usage when a > certain type of memory pressure is given. While the shrinker functions > are called by shrink_slab() before the OOM killer is triggered, the stall > lasts for many minutes. > > I added debug printk() and observed that many threads are blocked for more > than 10 seconds at ttm_dma_pool_shrink_count()/ttm_dma_pool_shrink_scan() > functions. Since the kswapd can call these functions later, the current > thread can return from these functions as soon as chosen by the OOM killer. > > This patch changes "mutex_lock();" to "if (mutex_lock_killable()) return ...;" > so that any threads can promptly give up. (By the way, as far as I tested, > changing to "if (!mutex_trylock()) return ...;" likely shortens the duration > of stall. Maybe we don't need to wait for mutex if someone is already calling > these functions.) > > Signed-off-by: Tetsuo Handa <penguin-kernel(a)I-love.SAKURA.ne.jp> > --- > drivers/gpu/drm/ttm/ttm_page_alloc_dma.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c > index 1b79bf0..f75dab8 100644 > --- a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c > +++ b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c > @@ -1012,7 +1012,8 @@ ttm_dma_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc) > if (list_empty(&_manager->pools)) > return SHRINK_STOP; > > - mutex_lock(&_manager->lock); > + if (mutex_lock_killable(&_manager->lock)) > + return SHRINK_STOP; > pool_offset = pool_offset % _manager->npools; > list_for_each_entry(p, &_manager->pools, pools) { > unsigned nr_free; > @@ -1043,7 +1044,8 @@ ttm_dma_pool_shrink_count(struct shrinker *shrink, struct shrink_control *sc) > struct device_pools *p; > unsigned long count = 0; > > - mutex_lock(&_manager->lock); > + if (mutex_lock_killable(&_manager->lock)) > + return 0; > list_for_each_entry(p, &_manager->pools, pools) > count += p->pool->npages_free; > mutex_unlock(&_manager->lock); >

4 20

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel August 2014