dri-devel June 2020

dri-devel@lists.freedesktop.org

315 participants
731 discussions

[PATCH 25/38] vt: redefine world of cursor macros
by Jiri Slaby 15 Jun '20

15 Jun '20

The cursor code used to use magic constants, ANDs, ORs, and some macros. Redefine all this to make some sense. In particular: * Drop CUR_DEFAULT, which is CUR_UNDERLINE. CUR_DEFAULT was used only for cur_default variable initialization, so use CUR_UNDERLINE there to make obvious what's the default. * Drop CUR_HWMASK. Instead, define CUR_SIZE() which explains it more. And use it all over the places. * Define few more masks and bits which will be used in next patches instead of magic constants. * Define CUR_MAKE to build up cursor value. Signed-off-by: Jiri Slaby <jslaby(a)suse.cz> Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie(a)samsung.com> Cc: dri-devel(a)lists.freedesktop.org Cc: linux-fbdev(a)vger.kernel.org --- drivers/tty/vt/vt.c | 2 +- drivers/video/fbdev/core/bitblit.c | 2 +- drivers/video/fbdev/core/fbcon_ccw.c | 2 +- drivers/video/fbdev/core/fbcon_cw.c | 2 +- drivers/video/fbdev/core/fbcon_ud.c | 2 +- include/linux/console_struct.h | 28 +++++++++++++++++----------- 6 files changed, 22 insertions(+), 16 deletions(-) diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c index f7d5a3c3845f..af1ef717f416 100644 --- a/drivers/tty/vt/vt.c +++ b/drivers/tty/vt/vt.c @@ -163,7 +163,7 @@ module_param(default_utf8, int, S_IRUGO | S_IWUSR); int global_cursor_default = -1; module_param(global_cursor_default, int, S_IRUGO | S_IWUSR); -static int cur_default = CUR_DEFAULT; +static int cur_default = CUR_UNDERLINE; module_param(cur_default, int, S_IRUGO | S_IWUSR); /* diff --git a/drivers/video/fbdev/core/bitblit.c b/drivers/video/fbdev/core/bitblit.c index c750470a31ec..3b002b365a5a 100644 --- a/drivers/video/fbdev/core/bitblit.c +++ b/drivers/video/fbdev/core/bitblit.c @@ -325,7 +325,7 @@ static void bit_cursor(struct vc_data *vc, struct fb_info *info, int mode, ops->p->cursor_shape = vc->vc_cursor_type; cursor.set |= FB_CUR_SETSHAPE; - switch (ops->p->cursor_shape & CUR_HWMASK) { + switch (CUR_SIZE(ops->p->cursor_shape)) { case CUR_NONE: cur_height = 0; break; diff --git a/drivers/video/fbdev/core/fbcon_ccw.c b/drivers/video/fbdev/core/fbcon_ccw.c index 9d06446a1a3b..5b67bcebe34c 100644 --- a/drivers/video/fbdev/core/fbcon_ccw.c +++ b/drivers/video/fbdev/core/fbcon_ccw.c @@ -325,7 +325,7 @@ static void ccw_cursor(struct vc_data *vc, struct fb_info *info, int mode, ops->p->cursor_shape = vc->vc_cursor_type; cursor.set |= FB_CUR_SETSHAPE; - switch (ops->p->cursor_shape & CUR_HWMASK) { + switch (CUR_SIZE(ops->p->cursor_shape)) { case CUR_NONE: cur_height = 0; break; diff --git a/drivers/video/fbdev/core/fbcon_cw.c b/drivers/video/fbdev/core/fbcon_cw.c index 4b5f76bb01e5..f1aab3ae3bc9 100644 --- a/drivers/video/fbdev/core/fbcon_cw.c +++ b/drivers/video/fbdev/core/fbcon_cw.c @@ -308,7 +308,7 @@ static void cw_cursor(struct vc_data *vc, struct fb_info *info, int mode, ops->p->cursor_shape = vc->vc_cursor_type; cursor.set |= FB_CUR_SETSHAPE; - switch (ops->p->cursor_shape & CUR_HWMASK) { + switch (CUR_SIZE(ops->p->cursor_shape)) { case CUR_NONE: cur_height = 0; break; diff --git a/drivers/video/fbdev/core/fbcon_ud.c b/drivers/video/fbdev/core/fbcon_ud.c index 7e0ae3549dc7..81ed6f6bed67 100644 --- a/drivers/video/fbdev/core/fbcon_ud.c +++ b/drivers/video/fbdev/core/fbcon_ud.c @@ -348,7 +348,7 @@ static void ud_cursor(struct vc_data *vc, struct fb_info *info, int mode, ops->p->cursor_shape = vc->vc_cursor_type; cursor.set |= FB_CUR_SETSHAPE; - switch (ops->p->cursor_shape & CUR_HWMASK) { + switch (CUR_SIZE(ops->p->cursor_shape)) { case CUR_NONE: cur_height = 0; break; diff --git a/include/linux/console_struct.h b/include/linux/console_struct.h index 40ed52f67bc5..153734816b49 100644 --- a/include/linux/console_struct.h +++ b/include/linux/console_struct.h @@ -173,17 +173,23 @@ struct vc { extern struct vc vc_cons [MAX_NR_CONSOLES]; extern void vc_SAK(struct work_struct *work); -#define CUR_DEF 0 -#define CUR_NONE 1 -#define CUR_UNDERLINE 2 -#define CUR_LOWER_THIRD 3 -#define CUR_LOWER_HALF 4 -#define CUR_TWO_THIRDS 5 -#define CUR_BLOCK 6 -#define CUR_HWMASK 0x0f -#define CUR_SWMASK 0xfff0 - -#define CUR_DEFAULT CUR_UNDERLINE +#define CUR_MAKE(size, change, set) ((size) | ((change) << 8) | \ + ((set) << 16)) +#define CUR_SIZE(c) ((c) & 0x00000f) +# define CUR_DEF 0 +# define CUR_NONE 1 +# define CUR_UNDERLINE 2 +# define CUR_LOWER_THIRD 3 +# define CUR_LOWER_HALF 4 +# define CUR_TWO_THIRDS 5 +# define CUR_BLOCK 6 +#define CUR_SW 0x000010 +#define CUR_ALWAYS_BG 0x000020 +#define CUR_INVERT_FG_BG 0x000040 +#define CUR_FG 0x000700 +#define CUR_BG 0x007000 +#define CUR_CHANGE(c) ((c) & 0x00ff00) +#define CUR_SET(c) (((c) & 0xff0000) >> 8) bool con_is_visible(const struct vc_data *vc); -- 2.27.0

