dri-devel January 2021

dri-devel@lists.freedesktop.org

322 participants
737 discussions

Re: linux-next: Tree for Jan 27 (drm/i915)
by Randy Dunlap 27 Jan '21

27 Jan '21

On 1/27/21 6:44 AM, Stephen Rothwell wrote: > Hi all, > > Note: the patch file has failed to upload :-( > > Changes since 20210125: > on x86_64: ../drivers/gpu/drm/i915/i915_gem.c: In function ‘i915_gem_freeze_late’: ../drivers/gpu/drm/i915/i915_gem.c:1182:2: error: implicit declaration of function ‘wbinvd_on_all_cpus’; did you mean ‘wrmsr_on_cpus’? [-Werror=implicit-function-declaration] wbinvd_on_all_cpus(); -- ~Randy Reported-by: Randy Dunlap <rdunlap(a)infradead.org>

2 3

Re: mmotm 2021-01-25-21-18 uploaded (drm/i915/Kconfig.debug)
by Randy Dunlap 27 Jan '21

27 Jan '21

On 1/25/21 9:19 PM, akpm(a)linux-foundation.org wrote: > The mm-of-the-moment snapshot 2021-01-25-21-18 has been uploaded to > > https://www.ozlabs.org/~akpm/mmotm/ > > mmotm-readme.txt says > > README for mm-of-the-moment: > > https://www.ozlabs.org/~akpm/mmotm/ > > This is a snapshot of my -mm patch queue. Uploaded at random hopefully > more than once a week. > > You will need quilt to apply these patches to the latest Linus release (5.x > or 5.x-rcY). The series file is in broken-out.tar.gz and is duplicated in > https://ozlabs.org/~akpm/mmotm/series > > The file broken-out.tar.gz contains two datestamp files: .DATE and > .DATE-yyyy-mm-dd-hh-mm-ss. Both contain the string yyyy-mm-dd-hh-mm-ss, > followed by the base kernel version against which this patch series is to > be applied. on x86_64: when CONFIG_COMPILE_TEST=y: WARNING: unmet direct dependencies detected for DRM_I915_WERROR Depends on [n]: HAS_IOMEM [=y] && DRM_I915 [=m] && EXPERT [=y] && !COMPILE_TEST [=y] Selected by [m]: - DRM_I915_DEBUG [=y] && HAS_IOMEM [=y] && EXPERT [=y] && DRM_I915 [=m] -- ~Randy Reported-by: Randy Dunlap <rdunlap(a)infradead.org>

1 0

[RFC] in_atomic() usage in amba-clcd.c / FB_ARMCLCD
by Sebastian Andrzej Siewior 27 Jan '21

27 Jan '21

The mba-clcd driver uses in_interrupt() in clcdfb_sleep(): | /* | * Unfortunately, the enable/disable functions may be called either from | * process or IRQ context, and we _need_ to delay. This is _not_ good. | */ | static inline void clcdfb_sleep(unsigned int ms) | { | if (in_atomic()) { | mdelay(ms); | } else { | msleep(ms); | } | } I traced it back to its initial merge: bfe694f833643 ("[ARM] Add ARM AMBA CLCD framebuffer driver.") https://git.kernel.org/history/history/c/bfe694f833643 The driver has been removed and added back in the meantime. I've been looking for the IRQ context as described in the comment and couldn't find it. The functions calling clcdfb_sleep() also call conditionally backlight_update_status() which acquires a mutex. Is this part really outdated and now msleep() could be used unconditionally? Sebastian

1 0

[PATCH 0/2] video: omap*: Remove in_interrupt() usage.
by Sebastian Andrzej Siewior 27 Jan '21

27 Jan '21

Folks, in the discussion about preempt count consistency across kernel configurations: https://lore.kernel.org/r/20200914204209.256266093@linutronix.de/ it was concluded that the usage of in_interrupt() and related context checks should be removed from non-core code. In the long run, usage of 'preemptible, in_*irq etc.' should be banned from driver code completely. This series targets the video subsystem. Sebastian

1 2

[PATCH] drm/komeda: Fix bit check to import to value of proper type
by carsten.haitzler＠foss.arm.com 27 Jan '21

27 Jan '21

From: Carsten Haitzler <carsten.haitzler(a)arm.com> Another issue found by KASAN. The bit finding is buried inside the dp_for_each_set_bit() macro (that passes on to for_each_set_bit() that calls the bit stuff. These bit functions want an unsigned long pointer as input and just dumbly casting leads to out-of-bounds accesses. This fixes that. Signed-off-by: Carsten Haitzler <carsten.haitzler(a)arm.com> --- .../gpu/drm/arm/display/include/malidp_utils.h | 10 ++++++++-- .../gpu/drm/arm/display/komeda/komeda_pipeline.c | 16 +++++++++++----- .../arm/display/komeda/komeda_pipeline_state.c | 13 ++++++++----- 3 files changed, 27 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/arm/display/include/malidp_utils.h b/drivers/gpu/drm/arm/display/include/malidp_utils.h index 3bc383d5bf73..8d289cd0b5b8 100644 --- a/drivers/gpu/drm/arm/display/include/malidp_utils.h +++ b/drivers/gpu/drm/arm/display/include/malidp_utils.h @@ -12,9 +12,15 @@ #define has_bit(nr, mask) (BIT(nr) & (mask)) #define has_bits(bits, mask) (((bits) & (mask)) == (bits)) - +/* +#define dp_for_each_set_bit(bit, mask) \ + for_each_set_bit((bit), (&((unsigned long)(mask))), sizeof(mask) * 8) +#define dp_for_each_set_bit(bit, mask) \ + unsigned long __local_mask = mask; \ + for_each_set_bit((bit), (&__local_mask), sizeof(mask) * 8) +*/ #define dp_for_each_set_bit(bit, mask) \ - for_each_set_bit((bit), ((unsigned long *)&(mask)), sizeof(mask) * 8) + for_each_set_bit((bit), &(mask), sizeof(mask) * 8) #define dp_wait_cond(__cond, __tries, __min_range, __max_range) \ ({ \ diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_pipeline.c b/drivers/gpu/drm/arm/display/komeda/komeda_pipeline.c index 719a79728e24..a85c8a806334 100644 --- a/drivers/gpu/drm/arm/display/komeda/komeda_pipeline.c +++ b/drivers/gpu/drm/arm/display/komeda/komeda_pipeline.c @@ -46,8 +46,9 @@ void komeda_pipeline_destroy(struct komeda_dev *mdev, { struct komeda_component *c; int i; + unsigned long avail_comps = pipe->avail_comps; - dp_for_each_set_bit(i, pipe->avail_comps) { + dp_for_each_set_bit(i, avail_comps) { c = komeda_pipeline_get_component(pipe, i); komeda_component_destroy(mdev, c); } @@ -247,6 +248,7 @@ static void komeda_pipeline_dump(struct komeda_pipeline *pipe) { struct komeda_component *c; int id; + unsigned long avail_comps = pipe->avail_comps; DRM_INFO("Pipeline-%d: n_layers: %d, n_scalers: %d, output: %s.\n", pipe->id, pipe->n_layers, pipe->n_scalers, @@ -258,7 +260,7 @@ static void komeda_pipeline_dump(struct komeda_pipeline *pipe) pipe->of_output_links[1] ? pipe->of_output_links[1]->full_name : "none"); - dp_for_each_set_bit(id, pipe->avail_comps) { + dp_for_each_set_bit(id, avail_comps) { c = komeda_pipeline_get_component(pipe, id); komeda_component_dump(c); @@ -270,8 +272,9 @@ static void komeda_component_verify_inputs(struct komeda_component *c) struct komeda_pipeline *pipe = c->pipeline; struct komeda_component *input; int id; + unsigned long supported_inputs = c->supported_inputs; - dp_for_each_set_bit(id, c->supported_inputs) { + dp_for_each_set_bit(id, supported_inputs) { input = komeda_pipeline_get_component(pipe, id); if (!input) { c->supported_inputs &= ~(BIT(id)); @@ -302,8 +305,9 @@ static void komeda_pipeline_assemble(struct komeda_pipeline *pipe) struct komeda_component *c; struct komeda_layer *layer; int i, id; + unsigned long avail_comps = pipe->avail_comps; - dp_for_each_set_bit(id, pipe->avail_comps) { + dp_for_each_set_bit(id, avail_comps) { c = komeda_pipeline_get_component(pipe, id); komeda_component_verify_inputs(c); } @@ -355,13 +359,15 @@ void komeda_pipeline_dump_register(struct komeda_pipeline *pipe, { struct komeda_component *c; u32 id; + unsigned long avail_comps; seq_printf(sf, "\n======== Pipeline-%d ==========\n", pipe->id); if (pipe->funcs && pipe->funcs->dump_register) pipe->funcs->dump_register(pipe, sf); - dp_for_each_set_bit(id, pipe->avail_comps) { + avail_comps = pipe->avail_comps; + dp_for_each_set_bit(id, avail_comps) { c = komeda_pipeline_get_component(pipe, id); seq_printf(sf, "\n------%s------\n", c->name); diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_pipeline_state.c b/drivers/gpu/drm/arm/display/komeda/komeda_pipeline_state.c index e8b1e15312d8..7640dae7f4bf 100644 --- a/drivers/gpu/drm/arm/display/komeda/komeda_pipeline_state.c +++ b/drivers/gpu/drm/arm/display/komeda/komeda_pipeline_state.c @@ -1232,7 +1232,8 @@ komeda_pipeline_unbound_components(struct komeda_pipeline *pipe, struct komeda_pipeline_state *old = priv_to_pipe_st(pipe->obj.state); struct komeda_component_state *c_st; struct komeda_component *c; - u32 disabling_comps, id; + u32 id; + unsigned long disabling_comps; WARN_ON(!old); @@ -1287,7 +1288,8 @@ bool komeda_pipeline_disable(struct komeda_pipeline *pipe, struct komeda_pipeline_state *old; struct komeda_component *c; struct komeda_component_state *c_st; - u32 id, disabling_comps = 0; + u32 id; + unsigned long disabling_comps; old = komeda_pipeline_get_old_state(pipe, old_state); @@ -1297,7 +1299,7 @@ bool komeda_pipeline_disable(struct komeda_pipeline *pipe, disabling_comps = old->active_comps & pipe->standalone_disabled_comps; - DRM_DEBUG_ATOMIC("PIPE%d: active_comps: 0x%x, disabling_comps: 0x%x.\n", + DRM_DEBUG_ATOMIC("PIPE%d: active_comps: 0x%x, disabling_comps: 0x%lx.\n", pipe->id, old->active_comps, disabling_comps); dp_for_each_set_bit(id, disabling_comps) { @@ -1331,13 +1333,14 @@ void komeda_pipeline_update(struct komeda_pipeline *pipe, struct komeda_pipeline_state *new = priv_to_pipe_st(pipe->obj.state); struct komeda_pipeline_state *old; struct komeda_component *c; - u32 id, changed_comps = 0; + u32 id; + unsigned long changed_comps; old = komeda_pipeline_get_old_state(pipe, old_state); changed_comps = new->active_comps | old->active_comps; - DRM_DEBUG_ATOMIC("PIPE%d: active_comps: 0x%x, changed: 0x%x.\n", + DRM_DEBUG_ATOMIC("PIPE%d: active_comps: 0x%x, changed: 0x%lx.\n", pipe->id, new->active_comps, changed_comps); dp_for_each_set_bit(id, changed_comps) { -- 2.29.2

2 1

[PATCH] drm/ttm: stop using GFP_TRANSHUGE_LIGHT
by Christian König 27 Jan '21

27 Jan '21

The only flag we really need is __GFP_NOMEMALLOC, highmem depends on dma32 and moveable/compound should never be set in the first place. Signed-off-by: Christian König <christian.koenig(a)amd.com> --- drivers/gpu/drm/ttm/ttm_pool.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/ttm/ttm_pool.c b/drivers/gpu/drm/ttm/ttm_pool.c index 8cd776adc592..11e0313db0ea 100644 --- a/drivers/gpu/drm/ttm/ttm_pool.c +++ b/drivers/gpu/drm/ttm/ttm_pool.c @@ -79,12 +79,13 @@ static struct page *ttm_pool_alloc_page(struct ttm_pool *pool, gfp_t gfp_flags, struct page *p; void *vaddr; - if (order) { - gfp_flags |= GFP_TRANSHUGE_LIGHT | __GFP_NORETRY | + /* Don't set the __GFP_COMP flag for higher order allocations. + * Mapping pages directly into an userspace process and calling + * put_page() on a TTM allocated page is illegal. + */ + if (order) + gfp_flags |= __GFP_NOMEMALLOC | __GFP_NORETRY | __GFP_KSWAPD_RECLAIM; - gfp_flags &= ~__GFP_MOVABLE; - gfp_flags &= ~__GFP_COMP; - } if (!pool->use_dma_alloc) { p = alloc_pages(gfp_flags, order); -- 2.25.1

4 7

[PATCH v2] drm/omap: dsi: fix unreachable code in dsi_vc_send_short()
by menglong8.dong＠gmail.com 27 Jan '21

27 Jan '21

From: Menglong Dong <dong.menglong(a)zte.com.cn> The 'r' in dsi_vc_send_short() is of type 'unsigned int', so the 'r < 0' can't be true. Fix this by introducing a 'err' of type 'int' insteaded. Fixes: 1ed6253856cb ("drm/omap: dsi: switch dsi_vc_send_long/short to mipi_dsi_msg") Signed-off-by: Menglong Dong <dong.menglong(a)zte.com.cn> Reviewed-by: Sebastian Reichel <sebastian.reichel(a)collabora.com> --- v2: - remove word wrap in 'Fixes' tag --- drivers/gpu/drm/omapdrm/dss/dsi.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c b/drivers/gpu/drm/omapdrm/dss/dsi.c index 8e11612f5fe1..febcc87ddfe1 100644 --- a/drivers/gpu/drm/omapdrm/dss/dsi.c +++ b/drivers/gpu/drm/omapdrm/dss/dsi.c @@ -2149,11 +2149,12 @@ static int dsi_vc_send_short(struct dsi_data *dsi, int vc, const struct mipi_dsi_msg *msg) { struct mipi_dsi_packet pkt; + int err; u32 r; - r = mipi_dsi_create_packet(&pkt, msg); - if (r < 0) - return r; + err = mipi_dsi_create_packet(&pkt, msg); + if (err) + return err; WARN_ON(!dsi_bus_is_locked(dsi)); -- 2.25.1

2 1

[PATCH v11] staging: fbtft: add tearing signal detect
by Carlis 27 Jan '21

27 Jan '21

From: zhangxuezhi <zhangxuezhi1(a)yulong.com> For st7789v ic,when we need continuous full screen refresh, it is best to wait for the TE signal arrive to avoid screen tearing Signed-off-by: zhangxuezhi <zhangxuezhi1(a)yulong.com> --- v11: remove devm_gpio_put and change a dev_err to dev_info v10: additional notes v9: change pr_* to dev_* v8: delete a log line v7: return error value when request fail v6: add te gpio request fail deal logic v5: fix log print v4: modify some code style and change te irq set function name v3: modify author and signed-off-by name v2: add release te gpio after irq request fail --- drivers/staging/fbtft/fb_st7789v.c | 131 ++++++++++++++++++++++++++++++++++++- drivers/staging/fbtft/fbtft.h | 1 + 2 files changed, 131 insertions(+), 1 deletion(-) diff --git a/drivers/staging/fbtft/fb_st7789v.c b/drivers/staging/fbtft/fb_st7789v.c index 3a280cc..cfb54a4 100644 --- a/drivers/staging/fbtft/fb_st7789v.c +++ b/drivers/staging/fbtft/fb_st7789v.c @@ -9,9 +9,12 @@ #include <linux/delay.h> #include <linux/init.h> #include <linux/kernel.h> +#include <linux/mutex.h> +#include <linux/interrupt.h> +#include <linux/completion.h> #include <linux/module.h> #include <video/mipi_display.h> - +#include <linux/gpio/consumer.h> #include "fbtft.h" #define DRVNAME "fb_st7789v" @@ -66,6 +69,32 @@ enum st7789v_command { #define MADCTL_MX BIT(6) /* bitmask for column address order */ #define MADCTL_MY BIT(7) /* bitmask for page address order */ +#define SPI_PANEL_TE_TIMEOUT 400 /* msecs */ +static struct mutex te_mutex;/* mutex for set te gpio irq status */ +static struct completion spi_panel_te; + +static irqreturn_t spi_panel_te_handler(int irq, void *data) +{ + complete(&spi_panel_te); + return IRQ_HANDLED; +} + +static void set_spi_panel_te_irq_status(struct fbtft_par *par, bool enable) +{ + static int te_irq_count; + + mutex_lock(&te_mutex); + + if (enable) { + if (++te_irq_count == 1) + enable_irq(gpiod_to_irq(par->gpio.te)); + } else { + if (--te_irq_count == 0) + disable_irq(gpiod_to_irq(par->gpio.te)); + } + mutex_unlock(&te_mutex); +} + /** * init_display() - initialize the display controller * @@ -82,6 +111,32 @@ enum st7789v_command { */ static int init_display(struct fbtft_par *par) { + int rc; + struct device *dev = par->info->device; + + par->gpio.te = devm_gpiod_get_index_optional(dev, "te", 0, GPIOD_IN); + if (IS_ERR(par->gpio.te)) { + rc = PTR_ERR(par->gpio.te); + dev_info(par->info->device, "Failed to request te gpio: %d\n", rc); + return rc; + } + if (par->gpio.te) { + init_completion(&spi_panel_te); + mutex_init(&te_mutex); + rc = devm_request_irq(dev, + gpiod_to_irq(par->gpio.te), + spi_panel_te_handler, IRQF_TRIGGER_RISING, + "TE_GPIO", par); + if (rc) { + dev_err(par->info->device, "TE request_irq failed.\n"); + return rc; + } + + disable_irq_nosync(gpiod_to_irq(par->gpio.te)); + } else { + dev_info(par->info->device, "%s:%d, TE gpio not specified\n", + __func__, __LINE__); + } /* turn off sleep mode */ write_reg(par, MIPI_DCS_EXIT_SLEEP_MODE); mdelay(120); @@ -137,6 +192,9 @@ static int init_display(struct fbtft_par *par) */ write_reg(par, PWCTRL1, 0xA4, 0xA1); + /*Tearing Effect Line On*/ + if (par->gpio.te) + write_reg(par, 0x35, 0x00); write_reg(par, MIPI_DCS_SET_DISPLAY_ON); if (HSD20_IPS) @@ -145,6 +203,76 @@ static int init_display(struct fbtft_par *par) return 0; } +/***************************************************************************** + * + * int (*write_vmem)(struct fbtft_par *par); + * + *****************************************************************************/ + +/* 16 bit pixel over 8-bit databus */ +static int st7789v_write_vmem16_bus8(struct fbtft_par *par, size_t offset, size_t len) +{ + u16 *vmem16; + __be16 *txbuf16 = par->txbuf.buf; + size_t remain; + size_t to_copy; + size_t tx_array_size; + int i; + int ret = 0; + size_t startbyte_size = 0; + + fbtft_par_dbg(DEBUG_WRITE_VMEM, par, "st7789v ---%s(offset=%zu, len=%zu)\n", + __func__, offset, len); + + remain = len / 2; + vmem16 = (u16 *)(par->info->screen_buffer + offset); + + if (par->gpio.dc) + gpiod_set_value(par->gpio.dc, 1); + + /* non buffered write */ + if (!par->txbuf.buf) + return par->fbtftops.write(par, vmem16, len); + + /* buffered write */ + tx_array_size = par->txbuf.len / 2; + + if (par->startbyte) { + txbuf16 = par->txbuf.buf + 1; + tx_array_size -= 2; + *(u8 *)(par->txbuf.buf) = par->startbyte | 0x2; + startbyte_size = 1; + } + + while (remain) { + to_copy = min(tx_array_size, remain); + dev_dbg(par->info->device, " to_copy=%zu, remain=%zu\n", + to_copy, remain - to_copy); + + for (i = 0; i < to_copy; i++) + txbuf16[i] = cpu_to_be16(vmem16[i]); + + vmem16 = vmem16 + to_copy; + if (par->gpio.te) { + set_spi_panel_te_irq_status(par, true); + reinit_completion(&spi_panel_te); + ret = wait_for_completion_timeout(&spi_panel_te, + msecs_to_jiffies(SPI_PANEL_TE_TIMEOUT)); + if (ret == 0) + dev_err(par->info->device, "wait panel TE time out\n"); + } + ret = par->fbtftops.write(par, par->txbuf.buf, + startbyte_size + to_copy * 2); + if (par->gpio.te) + set_spi_panel_te_irq_status(par, false); + if (ret < 0) + return ret; + remain -= to_copy; + } + + return ret; +} + /** * set_var() - apply LCD properties like rotation and BGR mode * @@ -259,6 +387,7 @@ static int blank(struct fbtft_par *par, bool on) .gamma = HSD20_IPS_GAMMA, .fbtftops = { .init_display = init_display, + .write_vmem = st7789v_write_vmem16_bus8, .set_var = set_var, .set_gamma = set_gamma, .blank = blank, diff --git a/drivers/staging/fbtft/fbtft.h b/drivers/staging/fbtft/fbtft.h index 76f8c09..93bac05 100644 --- a/drivers/staging/fbtft/fbtft.h +++ b/drivers/staging/fbtft/fbtft.h @@ -212,6 +212,7 @@ struct fbtft_par { struct gpio_desc *wr; struct gpio_desc *latch; struct gpio_desc *cs; + struct gpio_desc *te; struct gpio_desc *db[16]; struct gpio_desc *led[16]; struct gpio_desc *aux[16]; -- 1.9.1

3 2

[PATCH v9] staging: fbtft: add tearing signal detect
by Carlis 27 Jan '21

27 Jan '21

From: zhangxuezhi <zhangxuezhi1(a)yulong.com> For st7789v ic,add tearing signal detect to avoid screen tearing Signed-off-by: zhangxuezhi <zhangxuezhi1(a)yulong.com> --- v9: change pr_* to dev_* --- drivers/staging/fbtft/fb_st7789v.c | 132 ++++++++++++++++++++++++++++++++++++- drivers/staging/fbtft/fbtft.h | 1 + 2 files changed, 132 insertions(+), 1 deletion(-) diff --git a/drivers/staging/fbtft/fb_st7789v.c b/drivers/staging/fbtft/fb_st7789v.c index 3a280cc..9aa2f36 100644 --- a/drivers/staging/fbtft/fb_st7789v.c +++ b/drivers/staging/fbtft/fb_st7789v.c @@ -9,9 +9,12 @@ #include <linux/delay.h> #include <linux/init.h> #include <linux/kernel.h> +#include <linux/mutex.h> +#include <linux/interrupt.h> +#include <linux/completion.h> #include <linux/module.h> #include <video/mipi_display.h> - +#include <linux/gpio/consumer.h> #include "fbtft.h" #define DRVNAME "fb_st7789v" @@ -66,6 +69,32 @@ enum st7789v_command { #define MADCTL_MX BIT(6) /* bitmask for column address order */ #define MADCTL_MY BIT(7) /* bitmask for page address order */ +#define SPI_PANEL_TE_TIMEOUT 400 +static struct mutex te_mutex;/*mutex for tearing line*/ +static struct completion spi_panel_te; + +static irqreturn_t spi_panel_te_handler(int irq, void *data) +{ + complete(&spi_panel_te); + return IRQ_HANDLED; +} + +static void set_spi_panel_te_irq_status(struct fbtft_par *par, bool enable) +{ + static int te_irq_count; + + mutex_lock(&te_mutex); + + if (enable) { + if (++te_irq_count == 1) + enable_irq(gpiod_to_irq(par->gpio.te)); + } else { + if (--te_irq_count == 0) + disable_irq(gpiod_to_irq(par->gpio.te)); + } + mutex_unlock(&te_mutex); +} + /** * init_display() - initialize the display controller * @@ -82,6 +111,33 @@ enum st7789v_command { */ static int init_display(struct fbtft_par *par) { + int rc; + struct device *dev = par->info->device; + + par->gpio.te = devm_gpiod_get_index_optional(dev, "te", 0, GPIOD_IN); + if (IS_ERR(par->gpio.te)) { + rc = PTR_ERR(par->gpio.te); + dev_err(par->info->device, "Failed to request te gpio: %d\n", rc); + return rc; + } + if (par->gpio.te) { + init_completion(&spi_panel_te); + mutex_init(&te_mutex); + rc = devm_request_irq(dev, + gpiod_to_irq(par->gpio.te), + spi_panel_te_handler, IRQF_TRIGGER_RISING, + "TE_GPIO", par); + if (rc) { + dev_err(par->info->device, "TE request_irq failed.\n"); + devm_gpiod_put(dev, par->gpio.te); + return rc; + } + + disable_irq_nosync(gpiod_to_irq(par->gpio.te)); + } else { + dev_info(par->info->device, "%s:%d, TE gpio not specified\n", + __func__, __LINE__); + } /* turn off sleep mode */ write_reg(par, MIPI_DCS_EXIT_SLEEP_MODE); mdelay(120); @@ -137,6 +193,9 @@ static int init_display(struct fbtft_par *par) */ write_reg(par, PWCTRL1, 0xA4, 0xA1); + /*Tearing Effect Line On*/ + if (par->gpio.te) + write_reg(par, 0x35, 0x00); write_reg(par, MIPI_DCS_SET_DISPLAY_ON); if (HSD20_IPS) @@ -145,6 +204,76 @@ static int init_display(struct fbtft_par *par) return 0; } +/***************************************************************************** + * + * int (*write_vmem)(struct fbtft_par *par); + * + *****************************************************************************/ + +/* 16 bit pixel over 8-bit databus */ +static int st7789v_write_vmem16_bus8(struct fbtft_par *par, size_t offset, size_t len) +{ + u16 *vmem16; + __be16 *txbuf16 = par->txbuf.buf; + size_t remain; + size_t to_copy; + size_t tx_array_size; + int i; + int ret = 0; + size_t startbyte_size = 0; + + fbtft_par_dbg(DEBUG_WRITE_VMEM, par, "st7789v ---%s(offset=%zu, len=%zu)\n", + __func__, offset, len); + + remain = len / 2; + vmem16 = (u16 *)(par->info->screen_buffer + offset); + + if (par->gpio.dc) + gpiod_set_value(par->gpio.dc, 1); + + /* non buffered write */ + if (!par->txbuf.buf) + return par->fbtftops.write(par, vmem16, len); + + /* buffered write */ + tx_array_size = par->txbuf.len / 2; + + if (par->startbyte) { + txbuf16 = par->txbuf.buf + 1; + tx_array_size -= 2; + *(u8 *)(par->txbuf.buf) = par->startbyte | 0x2; + startbyte_size = 1; + } + + while (remain) { + to_copy = min(tx_array_size, remain); + dev_dbg(par->info->device, " to_copy=%zu, remain=%zu\n", + to_copy, remain - to_copy); + + for (i = 0; i < to_copy; i++) + txbuf16[i] = cpu_to_be16(vmem16[i]); + + vmem16 = vmem16 + to_copy; + if (par->gpio.te) { + set_spi_panel_te_irq_status(par, true); + reinit_completion(&spi_panel_te); + ret = wait_for_completion_timeout(&spi_panel_te, + msecs_to_jiffies(SPI_PANEL_TE_TIMEOUT)); + if (ret == 0) + dev_err(par->info->device, "wait panel TE time out\n"); + } + ret = par->fbtftops.write(par, par->txbuf.buf, + startbyte_size + to_copy * 2); + if (par->gpio.te) + set_spi_panel_te_irq_status(par, false); + if (ret < 0) + return ret; + remain -= to_copy; + } + + return ret; +} + /** * set_var() - apply LCD properties like rotation and BGR mode * @@ -259,6 +388,7 @@ static int blank(struct fbtft_par *par, bool on) .gamma = HSD20_IPS_GAMMA, .fbtftops = { .init_display = init_display, + .write_vmem = st7789v_write_vmem16_bus8, .set_var = set_var, .set_gamma = set_gamma, .blank = blank, diff --git a/drivers/staging/fbtft/fbtft.h b/drivers/staging/fbtft/fbtft.h index 76f8c09..93bac05 100644 --- a/drivers/staging/fbtft/fbtft.h +++ b/drivers/staging/fbtft/fbtft.h @@ -212,6 +212,7 @@ struct fbtft_par { struct gpio_desc *wr; struct gpio_desc *latch; struct gpio_desc *cs; + struct gpio_desc *te; struct gpio_desc *db[16]; struct gpio_desc *led[16]; struct gpio_desc *aux[16]; -- 1.9.1

4 4

Re: [PATCH 13/13] module: remove EXPORY_UNUSED_SYMBOL*
by Jessica Yu 27 Jan '21

27 Jan '21

+++ Christoph Hellwig [21/01/21 08:49 +0100]: >EXPORT_UNUSED_SYMBOL* is not actually used anywhere. Remove the >unused functionality as we generally just remove unused code anyway. > >Signed-off-by: Christoph Hellwig <hch(a)lst.de> >--- > arch/arm/configs/bcm2835_defconfig | 1 - > arch/arm/configs/mxs_defconfig | 1 - > arch/mips/configs/nlm_xlp_defconfig | 1 - > arch/mips/configs/nlm_xlr_defconfig | 1 - > arch/parisc/configs/generic-32bit_defconfig | 1 - > arch/parisc/configs/generic-64bit_defconfig | 1 - > arch/powerpc/configs/ppc6xx_defconfig | 1 - > arch/s390/configs/debug_defconfig | 1 - > arch/s390/configs/defconfig | 1 - > arch/sh/configs/edosk7760_defconfig | 1 - > arch/sh/configs/sdk7780_defconfig | 1 - > arch/x86/configs/i386_defconfig | 1 - > arch/x86/configs/x86_64_defconfig | 1 - > arch/x86/tools/relocs.c | 4 +- > include/asm-generic/vmlinux.lds.h | 28 --------- > include/linux/export.h | 8 --- > include/linux/module.h | 13 ---- > init/Kconfig | 17 ----- > kernel/module.c | 69 ++------------------- > scripts/checkpatch.pl | 6 +- > scripts/mod/modpost.c | 39 +----------- > scripts/mod/modpost.h | 2 - > scripts/module.lds.S | 4 -- > tools/include/linux/export.h | 2 - > 24 files changed, 13 insertions(+), 192 deletions(-) > >diff --git a/arch/arm/configs/bcm2835_defconfig b/arch/arm/configs/bcm2835_defconfig >index 44ff9cd88d8161..d6c6c2e031c43a 100644 >--- a/arch/arm/configs/bcm2835_defconfig >+++ b/arch/arm/configs/bcm2835_defconfig >@@ -177,7 +177,6 @@ CONFIG_BOOT_PRINTK_DELAY=y > CONFIG_DYNAMIC_DEBUG=y > CONFIG_DEBUG_INFO=y > # CONFIG_ENABLE_MUST_CHECK is not set >-CONFIG_UNUSED_SYMBOLS=y > CONFIG_DEBUG_MEMORY_INIT=y > CONFIG_LOCKUP_DETECTOR=y > CONFIG_SCHED_TRACER=y >diff --git a/arch/arm/configs/mxs_defconfig b/arch/arm/configs/mxs_defconfig >index a9c6f32a9b1c9d..ca32446b187f5d 100644 >--- a/arch/arm/configs/mxs_defconfig >+++ b/arch/arm/configs/mxs_defconfig >@@ -164,7 +164,6 @@ CONFIG_FONTS=y > CONFIG_PRINTK_TIME=y > CONFIG_DEBUG_INFO=y > CONFIG_FRAME_WARN=2048 >-CONFIG_UNUSED_SYMBOLS=y > CONFIG_MAGIC_SYSRQ=y > CONFIG_DEBUG_KERNEL=y > CONFIG_SOFTLOCKUP_DETECTOR=y >diff --git a/arch/mips/configs/nlm_xlp_defconfig b/arch/mips/configs/nlm_xlp_defconfig >index 72a211d2d556fd..32c29061172325 100644 >--- a/arch/mips/configs/nlm_xlp_defconfig >+++ b/arch/mips/configs/nlm_xlp_defconfig >@@ -549,7 +549,6 @@ CONFIG_PRINTK_TIME=y > CONFIG_DEBUG_INFO=y > # CONFIG_ENABLE_MUST_CHECK is not set > CONFIG_FRAME_WARN=1024 >-CONFIG_UNUSED_SYMBOLS=y > CONFIG_DEBUG_MEMORY_INIT=y > CONFIG_DETECT_HUNG_TASK=y > CONFIG_SCHEDSTATS=y >diff --git a/arch/mips/configs/nlm_xlr_defconfig b/arch/mips/configs/nlm_xlr_defconfig >index 4ecb157e56d427..bf9b9244929ecd 100644 >--- a/arch/mips/configs/nlm_xlr_defconfig >+++ b/arch/mips/configs/nlm_xlr_defconfig >@@ -500,7 +500,6 @@ CONFIG_CRC7=m > CONFIG_PRINTK_TIME=y > CONFIG_DEBUG_INFO=y > # CONFIG_ENABLE_MUST_CHECK is not set >-CONFIG_UNUSED_SYMBOLS=y > CONFIG_DEBUG_MEMORY_INIT=y > CONFIG_DETECT_HUNG_TASK=y > CONFIG_SCHEDSTATS=y >diff --git a/arch/parisc/configs/generic-32bit_defconfig b/arch/parisc/configs/generic-32bit_defconfig >index 3cbcfad5f7249d..7611d48c599e01 100644 >--- a/arch/parisc/configs/generic-32bit_defconfig >+++ b/arch/parisc/configs/generic-32bit_defconfig >@@ -22,7 +22,6 @@ CONFIG_PCI_LBA=y > CONFIG_MODULES=y > CONFIG_MODULE_UNLOAD=y > CONFIG_MODULE_FORCE_UNLOAD=y >-CONFIG_UNUSED_SYMBOLS=y > # CONFIG_BLK_DEV_BSG is not set > # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set > CONFIG_BINFMT_MISC=m >diff --git a/arch/parisc/configs/generic-64bit_defconfig b/arch/parisc/configs/generic-64bit_defconfig >index 8f81fcbf04c413..53054b81461a10 100644 >--- a/arch/parisc/configs/generic-64bit_defconfig >+++ b/arch/parisc/configs/generic-64bit_defconfig >@@ -31,7 +31,6 @@ CONFIG_MODULE_FORCE_LOAD=y > CONFIG_MODULE_UNLOAD=y > CONFIG_MODULE_FORCE_UNLOAD=y > CONFIG_MODVERSIONS=y >-CONFIG_UNUSED_SYMBOLS=y > CONFIG_BLK_DEV_INTEGRITY=y > CONFIG_BINFMT_MISC=m > # CONFIG_COMPACTION is not set >diff --git a/arch/powerpc/configs/ppc6xx_defconfig b/arch/powerpc/configs/ppc6xx_defconfig >index ef09f3cce1fa85..34c3859040f9f7 100644 >--- a/arch/powerpc/configs/ppc6xx_defconfig >+++ b/arch/powerpc/configs/ppc6xx_defconfig >@@ -1072,7 +1072,6 @@ CONFIG_NLS_ISO8859_15=m > CONFIG_NLS_KOI8_R=m > CONFIG_NLS_KOI8_U=m > CONFIG_DEBUG_INFO=y >-CONFIG_UNUSED_SYMBOLS=y > CONFIG_HEADERS_INSTALL=y > CONFIG_MAGIC_SYSRQ=y > CONFIG_DEBUG_KERNEL=y >diff --git a/arch/s390/configs/debug_defconfig b/arch/s390/configs/debug_defconfig >index c4f6ff98a612cd..58e54d17e3154b 100644 >--- a/arch/s390/configs/debug_defconfig >+++ b/arch/s390/configs/debug_defconfig >@@ -71,7 +71,6 @@ CONFIG_MODULE_FORCE_UNLOAD=y > CONFIG_MODVERSIONS=y > CONFIG_MODULE_SRCVERSION_ALL=y > CONFIG_MODULE_SIG_SHA256=y >-CONFIG_UNUSED_SYMBOLS=y > CONFIG_BLK_DEV_INTEGRITY=y > CONFIG_BLK_DEV_THROTTLING=y > CONFIG_BLK_WBT=y >diff --git a/arch/s390/configs/defconfig b/arch/s390/configs/defconfig >index 51135893cffe34..b5e62c0d3e23e0 100644 >--- a/arch/s390/configs/defconfig >+++ b/arch/s390/configs/defconfig >@@ -66,7 +66,6 @@ CONFIG_MODULE_FORCE_UNLOAD=y > CONFIG_MODVERSIONS=y > CONFIG_MODULE_SRCVERSION_ALL=y > CONFIG_MODULE_SIG_SHA256=y >-CONFIG_UNUSED_SYMBOLS=y > CONFIG_BLK_DEV_THROTTLING=y > CONFIG_BLK_WBT=y > CONFIG_BLK_CGROUP_IOLATENCY=y >diff --git a/arch/sh/configs/edosk7760_defconfig b/arch/sh/configs/edosk7760_defconfig >index 02ba622985769d..d77f54e906fd04 100644 >--- a/arch/sh/configs/edosk7760_defconfig >+++ b/arch/sh/configs/edosk7760_defconfig >@@ -102,7 +102,6 @@ CONFIG_NLS_UTF8=y > CONFIG_PRINTK_TIME=y > # CONFIG_ENABLE_MUST_CHECK is not set > CONFIG_MAGIC_SYSRQ=y >-CONFIG_UNUSED_SYMBOLS=y > CONFIG_DEBUG_KERNEL=y > CONFIG_DEBUG_SHIRQ=y > CONFIG_DETECT_HUNG_TASK=y >diff --git a/arch/sh/configs/sdk7780_defconfig b/arch/sh/configs/sdk7780_defconfig >index d10a0414123a51..d53c4595fb2e98 100644 >--- a/arch/sh/configs/sdk7780_defconfig >+++ b/arch/sh/configs/sdk7780_defconfig >@@ -130,7 +130,6 @@ CONFIG_NLS_ISO8859_15=y > CONFIG_NLS_UTF8=y > # CONFIG_ENABLE_MUST_CHECK is not set > CONFIG_MAGIC_SYSRQ=y >-CONFIG_UNUSED_SYMBOLS=y > CONFIG_DEBUG_KERNEL=y > CONFIG_DETECT_HUNG_TASK=y > # CONFIG_SCHED_DEBUG is not set >diff --git a/arch/x86/configs/i386_defconfig b/arch/x86/configs/i386_defconfig >index 78210793d357cf..9c9c4a888b1dbf 100644 >--- a/arch/x86/configs/i386_defconfig >+++ b/arch/x86/configs/i386_defconfig >@@ -50,7 +50,6 @@ CONFIG_JUMP_LABEL=y > CONFIG_MODULES=y > CONFIG_MODULE_UNLOAD=y > CONFIG_MODULE_FORCE_UNLOAD=y >-# CONFIG_UNUSED_SYMBOLS is not set > CONFIG_BINFMT_MISC=y > CONFIG_NET=y > CONFIG_PACKET=y >diff --git a/arch/x86/configs/x86_64_defconfig b/arch/x86/configs/x86_64_defconfig >index 9936528e19393a..b60bd2d8603499 100644 >--- a/arch/x86/configs/x86_64_defconfig >+++ b/arch/x86/configs/x86_64_defconfig >@@ -48,7 +48,6 @@ CONFIG_JUMP_LABEL=y > CONFIG_MODULES=y > CONFIG_MODULE_UNLOAD=y > CONFIG_MODULE_FORCE_UNLOAD=y >-# CONFIG_UNUSED_SYMBOLS is not set > CONFIG_BINFMT_MISC=y > CONFIG_NET=y > CONFIG_PACKET=y >diff --git a/arch/x86/tools/relocs.c b/arch/x86/tools/relocs.c >index 0d210d0e83e241..b9c577a3cacca6 100644 >--- a/arch/x86/tools/relocs.c >+++ b/arch/x86/tools/relocs.c >@@ -61,8 +61,8 @@ static const char * const sym_regex_kernel[S_NSYMTYPES] = { > "(__iommu_table|__apicdrivers|__smp_locks)(|_end)|" > "__(start|end)_pci_.*|" > "__(start|end)_builtin_fw|" >- "__(start|stop)___ksymtab(|_gpl|_unused|_unused_gpl)|" >- "__(start|stop)___kcrctab(|_gpl|_unused|_unused_gpl)|" >+ "__(start|stop)___ksymtab(|_gpl)|" >+ "__(start|stop)___kcrctab(|_gpl)|" > "__(start|stop)___param|" > "__(start|stop)___modver|" > "__(start|stop)___bug_table|" >diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h >index 83243506e68b00..1fa338ac6a5477 100644 >--- a/include/asm-generic/vmlinux.lds.h >+++ b/include/asm-generic/vmlinux.lds.h >@@ -481,20 +481,6 @@ > __stop___ksymtab_gpl = .; \ > } \ > \ >- /* Kernel symbol table: Normal unused symbols */ \ >- __ksymtab_unused : AT(ADDR(__ksymtab_unused) - LOAD_OFFSET) { \ >- __start___ksymtab_unused = .; \ >- KEEP(*(SORT(___ksymtab_unused+*))) \ >- __stop___ksymtab_unused = .; \ >- } \ >- \ >- /* Kernel symbol table: GPL-only unused symbols */ \ >- __ksymtab_unused_gpl : AT(ADDR(__ksymtab_unused_gpl) - LOAD_OFFSET) { \ >- __start___ksymtab_unused_gpl = .; \ >- KEEP(*(SORT(___ksymtab_unused_gpl+*))) \ >- __stop___ksymtab_unused_gpl = .; \ >- } \ >- \ > /* Kernel symbol table: Normal symbols */ \ > __kcrctab : AT(ADDR(__kcrctab) - LOAD_OFFSET) { \ > __start___kcrctab = .; \ >@@ -509,20 +495,6 @@ > __stop___kcrctab_gpl = .; \ > } \ > \ >- /* Kernel symbol table: Normal unused symbols */ \ >- __kcrctab_unused : AT(ADDR(__kcrctab_unused) - LOAD_OFFSET) { \ >- __start___kcrctab_unused = .; \ >- KEEP(*(SORT(___kcrctab_unused+*))) \ >- __stop___kcrctab_unused = .; \ >- } \ >- \ >- /* Kernel symbol table: GPL-only unused symbols */ \ >- __kcrctab_unused_gpl : AT(ADDR(__kcrctab_unused_gpl) - LOAD_OFFSET) { \ >- __start___kcrctab_unused_gpl = .; \ >- KEEP(*(SORT(___kcrctab_unused_gpl+*))) \ >- __stop___kcrctab_unused_gpl = .; \ >- } \ >- \ > /* Kernel symbol table: strings */ \ > __ksymtab_strings : AT(ADDR(__ksymtab_strings) - LOAD_OFFSET) { \ > *(__ksymtab_strings) \ >diff --git a/include/linux/export.h b/include/linux/export.h >index 362b64f8d4a7c2..6271a5d9c988fa 100644 >--- a/include/linux/export.h >+++ b/include/linux/export.h >@@ -160,14 +160,6 @@ struct kernel_symbol { > #define EXPORT_SYMBOL_NS(sym, ns) __EXPORT_SYMBOL(sym, "", #ns) > #define EXPORT_SYMBOL_NS_GPL(sym, ns) __EXPORT_SYMBOL(sym, "_gpl", #ns) > >-#ifdef CONFIG_UNUSED_SYMBOLS >-#define EXPORT_UNUSED_SYMBOL(sym) _EXPORT_SYMBOL(sym, "_unused") >-#define EXPORT_UNUSED_SYMBOL_GPL(sym) _EXPORT_SYMBOL(sym, "_unused_gpl") >-#else >-#define EXPORT_UNUSED_SYMBOL(sym) >-#define EXPORT_UNUSED_SYMBOL_GPL(sym) >-#endif >- > #endif /* !__ASSEMBLY__ */ > > #endif /* _LINUX_EXPORT_H */ >diff --git a/include/linux/module.h b/include/linux/module.h >index 8f4d577d4707c2..0e70596c9a704a 100644 >--- a/include/linux/module.h >+++ b/include/linux/module.h >@@ -392,18 +392,6 @@ struct module { > const s32 *gpl_crcs; > bool using_gplonly_symbols; > >-#ifdef CONFIG_UNUSED_SYMBOLS >- /* unused exported symbols. */ >- const struct kernel_symbol *unused_syms; >- const s32 *unused_crcs; >- unsigned int num_unused_syms; >- >- /* GPL-only, unused exported symbols. */ >- unsigned int num_unused_gpl_syms; >- const struct kernel_symbol *unused_gpl_syms; >- const s32 *unused_gpl_crcs; >-#endif >- > #ifdef CONFIG_MODULE_SIG > /* Signature was verified. */ > bool sig_ok; >@@ -592,7 +580,6 @@ struct symsearch { > GPL_ONLY, > WILL_BE_GPL_ONLY, > } license; >- bool unused; > }; Thanks for the cleanups. While we're here, I noticed that struct symsearch is only used internally in kernel/module.c, so I don't think it actually needs to be in include/linux/module.h. I don't see it used anywhere else. We could move maybe that to kernel/module-internal.h.

1 0

← Newer
1
...
24
25
26
27
28
29
30
...
74
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel January 2021