dri-devel July 2018

dri-devel@lists.freedesktop.org

277 participants
1883 discussions

[PULL] drm-intel-fixes
by Jani Nikula 05 Jul '18

05 Jul '18

Hi Dave, i915 fixes for v4.18-rc4. I'll be taking some vacation, and Rodrigo will handle the rest of the v4.18 fixes, as well as -next for v4.19. BR, Jani. The following changes since commit 021c91791a5e7e85c567452f1be3e4c2c6cb6063: Linux 4.18-rc3 (2018-07-01 16:04:53 -0700) are available in the git repository at: git://anongit.freedesktop.org/drm/drm-intel tags/drm-intel-fixes-2018-07-05 for you to fetch changes up to 3030deda09711e5d81eabf5cd95a567576601343: Merge tag 'gvt-fixes-2018-07-03' of https://github.com/intel/gvt-linux into drm-intel-fixes (2018-07-03 14:57:43 +0300) ---------------------------------------------------------------- A couple of GVT fixes, and a GGTT mmapping fix. ---------------------------------------------------------------- Chris Wilson (1): drm/i915: Try GGTT mmapping whole object as partial Jani Nikula (1): Merge tag 'gvt-fixes-2018-07-03' of https://github.com/intel/gvt-linux into drm-intel-fixes Xiaolin Zhang (1): drm/i915/gvt: changed DDI mode emulation type Zhao Yan (1): drm/i915/gvt: fix a bug of partially write ggtt enties drivers/gpu/drm/i915/gvt/display.c | 6 ++-- drivers/gpu/drm/i915/gvt/gtt.c | 58 ++++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/gvt/gtt.h | 2 ++ drivers/gpu/drm/i915/i915_gem.c | 28 ++++++++++-------- drivers/gpu/drm/i915/i915_vma.c | 2 +- 5 files changed, 81 insertions(+), 15 deletions(-) -- Jani Nikula, Intel Open Source Graphics Center

1 0

[PATCH v12 0/5] Add suppport for sn65dsi86 bridge chip and Innolux 2k edp panel
by Sandeep Panda 05 Jul '18

05 Jul '18

Changes in current patchset: - Explain in comment as in why dsi dev registration is done in bridge_attach. - Make panel/DDC exclusive until HPD support is added. - Update interrupts and data-lane dt property bindings. Sandeep Panda (5): dt-bindings: media: extend interface documentation for DSI and DP drm/bridge: add support for sn65dsi86 bridge driver dt-bindings: drm/bridge: Document sn65dsi86 bridge bindings drm/panel: add Innolux TV123WAM panel driver support dt-bindings: drm/panel: Document Innolux TV123WAM panel bindings .../bindings/display/bridge/ti,sn65dsi86.txt | 86 +++ .../bindings/display/panel/innolux,tv123wam.txt | 20 + .../devicetree/bindings/media/video-interfaces.txt | 10 +- drivers/gpu/drm/bridge/Kconfig | 9 + drivers/gpu/drm/bridge/Makefile | 1 + drivers/gpu/drm/bridge/ti-sn65dsi86.c | 708 +++++++++++++++++++++ drivers/gpu/drm/panel/panel-simple.c | 27 + 7 files changed, 857 insertions(+), 4 deletions(-) create mode 100644 Documentation/devicetree/bindings/display/bridge/ti,sn65dsi86.txt create mode 100644 Documentation/devicetree/bindings/display/panel/innolux,tv123wam.txt create mode 100644 drivers/gpu/drm/bridge/ti-sn65dsi86.c -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project

5 13

(no subject)
by rosdi ablatiff 05 Jul '18

05 Jul '18

1 0

[PATCH] drm/sun4i: Implement zpos for DE2
by Jernej Skrabec 05 Jul '18

05 Jul '18