1 0

[PATCH] drm/i915: remove unnecessary conversion to bool
by Bernard Zhao 15 Jun '20

15 Jun '20

In function perform_bb_shadow, bb->ppgtt is bool, so maybe there is no need to convert the bool condition to bool. This change is to make the code a bit readable. Signed-off-by: Bernard Zhao <bernard(a)vivo.com> --- drivers/gpu/drm/i915/gvt/cmd_parser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/gvt/cmd_parser.c b/drivers/gpu/drm/i915/gvt/cmd_parser.c index 8b87f130f7f1..221eaebfe513 100644 --- a/drivers/gpu/drm/i915/gvt/cmd_parser.c +++ b/drivers/gpu/drm/i915/gvt/cmd_parser.c @@ -1880,7 +1880,7 @@ static int perform_bb_shadow(struct parser_exec_state *s) if (!bb) return -ENOMEM; - bb->ppgtt = (s->buf_addr_type == GTT_BUFFER) ? false : true; + bb->ppgtt = (s->buf_addr_type != GTT_BUFFER); /* the start_offset stores the batch buffer's start gma's * offset relative to page boundary. so for non-privileged batch -- 2.17.1

1 0

[PATCH v1 0/6] 180° rotation support for NVIDIA Tegra DRM
by Dmitry Osipenko 14 Jun '20

14 Jun '20

Hello! This series adds 180° display plane rotation support to the NVIDIA Tegra DRM driver which is needed for devices that have display panel physically mounted upside-down, like Nexus 7 tablet device for example [1]. Since DRM panel rotation is a new thing for a userspace, currently only Opentegra Xorg driver handles the rotated display panel [2], but this is good enough for the start. Note that later on it should be possible to implement a transparent 180° display rotation for Tegra DRM driver which will remove the need to have a bleeding edge userspace that knows how to rotate display planes and I'm slowly working on it. For the starter we can go with the minimal rotation support, so it's not a blocker. This series is based on the work that was made by Derek Basehore for the Mediatek driver [3], his patches are included into this patchset. I added my tested-by tags to the Derek's patches. Please review and apply, thanks in advance! [1] https://patchwork.ozlabs.org/project/linux-tegra/patch/20200607154327.18589… [2] https://github.com/grate-driver/xf86-video-opentegra/commit/28eb20a3959bbe5… [3] https://lkml.org/lkml/2020/3/5/1119 Derek Basehore (2): drm/panel: Add helper for reading DT rotation drm/panel: Set display info in panel attach Dmitry Osipenko (4): drm/panel: lvds: Set up panel orientation drm/tegra: plane: Rename bottom_up to reflect_y drm/tegra: plane: Support horizontal reflection mode drm/tegra: plane: Support 180° rotation drivers/gpu/drm/drm_panel.c | 56 ++++++++++++++++++++++++++++ drivers/gpu/drm/panel/panel-lvds.c | 6 +++ drivers/gpu/drm/tegra/dc.c | 43 ++++++++++++++++++---- drivers/gpu/drm/tegra/dc.h | 3 +- drivers/gpu/drm/tegra/plane.c | 3 +- drivers/gpu/drm/tegra/plane.h | 3 +- include/drm/drm_panel.h | 59 ++++++++++++++++++++++++++++++ 7 files changed, 162 insertions(+), 11 deletions(-) -- 2.26.0

1 7

[PATCH] drm/vc4: fix ref count leak in vc4_dsi_encoder_enable
by Navid Emamdoost 14 Jun '20

14 Jun '20

in vc4_dsi_encoder_enable, the call to pm_runtime_get_sync increments the counter even in case of failure, leading to incorrect ref count. In case of failure, decrement the ref count before returning. Signed-off-by: Navid Emamdoost <navid.emamdoost(a)gmail.com> --- drivers/gpu/drm/vc4/vc4_dsi.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_dsi.c b/drivers/gpu/drm/vc4/vc4_dsi.c index eaf276978ee7..e651de9d1c7d 100644 --- a/drivers/gpu/drm/vc4/vc4_dsi.c +++ b/drivers/gpu/drm/vc4/vc4_dsi.c @@ -838,7 +838,7 @@ static void vc4_dsi_encoder_enable(struct drm_encoder *encoder) ret = pm_runtime_get_sync(dev); if (ret) { DRM_ERROR("Failed to runtime PM enable on DSI%d\n", dsi->port); - return; + goto out; } if (debug_dump_regs) { @@ -916,13 +916,13 @@ static void vc4_dsi_encoder_enable(struct drm_encoder *encoder) ret = clk_prepare_enable(dsi->escape_clock); if (ret) { DRM_ERROR("Failed to turn on DSI escape clock: %d\n", ret); - return; + goto out; } ret = clk_prepare_enable(dsi->pll_phy_clock); if (ret) { DRM_ERROR("Failed to turn on DSI PLL: %d\n", ret); - return; + goto out; } hs_clock = clk_get_rate(dsi->pll_phy_clock); @@ -944,7 +944,7 @@ static void vc4_dsi_encoder_enable(struct drm_encoder *encoder) ret = clk_prepare_enable(dsi->pixel_clock); if (ret) { DRM_ERROR("Failed to turn on DSI pixel clock: %d\n", ret); - return; + goto out; } /* How many ns one DSI unit interval is. Note that the clock @@ -1088,6 +1088,8 @@ static void vc4_dsi_encoder_enable(struct drm_encoder *encoder) dev_info(&dsi->pdev->dev, "DSI regs after:\n"); drm_print_regset32(&p, &dsi->regset); } +out: + pm_runtime_put(dev); } static ssize_t vc4_dsi_host_transfer(struct mipi_dsi_host *host, -- 2.17.1

2 2

Re: [PATCH] drm/amdgpu: fix ref count leak in amdgpu_display_crtc_set_config
by Markus Elfring 14 Jun '20

14 Jun '20

> in amdgpu_display_crtc_set_config, … * Can the term “reference count” become relevant also for this commit message besides other possible adjustments? * Can it be nicer to combine proposed updates for this software module as a patch series (with a cover letter)? * Would you like to add the tag “Fixes”? … > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c … > @@ -306,6 +306,7 @@ int amdgpu_display_crtc_set_config(struct drm_mode_set *set, > adev->have_disp_power_ref = false; > } > > +out: > /* drop the power reference we got coming in here */ > pm_runtime_put_autosuspend(dev->dev); > return ret; Perhaps use the label “put_runtime” instead? Regards, Markus

1 0

Re: [PATCH] drm/vc4: fix ref count leak in vc4_dsi_encoder_enable
by Markus Elfring 14 Jun '20

14 Jun '20

> in vc4_dsi_encoder_enable, the call to pm_runtime_get_sync increments > the counter even in case of failure, leading to incorrect > ref count. In case of failure, decrement the ref count before returning. * Can the term “reference count” become relevant also for this commit message besides other possible adjustments? * Can it be nicer to combine proposed updates for this software module as a patch series (with a cover letter)? * Would you like to add the tag “Fixes”? … > +++ b/drivers/gpu/drm/vc4/vc4_dsi.c … > @@ -1088,6 +1088,8 @@ static void vc4_dsi_encoder_enable(struct drm_encoder *encoder) > dev_info(&dsi->pdev->dev, "DSI regs after:\n"); > drm_print_regset32(&p, &dsi->regset); > } > +out: > + pm_runtime_put(dev); > } … * Perhaps use the label “put_runtime” instead? * Do you propose to perform an additional function call always (and not only according to failure cases)? * How do you think about calling the function “pm_runtime_put_noidle”? Regards, Markus

1 0

Re: [PATCH] drm/panfrost: fix ref count leak in panfrost_job_hw_submit
by Markus Elfring 14 Jun '20