Initial implementation of DE2 planes only supported fixed zpos. Expand implementation with configurable zpos property. Signed-off-by: Jernej Skrabec <jernej.skrabec(a)siol.net> --- drivers/gpu/drm/sun4i/sun8i_mixer.c | 15 +++++++-- drivers/gpu/drm/sun4i/sun8i_mixer.h | 4 +++ drivers/gpu/drm/sun4i/sun8i_ui_layer.c | 45 ++++++++++++++++---------- drivers/gpu/drm/sun4i/sun8i_vi_layer.c | 45 ++++++++++++++++---------- 4 files changed, 72 insertions(+), 37 deletions(-) diff --git a/drivers/gpu/drm/sun4i/sun8i_mixer.c b/drivers/gpu/drm/sun4i/sun8i_mixer.c index ee8febb25903..0747a9a69654 100644 --- a/drivers/gpu/drm/sun4i/sun8i_mixer.c +++ b/drivers/gpu/drm/sun4i/sun8i_mixer.c @@ -260,6 +260,17 @@ const struct de2_fmt_info *sun8i_mixer_format_info(u32 format) return NULL; } +static void sun8i_mixer_atomic_begin(struct sunxi_engine *engine, + struct drm_crtc_state *old_state) +{ + /* + * Disable all pipes at the beginning. They will be enabled + * again if needed in plane update callback. + */ + regmap_update_bits(engine->regs, SUN8I_MIXER_BLEND_PIPE_CTL, + SUN8I_MIXER_BLEND_PIPE_CTL_EN_MSK, 0); +} + static void sun8i_mixer_commit(struct sunxi_engine *engine) { DRM_DEBUG_DRIVER("Committing changes\n"); @@ -311,6 +322,7 @@ static struct drm_plane **sun8i_layers_init(struct drm_device *drm, } static const struct sunxi_engine_ops sun8i_engine_ops = { + .atomic_begin = sun8i_mixer_atomic_begin, .commit = sun8i_mixer_commit, .layers_init = sun8i_layers_init, }; @@ -432,9 +444,6 @@ static int sun8i_mixer_bind(struct device *dev, struct device *master, regmap_write(mixer->engine.regs, SUN8I_MIXER_BLEND_ATTR_FCOLOR(0), SUN8I_MIXER_BLEND_COLOR_BLACK); - /* Fixed zpos for now */ - regmap_write(mixer->engine.regs, SUN8I_MIXER_BLEND_ROUTE, 0x43210); - plane_cnt = mixer->cfg->vi_num + mixer->cfg->ui_num; for (i = 0; i < plane_cnt; i++) regmap_write(mixer->engine.regs, SUN8I_MIXER_BLEND_MODE(i), diff --git a/drivers/gpu/drm/sun4i/sun8i_mixer.h b/drivers/gpu/drm/sun4i/sun8i_mixer.h index f34e70c42adf..406c42e752d7 100644 --- a/drivers/gpu/drm/sun4i/sun8i_mixer.h +++ b/drivers/gpu/drm/sun4i/sun8i_mixer.h @@ -44,6 +44,7 @@ #define SUN8I_MIXER_BLEND_CK_MIN(x) (0x10e0 + 0x04 * (x)) #define SUN8I_MIXER_BLEND_OUTCTL 0x10fc +#define SUN8I_MIXER_BLEND_PIPE_CTL_EN_MSK GENMASK(12, 8) #define SUN8I_MIXER_BLEND_PIPE_CTL_EN(pipe) BIT(8 + pipe) #define SUN8I_MIXER_BLEND_PIPE_CTL_FC_EN(pipe) BIT(pipe) /* colors are always in AARRGGBB format */ @@ -51,6 +52,9 @@ /* The following numbers are some still unknown magic numbers */ #define SUN8I_MIXER_BLEND_MODE_DEF 0x03010301 +#define SUN8I_MIXER_BLEND_ROUTE_PIPE_MSK(n) (0xf << ((n) << 2)) +#define SUN8I_MIXER_BLEND_ROUTE_PIPE_SHIFT(n) ((n) << 2) + #define SUN8I_MIXER_BLEND_OUTCTL_INTERLACED BIT(1) #define SUN8I_MIXER_FBFMT_ARGB8888 0 diff --git a/drivers/gpu/drm/sun4i/sun8i_ui_layer.c b/drivers/gpu/drm/sun4i/sun8i_ui_layer.c index 9a540330cb79..518e1921f47e 100644 --- a/drivers/gpu/drm/sun4i/sun8i_ui_layer.c +++ b/drivers/gpu/drm/sun4i/sun8i_ui_layer.c @@ -27,7 +27,7 @@ #include "sun8i_ui_scaler.h" static void sun8i_ui_layer_enable(struct sun8i_mixer *mixer, int channel, - int overlay, bool enable) + int overlay, bool enable, unsigned int zpos) { u32 val; @@ -43,18 +43,24 @@ static void sun8i_ui_layer_enable(struct sun8i_mixer *mixer, int channel, SUN8I_MIXER_CHAN_UI_LAYER_ATTR(channel, overlay), SUN8I_MIXER_CHAN_UI_LAYER_ATTR_EN, val); - if (enable) - val = SUN8I_MIXER_BLEND_PIPE_CTL_EN(channel); - else - val = 0; + if (enable) { + val = SUN8I_MIXER_BLEND_PIPE_CTL_EN(zpos); - regmap_update_bits(mixer->engine.regs, - SUN8I_MIXER_BLEND_PIPE_CTL, - SUN8I_MIXER_BLEND_PIPE_CTL_EN(channel), val); + regmap_update_bits(mixer->engine.regs, + SUN8I_MIXER_BLEND_PIPE_CTL, val, val); + + val = channel << SUN8I_MIXER_BLEND_ROUTE_PIPE_SHIFT(zpos); + + regmap_update_bits(mixer->engine.regs, + SUN8I_MIXER_BLEND_ROUTE, + SUN8I_MIXER_BLEND_ROUTE_PIPE_MSK(zpos), + val); + } } static int sun8i_ui_layer_update_coord(struct sun8i_mixer *mixer, int channel, - int overlay, struct drm_plane *plane) + int overlay, struct drm_plane *plane, + unsigned int zpos) { struct drm_plane_state *state = plane->state; u32 src_w, src_h, dst_w, dst_h; @@ -137,10 +143,10 @@ static int sun8i_ui_layer_update_coord(struct sun8i_mixer *mixer, int channel, state->dst.x1, state->dst.y1); DRM_DEBUG_DRIVER("Layer destination size W: %d H: %d\n", dst_w, dst_h); regmap_write(mixer->engine.regs, - SUN8I_MIXER_BLEND_ATTR_COORD(channel), + SUN8I_MIXER_BLEND_ATTR_COORD(zpos), SUN8I_MIXER_COORD(state->dst.x1, state->dst.y1)); regmap_write(mixer->engine.regs, - SUN8I_MIXER_BLEND_ATTR_INSIZE(channel), + SUN8I_MIXER_BLEND_ATTR_INSIZE(zpos), outsize); return 0; @@ -238,28 +244,30 @@ static void sun8i_ui_layer_atomic_disable(struct drm_plane *plane, struct sun8i_ui_layer *layer = plane_to_sun8i_ui_layer(plane); struct sun8i_mixer *mixer = layer->mixer; - sun8i_ui_layer_enable(mixer, layer->channel, layer->overlay, false); + sun8i_ui_layer_enable(mixer, layer->channel, layer->overlay, false, 0); } static void sun8i_ui_layer_atomic_update(struct drm_plane *plane, struct drm_plane_state *old_state) { struct sun8i_ui_layer *layer = plane_to_sun8i_ui_layer(plane); + unsigned int zpos = plane->state->normalized_zpos; struct sun8i_mixer *mixer = layer->mixer; if (!plane->state->visible) { sun8i_ui_layer_enable(mixer, layer->channel, - layer->overlay, false); + layer->overlay, false, 0); return; } sun8i_ui_layer_update_coord(mixer, layer->channel, - layer->overlay, plane); + layer->overlay, plane, zpos); sun8i_ui_layer_update_formats(mixer, layer->channel, layer->overlay, plane); sun8i_ui_layer_update_buffer(mixer, layer->channel, layer->overlay, plane); - sun8i_ui_layer_enable(mixer, layer->channel, layer->overlay, true); + sun8i_ui_layer_enable(mixer, layer->channel, layer->overlay, + true, zpos); } static struct drm_plane_helper_funcs sun8i_ui_layer_helper_funcs = { @@ -307,6 +315,7 @@ struct sun8i_ui_layer *sun8i_ui_layer_init_one(struct drm_device *drm, enum drm_plane_type type = DRM_PLANE_TYPE_OVERLAY; int channel = mixer->cfg->vi_num + index; struct sun8i_ui_layer *layer; + unsigned int plane_cnt; int ret; layer = devm_kzalloc(drm->dev, sizeof(*layer), GFP_KERNEL); @@ -327,8 +336,10 @@ struct sun8i_ui_layer *sun8i_ui_layer_init_one(struct drm_device *drm, return ERR_PTR(ret); } - /* fixed zpos for now */ - ret = drm_plane_create_zpos_immutable_property(&layer->plane, channel); + plane_cnt = mixer->cfg->ui_num + mixer->cfg->vi_num; + + ret = drm_plane_create_zpos_property(&layer->plane, channel, + 0, plane_cnt - 1); if (ret) { dev_err(drm->dev, "Couldn't add zpos property\n"); return ERR_PTR(ret); diff --git a/drivers/gpu/drm/sun4i/sun8i_vi_layer.c b/drivers/gpu/drm/sun4i/sun8i_vi_layer.c index 5877f8ef5895..17e0d00cfd8a 100644 --- a/drivers/gpu/drm/sun4i/sun8i_vi_layer.c +++ b/drivers/gpu/drm/sun4i/sun8i_vi_layer.c @@ -21,7 +21,7 @@ #include "sun8i_vi_scaler.h" static void sun8i_vi_layer_enable(struct sun8i_mixer *mixer, int channel, - int overlay, bool enable) + int overlay, bool enable, unsigned int zpos) { u32 val; @@ -37,18 +37,24 @@ static void sun8i_vi_layer_enable(struct sun8i_mixer *mixer, int channel, SUN8I_MIXER_CHAN_VI_LAYER_ATTR(channel, overlay), SUN8I_MIXER_CHAN_VI_LAYER_ATTR_EN, val); - if (enable) - val = SUN8I_MIXER_BLEND_PIPE_CTL_EN(channel); - else - val = 0; + if (enable) { + val = SUN8I_MIXER_BLEND_PIPE_CTL_EN(zpos); - regmap_update_bits(mixer->engine.regs, - SUN8I_MIXER_BLEND_PIPE_CTL, - SUN8I_MIXER_BLEND_PIPE_CTL_EN(channel), val); + regmap_update_bits(mixer->engine.regs, + SUN8I_MIXER_BLEND_PIPE_CTL, val, val); + + val = channel << SUN8I_MIXER_BLEND_ROUTE_PIPE_SHIFT(zpos); + + regmap_update_bits(mixer->engine.regs, + SUN8I_MIXER_BLEND_ROUTE, + SUN8I_MIXER_BLEND_ROUTE_PIPE_MSK(zpos), + val); + } } static int sun8i_vi_layer_update_coord(struct sun8i_mixer *mixer, int channel, - int overlay, struct drm_plane *plane) + int overlay, struct drm_plane *plane, + unsigned int zpos) { struct drm_plane_state *state = plane->state; const struct drm_format_info *format = state->fb->format; @@ -130,10 +136,10 @@ static int sun8i_vi_layer_update_coord(struct sun8i_mixer *mixer, int channel, state->dst.x1, state->dst.y1); DRM_DEBUG_DRIVER("Layer destination size W: %d H: %d\n", dst_w, dst_h); regmap_write(mixer->engine.regs, - SUN8I_MIXER_BLEND_ATTR_COORD(channel), + SUN8I_MIXER_BLEND_ATTR_COORD(zpos), SUN8I_MIXER_COORD(state->dst.x1, state->dst.y1)); regmap_write(mixer->engine.regs, - SUN8I_MIXER_BLEND_ATTR_INSIZE(channel), + SUN8I_MIXER_BLEND_ATTR_INSIZE(zpos), outsize); return 0; @@ -266,28 +272,30 @@ static void sun8i_vi_layer_atomic_disable(struct drm_plane *plane, struct sun8i_vi_layer *layer = plane_to_sun8i_vi_layer(plane); struct sun8i_mixer *mixer = layer->mixer; - sun8i_vi_layer_enable(mixer, layer->channel, layer->overlay, false); + sun8i_vi_layer_enable(mixer, layer->channel, layer->overlay, false, 0); } static void sun8i_vi_layer_atomic_update(struct drm_plane *plane, struct drm_plane_state *old_state) { struct sun8i_vi_layer *layer = plane_to_sun8i_vi_layer(plane); + unsigned int zpos = plane->state->normalized_zpos; struct sun8i_mixer *mixer = layer->mixer; if (!plane->state->visible) { sun8i_vi_layer_enable(mixer, layer->channel, - layer->overlay, false); + layer->overlay, false, 0); return; } sun8i_vi_layer_update_coord(mixer, layer->channel, - layer->overlay, plane); + layer->overlay, plane, zpos); sun8i_vi_layer_update_formats(mixer, layer->channel, layer->overlay, plane); sun8i_vi_layer_update_buffer(mixer, layer->channel, layer->overlay, plane); - sun8i_vi_layer_enable(mixer, layer->channel, layer->overlay, true); + sun8i_vi_layer_enable(mixer, layer->channel, layer->overlay, + true, zpos); } static struct drm_plane_helper_funcs sun8i_vi_layer_helper_funcs = { @@ -351,6 +359,7 @@ struct sun8i_vi_layer *sun8i_vi_layer_init_one(struct drm_device *drm, int index) { struct sun8i_vi_layer *layer; + unsigned int plane_cnt; int ret; layer = devm_kzalloc(drm->dev, sizeof(*layer), GFP_KERNEL); @@ -368,8 +377,10 @@ struct sun8i_vi_layer *sun8i_vi_layer_init_one(struct drm_device *drm, return ERR_PTR(ret); } - /* fixed zpos for now */ - ret = drm_plane_create_zpos_immutable_property(&layer->plane, index); + plane_cnt = mixer->cfg->ui_num + mixer->cfg->vi_num; + + ret = drm_plane_create_zpos_property(&layer->plane, index, + 0, plane_cnt - 1); if (ret) { dev_err(drm->dev, "Couldn't add zpos property\n"); return ERR_PTR(ret); -- 2.18.0

5 7

[PATCH v2] gpu: drm: omapdrm: Adding new typedef vm_fault_t
by Souptick Joarder 05 Jul '18

05 Jul '18

Use new return type vm_fault_t for fault handler. For now, this is just documenting that the function returns a VM_FAULT value rather than an errno. Once all instances are converted, vm_fault_t will become a distinct type. Ref-> commit 1c8f422059ae ("mm: change return type to vm_fault_t") Previously vm_insert_mixed() returns err which driver mapped into VM_FAULT_* type. Also return value of vm_insert_mixed() not handled correctly and 0 was returned inside fault_2d() as default. The new function vmf_insert_mixed() will replace this inefficiency by returning correct VM_FAULT_* type. vmf_error() is the newly introduce inline function in 4.17-rc6. Signed-off-by: Souptick Joarder <jrdr.linux(a)gmail.com> Reviewed-by: Matthew Wilcox <mawilcox(a)microsoft.com> --- v2: Fixed kbuild error by initialized ret in fault_2d(). drivers/gpu/drm/omapdrm/omap_gem.c | 51 +++++++++++++++++--------------------- drivers/gpu/drm/omapdrm/omap_gem.h | 3 ++- 2 files changed, 25 insertions(+), 29 deletions(-) diff --git a/drivers/gpu/drm/omapdrm/omap_gem.c b/drivers/gpu/drm/omapdrm/omap_gem.c index 0faf042..99e4300 100644 --- a/drivers/gpu/drm/omapdrm/omap_gem.c +++ b/drivers/gpu/drm/omapdrm/omap_gem.c @@ -371,7 +371,7 @@ size_t omap_gem_mmap_size(struct drm_gem_object *obj) */ /* Normal handling for the case of faulting in non-tiled buffers */ -static int fault_1d(struct drm_gem_object *obj, +static vm_fault_t fault_1d(struct drm_gem_object *obj, struct vm_area_struct *vma, struct vm_fault *vmf) { struct omap_gem_object *omap_obj = to_omap_bo(obj); @@ -392,11 +392,12 @@ static int fault_1d(struct drm_gem_object *obj, VERB("Inserting %p pfn %lx, pa %lx", (void *)vmf->address, pfn, pfn << PAGE_SHIFT); - return vm_insert_mixed(vma, vmf->address, __pfn_to_pfn_t(pfn, PFN_DEV)); + return vmf_insert_mixed(vma, vmf->address, + __pfn_to_pfn_t(pfn, PFN_DEV)); } /* Special handling for the case of faulting in 2d tiled buffers */ -static int fault_2d(struct drm_gem_object *obj, +static vm_fault_t fault_2d(struct drm_gem_object *obj, struct vm_area_struct *vma, struct vm_fault *vmf) { struct omap_gem_object *omap_obj = to_omap_bo(obj); @@ -407,7 +408,8 @@ static int fault_2d(struct drm_gem_object *obj, unsigned long pfn; pgoff_t pgoff, base_pgoff; unsigned long vaddr; - int i, ret, slots; + int i, err, slots; + vm_fault_t ret = VM_FAULT_NOPAGE; /* * Note the height of the slot is also equal to the number of pages @@ -473,9 +475,10 @@ static int fault_2d(struct drm_gem_object *obj, memset(pages + slots, 0, sizeof(struct page *) * (n - slots)); - ret = tiler_pin(entry->block, pages, ARRAY_SIZE(pages), 0, true); - if (ret) { - dev_err(obj->dev->dev, "failed to pin: %d\n", ret); + err = tiler_pin(entry->block, pages, ARRAY_SIZE(pages), 0, true); + if (err) { + ret = vmf_error(err); + dev_err(obj->dev->dev, "failed to pin: %d\n", err); return ret; } @@ -485,7 +488,10 @@ static int fault_2d(struct drm_gem_object *obj, pfn, pfn << PAGE_SHIFT); for (i = n; i > 0; i--) { - vm_insert_mixed(vma, vaddr, __pfn_to_pfn_t(pfn, PFN_DEV)); + ret = vmf_insert_mixed(vma, + vaddr, __pfn_to_pfn_t(pfn, PFN_DEV)); + if (ret & VM_FAULT_ERROR) + break; pfn += priv->usergart[fmt].stride_pfn; vaddr += PAGE_SIZE * m; } @@ -494,7 +500,7 @@ static int fault_2d(struct drm_gem_object *obj, priv->usergart[fmt].last = (priv->usergart[fmt].last + 1) % NUM_USERGART_ENTRIES; - return 0; + return ret; } /** @@ -509,14 +515,15 @@ static int fault_2d(struct drm_gem_object *obj, * vma->vm_private_data points to the GEM object that is backing this * mapping. */ -int omap_gem_fault(struct vm_fault *vmf) +vm_fault_t omap_gem_fault(struct vm_fault *vmf) { struct vm_area_struct *vma = vmf->vma; struct drm_gem_object *obj = vma->vm_private_data; struct omap_gem_object *omap_obj = to_omap_bo(obj); struct drm_device *dev = obj->dev; struct page **pages; - int ret; + int err; + vm_fault_t ret; /* Make sure we don't parallel update on a fault, nor move or remove * something from beneath our feet @@ -524,9 +531,11 @@ int omap_gem_fault(struct vm_fault *vmf) mutex_lock(&dev->struct_mutex); /* if a shmem backed object, make sure we have pages attached now */ - ret = get_pages(obj, &pages); - if (ret) + err = get_pages(obj, &pages); + if (err) { + ret = vmf_error(err); goto fail; + } /* where should we do corresponding put_pages().. we are mapping * the original page, rather than thru a GART, so we can't rely @@ -542,21 +551,7 @@ int omap_gem_fault(struct vm_fault *vmf) fail: mutex_unlock(&dev->struct_mutex); - switch (ret) { - case 0: - case -ERESTARTSYS: - case -EINTR: - case -EBUSY: - /* - * EBUSY is ok: this just means that another thread - * already did the job. - */ - return VM_FAULT_NOPAGE; - case -ENOMEM: - return VM_FAULT_OOM; - default: - return VM_FAULT_SIGBUS; - } + return ret; } /** We override mainly to fix up some of the vm mapping flags.. */ diff --git a/drivers/gpu/drm/omapdrm/omap_gem.h b/drivers/gpu/drm/omapdrm/omap_gem.h index a78bde0..c1c45fb 100644 --- a/drivers/gpu/drm/omapdrm/omap_gem.h +++ b/drivers/gpu/drm/omapdrm/omap_gem.h @@ -21,6 +21,7 @@ #define __OMAPDRM_GEM_H__ #include <linux/types.h> +#include <linux/mm_types.h> enum dma_data_direction; @@ -80,7 +81,7 @@ struct dma_buf *omap_gem_prime_export(struct drm_device *dev, struct drm_gem_object *omap_gem_prime_import(struct drm_device *dev, struct dma_buf *buffer); -int omap_gem_fault(struct vm_fault *vmf); +vm_fault_t omap_gem_fault(struct vm_fault *vmf); int omap_gem_roll(struct drm_gem_object *obj, u32 roll); void omap_gem_cpu_sync_page(struct drm_gem_object *obj, int pgoff); void omap_gem_dma_sync_buffer(struct drm_gem_object *obj, -- 1.9.1

2 5

[PULL] drm-misc-next
by Gustavo Padovan 04 Jul '18

04 Jul '18

Hi Dave, Nothing really big just a bunch improvements and a few fixes for Core and Drivers. We have a cross subsystem merge here for fbcon. Regards, Gustavo drm-misc-next-2018-07-04: drm-misc-next for 4.19: UAPI Changes: v3d: add fourcc modicfier for fourcc for the Broadcom UIF format (Eric Anholt) Cross-subsystem Changes: console/fbcon: Add support for deferred console takeover (Hans de Goede) Core Changes: dma-fence clean up, improvements and docs (Daniel Vetter) add mask function for crtc, plane, encoder and connector DRM objects(Ville Syrjälä) Driver Changes: pl111: add Nomadik LCDC variant (Linus Walleij) The following changes since commit eab976693153b9854bfa83d131374748f6ca4280: Merge tag 'drm-misc-next-2018-06-27' of git://anongit.freedesktop.org/drm/drm-misc into drm-next (2018-06-28 13:29:07 +1000) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-next-2018-07-04 for you to fetch changes up to 968d72e6a5105a18fe17c0a8b4ef2951d0eb42dd: drm/savage: off by one in savage_bci_cmdbuf() (2018-07-04 14:27:01 +0200) ---------------------------------------------------------------- drm-misc-next for 4.19: UAPI Changes: v3d: add fourcc modicfier for fourcc for the Broadcom UIF format (Eric Anholt) Cross-subsystem Changes: console/fbcon: Add support for deferred console takeover (Hans de Goede) Core Changes: dma-fence clean up, improvements and docs (Daniel Vetter) add mask function for crtc, plane, encoder and connector DRM objects(Ville Syrjälä) Driver Changes: pl111: add Nomadik LCDC variant (Linus Walleij) ---------------------------------------------------------------- Dan Carpenter (3): drm/i810: off by one in i810_dma_vertex() drm/vgem: off by one in vgem_gem_fault() drm/savage: off by one in savage_bci_cmdbuf() Daniel Vetter (12): dma-fence: remove fill_driver_data callback dma-fence: Make ->enable_signaling optional dma-fence: Allow wait_any_timeout for all fences drm: Fix hdmi connector content type property docs dma-fence: Make ->wait callback optional drm/amdgpu: Remove unecessary dma_fence_ops drm: Remove unecessary dma_fence_ops drm/etnaviv: Remove unecessary dma_fence_ops drm/qxl: Remove unecessary dma_fence_ops drm/vc4: Remove unecessary dma_fence_ops drm/virtio: Remove unecessary dma_fence_ops dma-fence: Polish kernel-doc for dma-fence.c Dirk Hohndel (VMware) (5): drm: add SPDX idenitifier and clarify license drm: add SPDX identifier and clarify license drm/noveau: add SPDX identifier and clarify license drm/vmwgfx: add SPDX idenitifier and clarify license drm/vmwgfx: add SPDX idenitifier and clarify license Eric Anholt (2): drm/v3d: Define the fourcc modifier for the Broadcom UIF format. drm/vc4: Make DSI call into the bridge after the DSI link is enabled. Gustavo Padovan (2): Merge tag 'ib-fbdev-drm-v4.19-deferred-console-takeover' of https://github.com/bzolnier/linux into drm-misc-next Merge tag 'ib-fbdev-drm-v4.19-deferred-console-takeover-fixup' of https://github.com/bzolnier/linux into drm-misc-next Hans de Goede (4): printk: Export is_console_locked fbcon: Call WARN_CONSOLE_UNLOCKED() where applicable console/fbcon: Add support for deferred console takeover console: dummycon: export dummycon_[un]register_output_notifier Linus Walleij (1): drm/pl111: Support Nomadik LCDC variant Russell King (1): drm: add missing ctx argument to plane transitional helpers Ville Syrjälä (10): drm/atomic-helper: Use old/new state in drm_atomic_helper_commit_planes_on_crtc() drm: Add drm_plane_mask() drm: Use drm_crtc_mask() drm: Add drm_encoder_mask() drm: Add drm_connector_mask() drm/i915: Use drm_plane_mask() & co. drm/imx: Use drm_plane_mask() drm/sun4i: Use drm_crtc_mask() drm/vc4: Use drm_crtc_mask() drm/vmwgfx: Use drm_plane_mask() & co. Documentation/admin-guide/pm/intel_pstate.rst | 2 +- Documentation/core-api/kernel-api.rst | 2 +- Documentation/driver-api/dma-buf.rst | 6 + Documentation/driver-api/infrastructure.rst | 4 +- Documentation/fb/fbcon.txt | 7 + Documentation/filesystems/cifs/AUTHORS | 7 +- Documentation/filesystems/cifs/CHANGES | 3 + Documentation/filesystems/cifs/TODO | 17 +- Documentation/gpu/drm-kms.rst | 2 +- Documentation/trace/histogram.txt | 23 +- Documentation/virtual/kvm/api.txt | 2 +- MAINTAINERS | 24 +- Makefile | 2 +- arch/alpha/Kconfig | 5 - arch/alpha/lib/Makefile | 2 - arch/alpha/lib/dec_and_lock.c | 44 -- arch/arm/kernel/signal.c | 4 +- arch/arm/xen/enlighten.c | 7 +- arch/arm64/crypto/aes-glue.c | 2 +- arch/arm64/include/asm/kvm_host.h | 1 + arch/arm64/include/asm/sysreg.h | 11 + arch/arm64/kernel/cpufeature.c | 2 +- arch/arm64/kernel/smp.c | 2 +- arch/arm64/kvm/fpsimd.c | 36 +- arch/arm64/mm/dma-mapping.c | 9 +- arch/arm64/mm/proc.S | 5 +- arch/mips/Kconfig | 1 + arch/mips/ath79/mach-pb44.c | 2 +- arch/mips/bcm47xx/setup.c | 6 + arch/mips/include/asm/io.h | 2 + arch/mips/include/asm/mipsregs.h | 3 + arch/mips/include/uapi/asm/unistd.h | 18 +- arch/mips/kernel/entry.S | 8 + arch/mips/kernel/mcount.S | 27 +- arch/mips/kernel/scall32-o32.S | 2 + arch/mips/kernel/scall64-64.S | 2 + arch/mips/kernel/scall64-n32.S | 2 + arch/mips/kernel/scall64-o32.S | 2 + arch/mips/kernel/signal.c | 3 + arch/powerpc/Makefile | 1 + arch/powerpc/include/asm/book3s/32/pgalloc.h | 1 + arch/powerpc/include/asm/book3s/64/pgtable-4k.h | 21 + arch/powerpc/include/asm/book3s/64/pgtable-64k.h | 9 + arch/powerpc/include/asm/book3s/64/pgtable.h | 5 + arch/powerpc/include/asm/nmi.h | 2 +- arch/powerpc/include/asm/nohash/32/pgalloc.h | 1 + arch/powerpc/include/asm/nohash/64/pgalloc.h | 1 + arch/powerpc/kernel/dt_cpu_ftrs.c | 3 +- arch/powerpc/kernel/setup-common.c | 12 +- arch/powerpc/kernel/setup_64.c | 8 + arch/powerpc/kernel/signal.c | 4 +- arch/powerpc/kernel/smp.c | 6 - arch/powerpc/kernel/stacktrace.c | 4 +- arch/powerpc/mm/hugetlbpage.c | 3 +- arch/powerpc/mm/pgtable-book3s64.c | 12 + arch/powerpc/mm/tlb-radix.c | 98 ++- arch/s390/include/asm/css_chars.h | 62 +- arch/x86/Makefile | 6 - arch/x86/boot/compressed/eboot.c | 2 +- arch/x86/entry/common.c | 2 +- arch/x86/include/asm/barrier.h | 2 +- arch/x86/include/asm/vmx.h | 3 + arch/x86/kernel/apic/x2apic_uv_x.c | 60 +- arch/x86/kernel/cpu/bugs.c | 4 + arch/x86/kernel/cpu/cacheinfo.c | 2 +- arch/x86/kernel/cpu/common.c | 3 + arch/x86/kernel/cpu/mcheck/mce-severity.c | 5 + arch/x86/kernel/cpu/mcheck/mce.c | 44 +- arch/x86/kernel/cpu/microcode/intel.c | 5 +- arch/x86/kernel/head64.c | 2 +- arch/x86/kernel/quirks.c | 11 +- arch/x86/kernel/signal.c | 2 +- arch/x86/kernel/traps.c | 14 +- arch/x86/kernel/uprobes.c | 2 +- arch/x86/kvm/vmx.c | 67 ++ arch/x86/kvm/x86.h | 9 + arch/x86/mm/init_64.c | 20 +- arch/x86/xen/enlighten.c | 7 + arch/x86/xen/enlighten_pv.c | 1 + arch/x86/xen/enlighten_pvh.c | 1 + arch/x86/xen/smp_pv.c | 5 + block/bio.c | 3 - block/blk-core.c | 8 +- block/blk-mq-debugfs.c | 2 +- block/blk-mq.c | 1 - block/blk-softirq.c | 1 + block/blk-timeout.c | 1 + block/sed-opal.c | 4 +- crypto/morus640.c | 3 +- crypto/sha3_generic.c | 2 +- drivers/acpi/acpi_lpss.c | 18 +- drivers/acpi/ec.c | 20 + drivers/base/Makefile | 3 - drivers/base/core.c | 15 +- drivers/block/nbd.c | 42 +- drivers/block/null_blk.c | 2 +- drivers/bluetooth/hci_nokia.c | 2 +- drivers/char/hw_random/core.c | 11 +- drivers/clocksource/timer-stm32.c | 4 +- drivers/cpufreq/intel_pstate.c | 27 +- drivers/cpufreq/qcom-cpufreq-kryo.c | 25 +- drivers/crypto/chelsio/chtls/chtls_io.c | 5 +- drivers/dma-buf/dma-fence-array.c | 1 - drivers/dma-buf/dma-fence.c | 167 +++-- drivers/dma-buf/sw_sync.c | 1 - drivers/firmware/dmi-id.c | 2 + drivers/firmware/dmi_scan.c | 1 + drivers/firmware/efi/libstub/tpm.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_fence.c | 2 - drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 10 +- drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 1 - drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 24 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 14 +- drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 39 +- .../gpu/drm/amd/powerplay/hwmgr/vega10_powertune.c | 2 +- drivers/gpu/drm/arc/arcpgu_crtc.c | 2 +- drivers/gpu/drm/arm/hdlcd_crtc.c | 2 +- drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 2 +- drivers/gpu/drm/bridge/sil-sii8620.c | 309 ++++----- drivers/gpu/drm/drm_atomic.c | 10 +- drivers/gpu/drm/drm_atomic_helper.c | 25 +- drivers/gpu/drm/drm_connector.c | 4 +- drivers/gpu/drm/drm_crtc.c | 11 +- drivers/gpu/drm/drm_drv.c | 14 +- drivers/gpu/drm/drm_framebuffer.c | 2 +- drivers/gpu/drm/drm_global.c | 2 +- drivers/gpu/drm/drm_plane_helper.c | 8 +- drivers/gpu/drm/drm_simple_kms_helper.c | 4 +- drivers/gpu/drm/drm_syncobj.c | 1 - drivers/gpu/drm/drm_vma_manager.c | 1 + drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 7 - drivers/gpu/drm/i810/i810_dma.c | 2 +- drivers/gpu/drm/i915/intel_display.c | 14 +- drivers/gpu/drm/i915/intel_display.h | 4 +- drivers/gpu/drm/i915/intel_dpll_mgr.c | 6 +- drivers/gpu/drm/imx/ipuv3-crtc.c | 2 +- drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c | 2 +- drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c | 2 +- drivers/gpu/drm/nouveau/dispnv50/curs507a.c | 2 +- drivers/gpu/drm/nouveau/dispnv50/wndw.c | 13 +- drivers/gpu/drm/nouveau/nouveau_ttm.c | 3 +- drivers/gpu/drm/pl111/Makefile | 1 + drivers/gpu/drm/pl111/pl111_display.c | 54 +- drivers/gpu/drm/pl111/pl111_drm.h | 5 + drivers/gpu/drm/pl111/pl111_drv.c | 44 +- drivers/gpu/drm/pl111/pl111_nomadik.c | 36 + drivers/gpu/drm/pl111/pl111_nomadik.h | 18 + drivers/gpu/drm/qxl/qxl_display.c | 7 +- drivers/gpu/drm/qxl/qxl_release.c | 7 - drivers/gpu/drm/savage/savage_state.c | 2 +- drivers/gpu/drm/scheduler/sched_fence.c | 11 - drivers/gpu/drm/sti/sti_cursor.c | 2 +- drivers/gpu/drm/sti/sti_gdp.c | 2 +- drivers/gpu/drm/sti/sti_hqvdp.c | 2 +- drivers/gpu/drm/sun4i/sun4i_crtc.c | 2 +- drivers/gpu/drm/sun4i/sun4i_lvds.c | 2 +- drivers/gpu/drm/sun4i/sun4i_rgb.c | 2 +- drivers/gpu/drm/sun4i/sun4i_tcon.c | 25 - drivers/gpu/drm/vc4/vc4_crtc.c | 6 +- drivers/gpu/drm/vc4/vc4_dsi.c | 42 +- drivers/gpu/drm/vc4/vc4_fence.c | 8 - drivers/gpu/drm/vc4/vc4_plane.c | 2 +- drivers/gpu/drm/vgem/vgem_drv.c | 2 +- drivers/gpu/drm/virtio/virtgpu_fence.c | 7 - drivers/gpu/drm/vmwgfx/Kconfig | 1 + .../gpu/drm/vmwgfx/device_include/svga3d_caps.h | 3 +- drivers/gpu/drm/vmwgfx/device_include/svga3d_cmd.h | 3 +- .../gpu/drm/vmwgfx/device_include/svga3d_devcaps.h | 3 +- drivers/gpu/drm/vmwgfx/device_include/svga3d_dx.h | 3 +- .../gpu/drm/vmwgfx/device_include/svga3d_limits.h | 3 +- drivers/gpu/drm/vmwgfx/device_include/svga3d_reg.h | 3 +- .../drm/vmwgfx/device_include/svga3d_surfacedefs.h | 4 +- .../gpu/drm/vmwgfx/device_include/svga3d_types.h | 3 +- .../gpu/drm/vmwgfx/device_include/svga_escape.h | 3 +- .../gpu/drm/vmwgfx/device_include/svga_overlay.h | 3 +- drivers/gpu/drm/vmwgfx/device_include/svga_reg.h | 3 +- drivers/gpu/drm/vmwgfx/device_include/svga_types.h | 3 +- .../drm/vmwgfx/device_include/vmware_pack_begin.h | 25 +- .../drm/vmwgfx/device_include/vmware_pack_end.h | 25 +- drivers/gpu/drm/vmwgfx/vmwgfx_binding.c | 4 +- drivers/gpu/drm/vmwgfx/vmwgfx_binding.h | 4 +- drivers/gpu/drm/vmwgfx/vmwgfx_blit.c | 3 +- drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c | 4 +- drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c | 4 +- drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c | 4 +- drivers/gpu/drm/vmwgfx/vmwgfx_context.c | 4 +- drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c | 4 +- drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c | 4 +- drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 4 +- drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 4 +- drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 4 +- drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 4 +- drivers/gpu/drm/vmwgfx/vmwgfx_fence.h | 4 +- drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c | 4 +- drivers/gpu/drm/vmwgfx/vmwgfx_gmr.c | 4 +- drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c | 4 +- drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c | 4 +- drivers/gpu/drm/vmwgfx/vmwgfx_irq.c | 4 +- drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 8 +- drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 4 +- drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 4 +- drivers/gpu/drm/vmwgfx/vmwgfx_marker.c | 4 +- drivers/gpu/drm/vmwgfx/vmwgfx_mob.c | 4 +- drivers/gpu/drm/vmwgfx/vmwgfx_msg.c | 4 +- drivers/gpu/drm/vmwgfx/vmwgfx_msg.h | 35 +- drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c | 4 +- drivers/gpu/drm/vmwgfx/vmwgfx_prime.c | 4 +- drivers/gpu/drm/vmwgfx/vmwgfx_reg.h | 4 +- drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 4 +- drivers/gpu/drm/vmwgfx/vmwgfx_resource_priv.h | 4 +- drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 4 +- drivers/gpu/drm/vmwgfx/vmwgfx_shader.c | 4 +- drivers/gpu/drm/vmwgfx/vmwgfx_simple_resource.c | 4 +- drivers/gpu/drm/vmwgfx/vmwgfx_so.c | 4 +- drivers/gpu/drm/vmwgfx/vmwgfx_so.h | 4 +- drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 4 +- drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 4 +- drivers/gpu/drm/vmwgfx/vmwgfx_ttm_glue.c | 4 +- drivers/gpu/drm/vmwgfx/vmwgfx_va.c | 4 +- drivers/gpu/drm/zte/zx_plane.c | 2 +- drivers/hid/hid-google-hammer.c | 2 + drivers/hid/hid-ids.h | 1 + drivers/hid/hid-steam.c | 10 +- drivers/hid/intel-ish-hid/ipc/pci-ish.c | 22 +- drivers/hid/wacom_sys.c | 8 + drivers/hwmon/dell-smm-hwmon.c | 7 + drivers/hwmon/nct6775.c | 2 +- drivers/infiniband/core/uverbs_main.c | 14 +- drivers/infiniband/core/verbs.c | 14 +- drivers/infiniband/hw/mlx4/mr.c | 7 +- drivers/infiniband/hw/mlx5/main.c | 36 +- drivers/infiniband/hw/qedr/verbs.c | 3 + drivers/infiniband/sw/rxe/rxe_req.c | 5 +- drivers/irqchip/irq-gic-v2m.c | 2 +- drivers/irqchip/irq-gic-v3-its.c | 62 +- drivers/irqchip/irq-ls-scfg-msi.c | 10 +- drivers/lightnvm/Kconfig | 2 +- drivers/net/ethernet/cisco/enic/enic_clsf.c | 3 +- drivers/net/ethernet/cisco/enic/enic_main.c | 12 +- drivers/net/ethernet/faraday/ftgmac100.c | 4 +- drivers/net/ethernet/intel/i40e/i40e_txrx.c | 7 +- drivers/net/ethernet/qlogic/qed/qed_dcbx.c | 11 +- drivers/net/ethernet/qlogic/qed/qed_ll2.c | 11 +- drivers/net/ethernet/qlogic/qed/qed_main.c | 12 +- drivers/net/ethernet/stmicro/stmmac/Kconfig | 2 +- .../net/ethernet/stmicro/stmmac/dwmac-socfpga.c | 18 +- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 10 + drivers/net/ethernet/sun/sungem.c | 22 +- drivers/net/ethernet/ti/davinci_emac.c | 15 +- drivers/net/hamradio/bpqether.c | 8 +- drivers/net/ipvlan/ipvlan_main.c | 1 + drivers/net/net_failover.c | 2 +- drivers/net/usb/cdc_ncm.c | 3 +- drivers/nvme/host/core.c | 1 + drivers/nvme/host/fc.c | 6 +- drivers/nvme/host/nvme.h | 1 + drivers/nvme/host/pci.c | 44 +- drivers/nvme/host/rdma.c | 73 ++- drivers/nvme/target/core.c | 8 + drivers/opp/core.c | 2 +- drivers/pinctrl/actions/pinctrl-owl.c | 2 +- drivers/pinctrl/devicetree.c | 7 +- drivers/pinctrl/mediatek/pinctrl-mt7622.c | 6 +- drivers/pinctrl/mediatek/pinctrl-mtk-common.c | 5 - drivers/pinctrl/pinctrl-single.c | 14 +- drivers/ptp/ptp_chardev.c | 4 +- drivers/ptp/ptp_qoriq.c | 2 +- drivers/s390/block/dasd.c | 171 ++--- drivers/s390/block/dasd_alias.c | 6 +- drivers/s390/block/dasd_diag.c | 3 +- drivers/s390/block/dasd_eckd.c | 46 +- drivers/s390/block/dasd_eer.c | 10 +- drivers/s390/block/dasd_fba.c | 6 +- drivers/s390/block/dasd_int.h | 26 +- drivers/s390/cio/Makefile | 1 + drivers/s390/cio/vfio_ccw_cp.c | 140 ++-- drivers/s390/cio/vfio_ccw_drv.c | 5 +- drivers/s390/cio/vfio_ccw_fsm.c | 17 +- drivers/s390/cio/vfio_ccw_trace.h | 54 ++ drivers/scsi/scsi_transport_fc.c | 2 +- drivers/scsi/xen-scsifront.c | 33 +- drivers/video/console/Kconfig | 11 + drivers/video/console/dummycon.c | 69 +- drivers/video/fbdev/core/fbcon.c | 83 +++ drivers/xen/Makefile | 2 +- drivers/xen/events/events_base.c | 2 - drivers/xen/grant-table.c | 4 +- drivers/xen/manage.c | 18 +- drivers/xen/privcmd-buf.c | 210 ++++++ drivers/xen/privcmd.c | 9 + drivers/xen/privcmd.h | 3 + drivers/xen/xen-scsiback.c | 16 +- fs/cifs/cifs_debug.c | 29 + fs/cifs/cifsencrypt.c | 20 +- fs/cifs/cifsglob.h | 40 +- fs/cifs/cifsproto.h | 7 +- fs/cifs/cifssmb.c | 8 +- fs/cifs/connect.c | 8 +- fs/cifs/inode.c | 13 +- fs/cifs/misc.c | 9 +- fs/cifs/smb2misc.c | 19 +- fs/cifs/smb2ops.c | 277 ++++++-- fs/cifs/smb2pdu.c | 333 ++++++++-- fs/cifs/smb2pdu.h | 23 +- fs/cifs/smb2proto.h | 6 + fs/cifs/smb2transport.c | 18 +- fs/cifs/smbdirect.c | 19 +- fs/cifs/trace.h | 3 +- fs/cifs/transport.c | 173 +++-- fs/ext2/ext2.h | 2 - fs/ext2/super.c | 6 +- fs/jfs/xattr.c | 10 +- fs/nfs/delegation.c | 4 +- fs/nfs/flexfilelayout/flexfilelayout.c | 21 +- fs/nfs/nfs4proc.c | 33 +- fs/nfs/pnfs.h | 5 + fs/proc/base.c | 28 +- fs/quota/dquot.c | 7 +- fs/udf/balloc.c | 5 +- fs/udf/directory.c | 8 +- fs/udf/inode.c | 8 +- fs/udf/namei.c | 14 +- fs/udf/udfdecl.h | 9 +- include/acpi/processor.h | 3 +- include/asm-generic/qspinlock_types.h | 2 +- include/drm/drm_connector.h | 8 +- include/drm/drm_encoder.h | 16 +- include/drm/drm_plane.h | 14 +- include/drm/drm_plane_helper.h | 6 +- include/linux/atmdev.h | 15 + include/linux/backing-dev-defs.h | 2 +- include/linux/bpf.h | 12 + include/linux/console.h | 5 + include/linux/dma-contiguous.h | 2 +- include/linux/dma-fence.h | 32 +- include/linux/filter.h | 79 ++- include/linux/irq.h | 1 + include/linux/irqdesc.h | 5 - include/linux/kernel.h | 2 +- include/linux/memory.h | 1 + include/linux/mod_devicetable.h | 1 + include/linux/nfs_xdr.h | 2 + include/linux/refcount.h | 4 +- include/linux/sched.h | 23 +- include/linux/spinlock.h | 5 + include/net/ip6_fib.h | 5 +- include/rdma/ib_verbs.h | 13 +- include/uapi/drm/drm_fourcc.h | 21 + include/uapi/linux/nbd.h | 3 + include/xen/xen.h | 6 +- init/Kconfig | 4 - kernel/Makefile | 1 + kernel/bpf/core.c | 69 +- kernel/bpf/devmap.c | 14 + kernel/bpf/syscall.c | 12 +- kernel/dma/Kconfig | 50 ++ kernel/dma/Makefile | 11 + .../base/dma-coherent.c => kernel/dma/coherent.c | 0 .../dma-contiguous.c => kernel/dma/contiguous.c | 0 lib/dma-debug.c => kernel/dma/debug.c | 0 lib/dma-direct.c => kernel/dma/direct.c | 0 drivers/base/dma-mapping.c => kernel/dma/mapping.c | 2 +- lib/dma-noncoherent.c => kernel/dma/noncoherent.c | 0 {lib => kernel/dma}/swiotlb.c | 0 lib/dma-virt.c => kernel/dma/virt.c | 2 - kernel/events/ring_buffer.c | 6 +- kernel/irq/debugfs.c | 1 + kernel/locking/lockdep.c | 12 +- kernel/locking/rwsem.c | 1 + kernel/printk/printk.c | 1 + kernel/rseq.c | 7 +- kernel/softirq.c | 6 +- kernel/time/hrtimer.c | 2 +- kernel/time/posix-cpu-timers.c | 2 - kernel/time/time.c | 6 +- kernel/trace/trace.c | 6 +- kernel/trace/trace_events_filter.c | 10 +- lib/Kconfig | 47 +- lib/Makefile | 12 +- lib/dec_and_lock.c | 16 + lib/refcount.c | 28 + mm/backing-dev.c | 20 +- mm/memblock.c | 1 - net/atm/br2684.c | 3 +- net/atm/clip.c | 3 +- net/atm/common.c | 3 +- net/atm/lec.c | 3 +- net/atm/mpc.c | 3 +- net/atm/pppoatm.c | 3 +- net/atm/raw.c | 4 +- net/bpfilter/.gitignore | 1 + net/bpfilter/Makefile | 6 +- net/core/dev.c | 4 +- net/core/filter.c | 21 +- net/ipv4/inet_hashtables.c | 4 +- net/ipv4/ip_output.c | 3 +- net/ipv6/inet6_hashtables.c | 4 +- net/ipv6/ip6_fib.c | 5 +- net/ipv6/ip6_output.c | 3 +- net/ncsi/ncsi-aen.c | 10 +- net/ncsi/ncsi-manage.c | 49 +- net/sched/act_ife.c | 12 +- net/sched/sch_blackhole.c | 2 +- net/sunrpc/xprt.c | 10 +- net/xdp/xsk.c | 3 + scripts/Makefile.build | 2 +- tools/bpf/bpftool/perf.c | 5 +- tools/bpf/bpftool/prog.c | 4 +- tools/objtool/check.c | 1 + tools/perf/Documentation/perf-stat.txt | 3 + tools/perf/builtin-c2c.c | 10 +- tools/perf/builtin-script.c | 12 + tools/perf/builtin-stat.c | 48 +- tools/perf/ui/gtk/hists.c | 2 +- tools/perf/util/hist.c | 12 +- tools/perf/util/hist.h | 4 +- tools/perf/util/parse-events.y | 5 + tools/perf/util/sort.h | 4 +- tools/power/x86/turbostat/turbostat.8 | 2 +- tools/power/x86/turbostat/turbostat.c | 240 ++++--- tools/testing/selftests/bpf/config | 10 + tools/testing/selftests/bpf/test_offload.py | 12 +- tools/testing/selftests/bpf/test_tunnel.sh | 26 +- .../selftests/pstore/pstore_post_reboot_tests | 5 +- tools/testing/selftests/rseq/param_test.c | 24 + tools/testing/selftests/rseq/rseq-arm.h | 1 + tools/testing/selftests/rseq/rseq-mips.h | 725 +++++++++++++++++++++ tools/testing/selftests/rseq/rseq.h | 2 + tools/testing/selftests/rseq/run_param_test.sh | 0 tools/testing/selftests/sparc64/Makefile | 20 +- tools/testing/selftests/sparc64/drivers/Makefile | 2 +- .../selftests/static_keys/test_static_keys.sh | 13 + tools/testing/selftests/sync/config | 4 + tools/testing/selftests/sysctl/sysctl.sh | 20 +- tools/testing/selftests/user/test_user_copy.sh | 7 + tools/testing/selftests/vm/compaction_test.c | 4 +- tools/testing/selftests/vm/mlock2-tests.c | 12 +- tools/testing/selftests/vm/run_vmtests | 5 +- tools/testing/selftests/vm/userfaultfd.c | 4 +- tools/testing/selftests/zram/zram.sh | 5 +- tools/testing/selftests/zram/zram_lib.sh | 5 +- virt/kvm/Kconfig | 2 +- virt/kvm/arm/mmu.c | 2 + virt/kvm/arm/vgic/vgic-v3.c | 5 - virt/kvm/kvm_main.c | 19 +- 447 files changed, 4934 insertions(+), 2121 deletions(-) delete mode 100644 arch/alpha/lib/dec_and_lock.c create mode 100644 drivers/gpu/drm/pl111/pl111_nomadik.c create mode 100644 drivers/gpu/drm/pl111/pl111_nomadik.h create mode 100644 drivers/s390/cio/vfio_ccw_trace.h create mode 100644 drivers/xen/privcmd-buf.c create mode 100644 kernel/dma/Kconfig create mode 100644 kernel/dma/Makefile rename drivers/base/dma-coherent.c => kernel/dma/coherent.c (100%) rename drivers/base/dma-contiguous.c => kernel/dma/contiguous.c (100%) rename lib/dma-debug.c => kernel/dma/debug.c (100%) rename lib/dma-direct.c => kernel/dma/direct.c (100%) rename drivers/base/dma-mapping.c => kernel/dma/mapping.c (99%) rename lib/dma-noncoherent.c => kernel/dma/noncoherent.c (100%) rename {lib => kernel/dma}/swiotlb.c (100%) rename lib/dma-virt.c => kernel/dma/virt.c (98%) create mode 100644 net/bpfilter/.gitignore create mode 100644 tools/testing/selftests/rseq/rseq-mips.h mode change 100644 => 100755 tools/testing/selftests/rseq/run_param_test.sh create mode 100644 tools/testing/selftests/sync/config

1 0

[PATCH RFC] drm: add broadcast rgb connector property for digital outputs
by Russell King 04 Jul '18

04 Jul '18

Add core DRM support for the i915 "Broadcast RGB" property, which controls the selection of the RGB quantization range in the digital domain. For 8bpc, this selects between limited (16 to 235), full (0 to 255) range, or automatically select depending on the mode. Signed-off-by: Russell King <rmk+kernel(a)armlinux.org.uk> --- As described in the commit description, this is modelled on the i915 property, and uses exactly the same strings as the i915 version. Some discussion points: 1. do we wish to call the additional structure members "broadcast_rgb" or would "rgb_quantization_range" be more appropriate for what it is? 2. should drm_connector_create_broadcast_rgb_property() create the mode_config property when required and attach it to the connector, or should drm_connector_create_standard_properties() create the property, and have drm_connector_attach_broadcast_rgb_property() attach it to the connector instead? 3. should we pass a bitmask of the supported types in the same way that the YCbCr properties do and create per-connector properties? drivers/gpu/drm/drm_atomic.c | 6 ++++ drivers/gpu/drm/drm_atomic_helper.c | 4 ++- drivers/gpu/drm/drm_color_mgmt.c | 62 +++++++++++++++++++++++++++++++++++++ include/drm/drm_connector.h | 27 ++++++++++++++++ include/drm/drm_mode_config.h | 7 +++++ 5 files changed, 105 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c index d5cefb1cb2a2..4aa9ddb84aad 100644 --- a/drivers/gpu/drm/drm_atomic.c +++ b/drivers/gpu/drm/drm_atomic.c @@ -1415,6 +1415,8 @@ static int drm_atomic_connector_set_property(struct drm_connector *connector, return set_out_fence_for_connector(state->state, connector, fence_ptr); + } else if (property == config->broadcast_rgb_property) { + state->broadcast_rgb = val; } else if (connector->funcs->atomic_set_property) { return connector->funcs->atomic_set_property(connector, state, property, val); @@ -1435,6 +1437,8 @@ static void drm_atomic_connector_print_state(struct drm_printer *p, drm_printf(p, "connector[%u]: %s\n", connector->base.id, connector->name); drm_printf(p, "\tcrtc=%s\n", state->crtc ? state->crtc->name : "(null)"); + drm_printf(p, "\tbroadcast_rgb=%s\n", + drm_get_broadcast_rgb_name(state->broadcast_rgb)); if (connector->funcs->atomic_print_state) connector->funcs->atomic_print_state(p, state); @@ -1506,6 +1510,8 @@ drm_atomic_connector_get_property(struct drm_connector *connector, *val = 0; } else if (property == config->writeback_out_fence_ptr_property) { *val = 0; + } else if (property == config->broadcast_rgb_property) { + *val = state->broadcast_rgb; } else if (connector->funcs->atomic_get_property) { return connector->funcs->atomic_get_property(connector, state, property, val); diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index 8008a7de2e10..5540e99923fb 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -3630,8 +3630,10 @@ void __drm_atomic_helper_connector_reset(struct drm_connector *connector, struct drm_connector_state *conn_state) { - if (conn_state) + if (conn_state) { conn_state->connector = connector; + conn_state->broadcast_rgb = DRM_BROADCAST_RGB_AUTO; + } connector->state = conn_state; } diff --git a/drivers/gpu/drm/drm_color_mgmt.c b/drivers/gpu/drm/drm_color_mgmt.c index b97e2de2c029..b85ea3eabe2c 100644 --- a/drivers/gpu/drm/drm_color_mgmt.c +++ b/drivers/gpu/drm/drm_color_mgmt.c @@ -102,6 +102,14 @@ * Optional plane enum property to support different non RGB * color parameter ranges. The driver can provide a subset of * standard enum values supported by the DRM plane. + * + * Support for output RGB color range is controlled through the + * &drm_connector specific "Broadcast RGB" property. This is created + * and setup by calling drm_connector_create_broadcast_rgb_property(). + * + * "Broadcast RGB" + * Optional connector property to support different RGB output + * ranges. */ /** @@ -472,3 +480,57 @@ int drm_plane_create_color_properties(struct drm_plane *plane, return 0; } EXPORT_SYMBOL(drm_plane_create_color_properties); + +static const struct drm_prop_enum_list broadcast_rgb_names[] = { + { DRM_BROADCAST_RGB_AUTO, "Automatic" }, + { DRM_BROADCAST_RGB_FULL, "Full" }, + { DRM_BROADCAST_RGB_LIMITED, "Limited 16:235" }, +}; + +/** + * drm_get_broadcast_rgb_name - return a string for the broadcast rgb property + * @mode: broadcast rgb mode + * + * Return a const pointer to a string defining the RGB quantization range. + */ +const char *drm_get_broadcast_rgb_name(enum drm_broadcast_rgb_mode mode) +{ + if (WARN_ON(mode >= ARRAY_SIZE(broadcast_rgb_names))) + return "unknown"; + return broadcast_rgb_names[mode].name; +} + +/** + * drm_connector_create_broadcast_rgb_property - add RGB range property + * @connector: connector object to attach RGB range property to + * @mode: default mode for the RGB output range + * + * Create if necessary the "Broadcast RGB" property and attach it to + * @connector. + */ +int drm_connector_create_broadcast_rgb_property(struct drm_connector *connector, + enum drm_broadcast_rgb_mode mode) +{ + struct drm_device *dev = connector->dev; + struct drm_property *prop; + + if (!dev->mode_config.broadcast_rgb_property) { + prop = drm_property_create_enum(dev, DRM_MODE_PROP_ENUM, + "Broadcast RGB", broadcast_rgb_names, + ARRAY_SIZE(broadcast_rgb_names)); + if (!prop) + return -ENOMEM; + + dev->mode_config.broadcast_rgb_property = prop; + } + + drm_object_attach_property(&connector->base, + dev->mode_config.broadcast_rgb_property, + mode); + + if (connector->state) + connector->state->broadcast_rgb = mode; + + return 0; +} +EXPORT_SYMBOL(drm_connector_create_broadcast_rgb_property); diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h index bf0f0f0786d3..70458c2bf4b0 100644 --- a/include/drm/drm_connector.h +++ b/include/drm/drm_connector.h @@ -206,6 +206,23 @@ enum drm_panel_orientation { }; /** + * enum drm_broadcast_rgb_mode - broadcast (output) rgb range + * + * For digital outputs, this enum describes the quantization range of RGB + * values to be supplied to the connected sink. + * + * DRM_BROADCAST_RGB_AUTO: Automatically select, according to the display + * mode, limited or full quantization range. + * DRM_BROADCAST_RGB_FULL: Full (eg, 0 to 255) quantization range RGB. + * DRM_BROADCAST_RGB_LIMITED: Limited (eg, 16 to 235) quantization range RGB. + */ +enum drm_broadcast_rgb_mode { + DRM_BROADCAST_RGB_AUTO, + DRM_BROADCAST_RGB_FULL, + DRM_BROADCAST_RGB_LIMITED, +}; + +/** * struct drm_display_info - runtime data about the connected sink * * Describes a given display (e.g. CRT or flat panel) and its limitations. For @@ -450,6 +467,12 @@ struct drm_connector_state { * drm_writeback_signal_completion() */ struct drm_writeback_job *writeback_job; + + /** + * @broadcast_rgb: Connector property to control the RGB + * quantization range. + */ + enum drm_broadcast_rgb_mode broadcast_rgb; }; /** @@ -1114,6 +1137,8 @@ const char *drm_get_dvi_i_select_name(int val); const char *drm_get_tv_subconnector_name(int val); const char *drm_get_tv_select_name(int val); const char *drm_get_content_protection_name(int val); +const char *drm_get_broadcast_rgb_name(enum drm_broadcast_rgb_mode mode); + int drm_mode_create_dvi_i_properties(struct drm_device *dev); int drm_mode_create_tv_properties(struct drm_device *dev, @@ -1131,6 +1156,8 @@ void drm_hdmi_avi_infoframe_content_type(struct hdmi_avi_infoframe *frame, const struct drm_connector_state *conn_state); int drm_mode_create_suggested_offset_properties(struct drm_device *dev); +int drm_connector_create_broadcast_rgb_property(struct drm_connector *connector, + enum drm_broadcast_rgb_mode mode); int drm_mode_connector_set_path_property(struct drm_connector *connector, const char *path); diff --git a/include/drm/drm_mode_config.h b/include/drm/drm_mode_config.h index a0b202e1d69a..609922529368 100644 --- a/include/drm/drm_mode_config.h +++ b/include/drm/drm_mode_config.h @@ -807,6 +807,13 @@ struct drm_mode_config { */ struct drm_property *writeback_out_fence_ptr_property; + /** + * @broadcast_rgb_property: Optional connector property indicating + * whether the output RGB should be automatically selected, limited + * range (16-235) or full range (0-255). + */ + struct drm_property *broadcast_rgb_property; + /* dumb ioctl parameters */ uint32_t preferred_depth, prefer_shadow; -- 2.7.4

1 0

Fwd: [radeon-alex:drm-next-4.19-wip 126/132] drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c:150:1-3: WARNING: possible condition with no effect (if == else)
by Julia Lawall 04 Jul '18

04 Jul '18

Please check on lines 150-153. Both branches appear to be the same. thanks, julia -------- Courriel original -------- Objet: [radeon-alex:drm-next-4.19-wip 126/132] drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c:150:1-3: WARNING: possible condition with no effect (if == else) Date: 04.07.2018 15:10 De: kbuild test robot <lkp(a)intel.com> À: kbuild(a)01.org Cc: Julia Lawall <julia.lawall(a)lip6.fr> CC: kbuild-all(a)01.org CC: dri-devel(a)lists.freedesktop.org TO: Alex Deucher <alexander.deucher(a)amd.com> CC: Chunming Zhou <david1.zhou(a)amd.com> CC: "Christian König" <christian.koenig(a)amd.com> tree: git://people.freedesktop.org/~agd5f/linux.git drm-next-4.19-wip head: 6becad35ec8a249df9f8e8fe196316efbd40faf4 commit: 40b106f7e840f2434c42e8992b3a4871a19ddf1d [126/132] drm/amdgpu: switch firmware path for CIK parts :::::: branch date: 6 hours ago :::::: commit date: 6 hours ago >> drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c:150:1-3: WARNING: possible >> condition with no effect (if == else) git remote add radeon-alex git://people.freedesktop.org/~agd5f/linux.git git remote update radeon-alex git checkout 40b106f7e840f2434c42e8992b3a4871a19ddf1d vim +150 drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c a2e73f56 Alex Deucher 2015-04-20 115 a2e73f56 Alex Deucher 2015-04-20 116 /** a2e73f56 Alex Deucher 2015-04-20 117 * gmc_v7_0_init_microcode - load ucode images from disk a2e73f56 Alex Deucher 2015-04-20 118 * a2e73f56 Alex Deucher 2015-04-20 119 * @adev: amdgpu_device pointer a2e73f56 Alex Deucher 2015-04-20 120 * a2e73f56 Alex Deucher 2015-04-20 121 * Use the firmware interface to load the ucode images into a2e73f56 Alex Deucher 2015-04-20 122 * the driver (not loaded into hw). a2e73f56 Alex Deucher 2015-04-20 123 * Returns 0 on success, error on failure. a2e73f56 Alex Deucher 2015-04-20 124 */ a2e73f56 Alex Deucher 2015-04-20 125 static int gmc_v7_0_init_microcode(struct amdgpu_device *adev) a2e73f56 Alex Deucher 2015-04-20 126 { a2e73f56 Alex Deucher 2015-04-20 127 const char *chip_name; a2e73f56 Alex Deucher 2015-04-20 128 char fw_name[30]; a2e73f56 Alex Deucher 2015-04-20 129 int err; a2e73f56 Alex Deucher 2015-04-20 130 a2e73f56 Alex Deucher 2015-04-20 131 DRM_DEBUG("\n"); a2e73f56 Alex Deucher 2015-04-20 132 a2e73f56 Alex Deucher 2015-04-20 133 switch (adev->asic_type) { a2e73f56 Alex Deucher 2015-04-20 134 case CHIP_BONAIRE: a2e73f56 Alex Deucher 2015-04-20 135 chip_name = "bonaire"; a2e73f56 Alex Deucher 2015-04-20 136 break; a2e73f56 Alex Deucher 2015-04-20 137 case CHIP_HAWAII: a2e73f56 Alex Deucher 2015-04-20 138 chip_name = "hawaii"; a2e73f56 Alex Deucher 2015-04-20 139 break; 429c45de Ken Wang 2016-02-03 140 case CHIP_TOPAZ: 429c45de Ken Wang 2016-02-03 141 chip_name = "topaz"; 429c45de Ken Wang 2016-02-03 142 break; a2e73f56 Alex Deucher 2015-04-20 143 case CHIP_KAVERI: a2e73f56 Alex Deucher 2015-04-20 144 case CHIP_KABINI: b62774fc Alex Deucher 2016-07-29 145 case CHIP_MULLINS: a2e73f56 Alex Deucher 2015-04-20 146 return 0; a2e73f56 Alex Deucher 2015-04-20 147 default: BUG(); a2e73f56 Alex Deucher 2015-04-20 148 } a2e73f56 Alex Deucher 2015-04-20 149 429c45de Ken Wang 2016-02-03 @150 if (adev->asic_type == CHIP_TOPAZ) 429c45de Ken Wang 2016-02-03 151 snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_mc.bin", chip_name); 429c45de Ken Wang 2016-02-03 152 else 40b106f7 Alex Deucher 2018-07-02 153 snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_mc.bin", chip_name); 429c45de Ken Wang 2016-02-03 154 770d13b1 Christian König 2018-01-12 155 err = request_firmware(&adev->gmc.fw, fw_name, adev->dev); a2e73f56 Alex Deucher 2015-04-20 156 if (err) a2e73f56 Alex Deucher 2015-04-20 157 goto out; 770d13b1 Christian König 2018-01-12 158 err = amdgpu_ucode_validate(adev->gmc.fw); a2e73f56 Alex Deucher 2015-04-20 159 a2e73f56 Alex Deucher 2015-04-20 160 out: a2e73f56 Alex Deucher 2015-04-20 161 if (err) { 7ca85295 Joe Perches 2017-02-28 162 pr_err("cik_mc: Failed to load firmware \"%s\"\n", fw_name); 770d13b1 Christian König 2018-01-12 163 release_firmware(adev->gmc.fw); 770d13b1 Christian König 2018-01-12 164 adev->gmc.fw = NULL; a2e73f56 Alex Deucher 2015-04-20 165 } a2e73f56 Alex Deucher 2015-04-20 166 return err; a2e73f56 Alex Deucher 2015-04-20 167 } a2e73f56 Alex Deucher 2015-04-20 168 :::::: The code at line 150 was first introduced by commit :::::: 429c45deae6e57f1bb91bfb05b671063fb0cef60 drm/amdgpu: iceland use CI based MC IP :::::: TO: Ken Wang <Qingqing.Wang(a)amd.com> :::::: CC: Alex Deucher <alexander.deucher(a)amd.com> --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

1 0

[PATCH] drm/amd/display/dc/dce: Fix multiple potential integer overflows
by Gustavo A. R. Silva 04 Jul '18

04 Jul '18

Add suffix ULL to constant 5 and cast variables target_pix_clk_khz and feedback_divider to uint64_t in order to avoid multiple potential integer overflows and give the compiler complete information about the proper arithmetic to use. Notice that such constant and variables are used in contexts that expect expressions of type uint64_t (64 bits, unsigned). The current casts to uint64_t effectively apply to each expression as a whole, but they do not prevent them from being evaluated using 32-bit arithmetic instead of 64-bit arithmetic. Also, once the expressions are properly evaluated using 64-bit arithmentic, there is no need for the parentheses that enclose them. Addresses-Coverity-ID: 1460245 ("Unintentional integer overflow") Addresses-Coverity-ID: 1460286 ("Unintentional integer overflow") Addresses-Coverity-ID: 1460401 ("Unintentional integer overflow") Fixes: 4562236b3bc0 ("drm/amd/dc: Add dc display driver (v2)") Signed-off-by: Gustavo A. R. Silva <gustavo(a)embeddedor.com> --- drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c b/drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c index 88b09dd..715d737 100644 --- a/drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c +++ b/drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c @@ -133,7 +133,7 @@ static bool calculate_fb_and_fractional_fb_divider( uint64_t feedback_divider; feedback_divider = - (uint64_t)(target_pix_clk_khz * ref_divider * post_divider); + (uint64_t)target_pix_clk_khz * ref_divider * post_divider; feedback_divider *= 10; /* additional factor, since we divide by 10 afterwards */ feedback_divider *= (uint64_t)(calc_pll_cs->fract_fb_divider_factor); @@ -145,8 +145,8 @@ static bool calculate_fb_and_fractional_fb_divider( * of fractional feedback decimal point and the fractional FB Divider precision * is 2 then the equation becomes (ullfeedbackDivider + 5*100) / (10*100))*/ - feedback_divider += (uint64_t) - (5 * calc_pll_cs->fract_fb_divider_precision_factor); + feedback_divider += 5UL * + calc_pll_cs->fract_fb_divider_precision_factor; feedback_divider = div_u64(feedback_divider, calc_pll_cs->fract_fb_divider_precision_factor * 10); @@ -203,8 +203,8 @@ static bool calc_fb_divider_checking_tolerance( &fract_feedback_divider); /*Actual calculated value*/ - actual_calc_clk_khz = (uint64_t)(feedback_divider * - calc_pll_cs->fract_fb_divider_factor) + + actual_calc_clk_khz = (uint64_t)feedback_divider * + calc_pll_cs->fract_fb_divider_factor + fract_feedback_divider; actual_calc_clk_khz *= calc_pll_cs->ref_freq_khz; actual_calc_clk_khz = -- 2.7.4

3 5

[PATCH 1/2] device core: Rename flag AUTOREMOVE to AUTOREMOVE_CONSUMER
by Vivek Gautam 04 Jul '18

04 Jul '18

Now that we want to add another flag to autoremove the device link on supplier unbind, it's fair to rename the existing flag from DL_FLAG_AUTOREMOVE to DL_FLAG_AUTOREMOVE_CONSUMER so that we can add similar flag for supplier later. And, while we are touching device.h, fix a doc build warning. Signed-off-by: Vivek Gautam <vivek.gautam(a)codeaurora.org> Cc: Lukas Wunner <lukas(a)wunner.de> Cc: Jonathan Corbet <corbet(a)lwn.net> Cc: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Cc: Thierry Reding <thierry.reding(a)gmail.com> Cc: David Airlie <airlied(a)linux.ie> Cc: Jonathan Hunter <jonathanh(a)nvidia.com> Cc: Philipp Zabel <p.zabel(a)pengutronix.de> Cc: Shawn Guo <shawnguo(a)kernel.org> Cc: Sascha Hauer <kernel(a)pengutronix.de> Cc: Robin Murphy <robin.murphy(a)arm.com> Cc: linux-doc(a)vger.kernel.org Cc: dri-devel(a)lists.freedesktop.org Cc: linux-tegra(a)vger.kernel.org Cc: linux-arm-kernel(a)lists.infradead.org Cc: linux-pm(a)vger.kernel.org Cc: linux-arm-msm(a)vger.kernel.org --- Documentation/driver-api/device_link.rst | 8 ++++---- drivers/base/core.c | 15 ++++++++------- drivers/gpu/drm/tegra/dc.c | 2 +- drivers/gpu/ipu-v3/ipu-pre.c | 3 ++- drivers/gpu/ipu-v3/ipu-prg.c | 3 ++- drivers/soc/imx/gpc.c | 2 +- include/linux/device.h | 12 ++++++------ 7 files changed, 24 insertions(+), 21 deletions(-) diff --git a/Documentation/driver-api/device_link.rst b/Documentation/driver-api/device_link.rst index 70e328e16aad..a005b904a264 100644 --- a/Documentation/driver-api/device_link.rst +++ b/Documentation/driver-api/device_link.rst @@ -81,10 +81,10 @@ integration is desired. Two other flags are specifically targeted at use cases where the device link is added from the consumer's ``->probe`` callback: ``DL_FLAG_RPM_ACTIVE`` can be specified to runtime resume the supplier upon addition of the -device link. ``DL_FLAG_AUTOREMOVE`` causes the device link to be automatically -purged when the consumer fails to probe or later unbinds. This obviates -the need to explicitly delete the link in the ``->remove`` callback or in -the error path of the ``->probe`` callback. +device link. ``DL_FLAG_AUTOREMOVE_CONSUMER`` causes the device link to be +automatically purged when the consumer fails to probe or later unbinds. +This obviates the need to explicitly delete the link in the ``->remove`` +callback or in the error path of the ``->probe`` callback. Limitations =========== diff --git a/drivers/base/core.c b/drivers/base/core.c index df3e1a44707a..14c1e3151e08 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c @@ -178,10 +178,10 @@ void device_pm_move_to_tail(struct device *dev) * of the link. If DL_FLAG_PM_RUNTIME is not set, DL_FLAG_RPM_ACTIVE will be * ignored. * - * If the DL_FLAG_AUTOREMOVE is set, the link will be removed automatically - * when the consumer device driver unbinds from it. The combination of both - * DL_FLAG_AUTOREMOVE and DL_FLAG_STATELESS set is invalid and will cause NULL - * to be returned. + * If the DL_FLAG_AUTOREMOVE_CONSUMER is set, the link will be removed + * automatically when the consumer device driver unbinds from it. + * The combination of both DL_FLAG_AUTOREMOVE_CONSUMER and DL_FLAG_STATELESS + * set is invalid and will cause NULL to be returned. * * A side effect of the link creation is re-ordering of dpm_list and the * devices_kset list by moving the consumer device and all devices depending @@ -198,7 +198,8 @@ struct device_link *device_link_add(struct device *consumer, struct device_link *link; if (!consumer || !supplier || - ((flags & DL_FLAG_STATELESS) && (flags & DL_FLAG_AUTOREMOVE))) + ((flags & DL_FLAG_STATELESS) && + (flags & DL_FLAG_AUTOREMOVE_CONSUMER))) return NULL; device_links_write_lock(); @@ -479,7 +480,7 @@ static void __device_links_no_driver(struct device *dev) if (link->flags & DL_FLAG_STATELESS) continue; - if (link->flags & DL_FLAG_AUTOREMOVE) + if (link->flags & DL_FLAG_AUTOREMOVE_CONSUMER) kref_put(&link->kref, __device_link_del); else if (link->status != DL_STATE_SUPPLIER_UNBIND) WRITE_ONCE(link->status, DL_STATE_AVAILABLE); @@ -515,7 +516,7 @@ void device_links_driver_cleanup(struct device *dev) if (link->flags & DL_FLAG_STATELESS) continue; - WARN_ON(link->flags & DL_FLAG_AUTOREMOVE); + WARN_ON(link->flags & DL_FLAG_AUTOREMOVE_CONSUMER); WARN_ON(link->status != DL_STATE_SUPPLIER_UNBIND); WRITE_ONCE(link->status, DL_STATE_DORMANT); } diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c index c3afe7b2237e..965088afcfad 100644 --- a/drivers/gpu/drm/tegra/dc.c +++ b/drivers/gpu/drm/tegra/dc.c @@ -2312,7 +2312,7 @@ static int tegra_dc_couple(struct tegra_dc *dc) * POWER_CONTROL registers during CRTC enabling. */ if (dc->soc->coupled_pm && dc->pipe == 1) { - u32 flags = DL_FLAG_PM_RUNTIME | DL_FLAG_AUTOREMOVE; + u32 flags = DL_FLAG_PM_RUNTIME | DL_FLAG_AUTOREMOVE_CONSUMER; struct device_link *link; struct device *partner; diff --git a/drivers/gpu/ipu-v3/ipu-pre.c b/drivers/gpu/ipu-v3/ipu-pre.c index 0f70e8847540..2f8db9d62551 100644 --- a/drivers/gpu/ipu-v3/ipu-pre.c +++ b/drivers/gpu/ipu-v3/ipu-pre.c @@ -128,7 +128,8 @@ ipu_pre_lookup_by_phandle(struct device *dev, const char *name, int index) list_for_each_entry(pre, &ipu_pre_list, list) { if (pre_node == pre->dev->of_node) { mutex_unlock(&ipu_pre_list_mutex); - device_link_add(dev, pre->dev, DL_FLAG_AUTOREMOVE); + device_link_add(dev, pre->dev, + DL_FLAG_AUTOREMOVE_CONSUMER); of_node_put(pre_node); return pre; } diff --git a/drivers/gpu/ipu-v3/ipu-prg.c b/drivers/gpu/ipu-v3/ipu-prg.c index 83f9dd934a5d..38a3a9764e49 100644 --- a/drivers/gpu/ipu-v3/ipu-prg.c +++ b/drivers/gpu/ipu-v3/ipu-prg.c @@ -100,7 +100,8 @@ ipu_prg_lookup_by_phandle(struct device *dev, const char *name, int ipu_id) list_for_each_entry(prg, &ipu_prg_list, list) { if (prg_node == prg->dev->of_node) { mutex_unlock(&ipu_prg_list_mutex); - device_link_add(dev, prg->dev, DL_FLAG_AUTOREMOVE); + device_link_add(dev, prg->dev, + DL_FLAG_AUTOREMOVE_CONSUMER); prg->id = ipu_id; of_node_put(prg_node); return prg; diff --git a/drivers/soc/imx/gpc.c b/drivers/soc/imx/gpc.c index 32f0748fd067..aa9e65bc965e 100644 --- a/drivers/soc/imx/gpc.c +++ b/drivers/soc/imx/gpc.c @@ -202,7 +202,7 @@ static int imx_pgc_power_domain_probe(struct platform_device *pdev) goto genpd_err; } - device_link_add(dev, dev->parent, DL_FLAG_AUTOREMOVE); + device_link_add(dev, dev->parent, DL_FLAG_AUTOREMOVE_CONSUMER); return 0; diff --git a/include/linux/device.h b/include/linux/device.h index 055a69dbcd18..3929805cdd59 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -90,7 +90,7 @@ extern void bus_remove_file(struct bus_type *, struct bus_attribute *); * @num_vf: Called to find out how many virtual functions a device on this * bus supports. * @dma_configure: Called to setup DMA configuration on a device on - this bus. + * this bus. * @pm: Power management operations of this bus, callback the specific * device driver's pm-ops. * @iommu_ops: IOMMU specific operations for this bus, used to attach IOMMU @@ -784,14 +784,14 @@ enum device_link_state { * Device link flags. * * STATELESS: The core won't track the presence of supplier/consumer drivers. - * AUTOREMOVE: Remove this link automatically on consumer driver unbind. + * AUTOREMOVE_CONSUMER: Remove the link automatically on consumer driver unbind. * PM_RUNTIME: If set, the runtime PM framework will use this link. * RPM_ACTIVE: Run pm_runtime_get_sync() on the supplier during link creation. */ -#define DL_FLAG_STATELESS BIT(0) -#define DL_FLAG_AUTOREMOVE BIT(1) -#define DL_FLAG_PM_RUNTIME BIT(2) -#define DL_FLAG_RPM_ACTIVE BIT(3) +#define DL_FLAG_STATELESS BIT(0) +#define DL_FLAG_AUTOREMOVE_CONSUMER BIT(1) +#define DL_FLAG_PM_RUNTIME BIT(2) +#define DL_FLAG_RPM_ACTIVE BIT(3) /** * struct device_link - Device link representation. -- QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation

2 2

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel July 2018