14 Jun '20

> in panfrost_job_hw_submit, … * Can the term “reference count” become relevant also for this commit message besides other possible adjustments? * Would you like to add the tag “Fixes”? … > +++ b/drivers/gpu/drm/panfrost/panfrost_job.c … > @@ -184,6 +183,9 @@ static void panfrost_job_hw_submit(struct panfrost_job *job, int js) > job, js, jc_head); > > job_write(pfdev, JS_COMMAND_NEXT(js), JS_COMMAND_START); > +out: > + pm_runtime_put_sync_autosuspend(pfdev->dev); > + return; > } … Perhaps use the label “put_sync” instead? Regards, Markus

1 0

Re: [PATCH] drm/panfrost: fix ref count leak in panfrost_job_hw_submit
by Markus Elfring 14 Jun '20

14 Jun '20

1 0

Re: [PATCH] drm/panfrost: fix ref count leak in panfrost_job_hw_submit
by Markus Elfring 14 Jun '20

14 Jun '20

1 0

Re: [PATCH] mtd: rawnand: brcmnand: force raw OOB writes
by Kamal Dasu 14 Jun '20

14 Jun '20

On Fri, Jun 5, 2020 at 1:07 PM Álvaro Fernández Rojas <noltari(a)gmail.com> wrote: > > MTD_OPS_AUTO_OOB is writting OOB with ECC enabled, which changes all ECC bytes > from an erased page to 0x00 when JFFS2 cleanmarkers are added with mtd-utils. > | BBI | JFFS2 | ECC | JFFS2 | Spare | > 00000800 ff ff 19 85 20 03 00 00 00 00 00 00 08 ff ff ff > > However, if OOB is written with ECC disabled, the JFFS2 cleanmarkers are > correctly written without changing the ECC bytes: > | BBI | JFFS2 | ECC | JFFS2 | Spare | > 00000800 ff ff 19 85 20 03 ff ff ff 00 00 00 08 ff ff ff Both brcmand_write_oob_raw() and brcmnand_write_oob() use brcmnand_write() that uses PROGRAM_PAGE cmd, means also programs data areas and ECC when enabled is always calculated on DATA+OOB. since in both cases we only want to modify OOB, data is always assumed to be 0xffs (means erased state). So as far as this api always is used on the erased page it should be good. Are the sub-pages/oob areas read by jffs2 also read without ecc enabled?. Just want to be sure that it does not break any other utilities like nandwrite. > > Signed-off-by: Álvaro Fernández Rojas <noltari(a)gmail.com> > --- > drivers/mtd/nand/raw/brcmnand/brcmnand.c | 9 +-------- > 1 file changed, 1 insertion(+), 8 deletions(-) > > diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand.c b/drivers/mtd/nand/raw/brcmnand/brcmnand.c > index 8f9ffb46a09f..566281770841 100644 > --- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c > +++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c > @@ -2279,13 +2279,6 @@ static int brcmnand_write_page_raw(struct nand_chip *chip, const uint8_t *buf, > return nand_prog_page_end_op(chip); > } > > -static int brcmnand_write_oob(struct nand_chip *chip, int page) > -{ > - return brcmnand_write(nand_to_mtd(chip), chip, > - (u64)page << chip->page_shift, NULL, > - chip->oob_poi); > -} > - > static int brcmnand_write_oob_raw(struct nand_chip *chip, int page) > { > struct mtd_info *mtd = nand_to_mtd(chip); > @@ -2642,7 +2635,7 @@ static int brcmnand_init_cs(struct brcmnand_host *host, struct device_node *dn) > chip->ecc.write_oob_raw = brcmnand_write_oob_raw; > chip->ecc.read_oob_raw = brcmnand_read_oob_raw; > chip->ecc.read_oob = brcmnand_read_oob; > - chip->ecc.write_oob = brcmnand_write_oob; > + chip->ecc.write_oob = brcmnand_write_oob_raw; > > chip->controller = &ctrl->controller; > > -- > 2.26.2 >

2 3

← Newer
1
...
50
51
52
53
54
55
56
...
74
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel June 2020