From: Thomas Zimmermann <tzimmermann@suse.de>
To: airlied@linux.ie, daniel@ffwll.ch,
maarten.lankhorst@linux.intel.com, mripard@kernel.org,
sean@poorly.run, b.zolnierkie@samsung.com, ajax@redhat.com,
ville.syrjala@linux.intel.com, malat@debian.org,
michel@daenzer.net
Cc: gregkh@linuxfoundation.org, linux-fbdev@vger.kernel.org,
Thomas Zimmermann <tzimmermann@suse.de>,
dri-devel@lists.freedesktop.org, corbet@lwn.net
Subject: [PATCH v2 09/15] drm/fbconv: Mode-setting pipeline enable / disable
Date: Mon, 14 Oct 2019 14:04:10 +0000 [thread overview]
Message-ID: <20191014140416.28517-10-tzimmermann@suse.de> (raw)
In-Reply-To: <20191014140416.28517-1-tzimmermann@suse.de>
The display mode is set by converting the DRM display mode to an
fb_info state and handling it to the fbdev driver's fb_setvar()
function. This also requires a color depth, which we take from the
value of struct drm_mode_config.preferred_depth
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
---
drivers/gpu/drm/drm_fbconv_helper.c | 113 +++++++++++++++++++++++++++-
include/drm/drm_fbconv_helper.h | 2 +
2 files changed, 113 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/drm_fbconv_helper.c b/drivers/gpu/drm/drm_fbconv_helper.c
index cf218016ac05..ca8b43c91266 100644
--- a/drivers/gpu/drm/drm_fbconv_helper.c
+++ b/drivers/gpu/drm/drm_fbconv_helper.c
@@ -919,6 +919,24 @@ static int drm_fbconv_update_fb_var_screeninfo_from_framebuffer(
return 0;
}
+static int drm_fbconv_update_fb_var_screeninfo_from_simple_display_pipe(
+ struct fb_var_screeninfo *fb_var, struct drm_simple_display_pipe *pipe)
+{
+ struct drm_plane *primary = pipe->crtc.primary;
+ struct drm_fbconv_modeset *modeset = drm_fbconv_modeset_of_pipe(pipe);
+
+ if (primary && primary->state && primary->state->fb)
+ return drm_fbconv_update_fb_var_screeninfo_from_framebuffer(
+ fb_var, primary->state->fb,
+ modeset->fb_info->fix.smem_len);
+
+ fb_var->xres_virtual = fb_var->xres;
+ fb_var->yres_virtual = fb_var->yres;
+ fb_var->bits_per_pixel = modeset->dev->mode_config.preferred_depth;
+
+ return 0;
+}
+
/**
* drm_fbconv_simple_display_pipe_mode_valid - default implementation for
* struct drm_simple_display_pipe_funcs.mode_valid
@@ -950,6 +968,28 @@ bool drm_fbconv_simple_display_pipe_mode_fixup(
struct drm_crtc *crtc, const struct drm_display_mode *mode,
struct drm_display_mode *adjusted_mode)
{
+ struct drm_simple_display_pipe *pipe + container_of(crtc, struct drm_simple_display_pipe, crtc);
+ struct drm_fbconv_modeset *modeset = drm_fbconv_modeset_of_pipe(pipe);
+ struct fb_var_screeninfo fb_var;
+ int ret;
+
+ if (!modeset->fb_info->fbops->fb_check_var)
+ return true;
+
+ drm_fbconv_init_fb_var_screeninfo_from_mode(&fb_var, mode);
+
+ ret = drm_fbconv_update_fb_var_screeninfo_from_simple_display_pipe(
+ &fb_var, &modeset->pipe);
+ if (ret)
+ return true;
+
+ ret = modeset->fb_info->fbops->fb_check_var(&fb_var, modeset->fb_info);
+ if (ret < 0)
+ return false;
+
+ drm_mode_update_from_fb_var_screeninfo(adjusted_mode, &fb_var);
+
return true;
}
EXPORT_SYMBOL(drm_fbconv_simple_display_pipe_mode_fixup);
@@ -1000,6 +1040,32 @@ int drm_fbconv_blit_rect(void *dst, void *vaddr, struct drm_framebuffer *fb,
}
EXPORT_SYMBOL(drm_fbconv_blit_rect);
+/**
+ * drm_fbconv_blit_fullscreen - copy all pixel data from a framebuffer
+ * to the hardware buffer
+ * @dst: the on-screen hardware buffer
+ * @vaddr: the source buffer in kernel address space
+ * @fb: the framebuffer of the source buffer
+ * Returns:
+ * 0 on success, or
+ * a negative error code otherwise.
+ *
+ * This function is equivalent to drm_fbconv_blit_rect(), but copies the
+ * framebuffer's complete content.
+ */
+int drm_fbconv_blit_fullscreen(void *dst, void *vaddr,
+ struct drm_framebuffer *fb)
+{
+ struct drm_rect fullscreen = {
+ .x1 = 0,
+ .x2 = fb->width,
+ .y1 = 0,
+ .y2 = fb->height,
+ };
+ return drm_fbconv_blit_rect(dst, vaddr, fb, &fullscreen);
+}
+EXPORT_SYMBOL(drm_fbconv_blit_fullscreen);
+
/**
* drm_fbconv_simple_display_pipe_enable - default implementation for
* struct drm_simple_display_pipe_funcs.enable
@@ -1011,7 +1077,46 @@ void
drm_fbconv_simple_display_pipe_enable(struct drm_simple_display_pipe *pipe,
struct drm_crtc_state *crtc_state,
struct drm_plane_state *plane_state)
-{ }
+{
+ struct drm_fbconv_modeset *modeset;
+ struct fb_var_screeninfo fb_var;
+ int ret;
+
+ /* As this is atomic mode setting, any function call is not
+ * allowed to fail. If it does, an additional test should be
+ * added to simple_display_pipe_check().
+ */
+
+ modeset = drm_fbconv_modeset_of_pipe(pipe);
+
+ drm_fbconv_init_fb_var_screeninfo_from_mode(
+ &fb_var, &crtc_state->adjusted_mode);
+
+ if (plane_state && plane_state->fb) {
+ ret = drm_fbconv_update_fb_var_screeninfo_from_framebuffer(
+ &fb_var, plane_state->fb,
+ modeset->fb_info->fix.smem_len);
+ if (ret)
+ return;
+ } else {
+ fb_var.xres_virtual = fb_var.xres;
+ fb_var.yres_virtual = fb_var.yres;
+ }
+
+ fb_var.activate = FB_ACTIVATE_NOW;
+
+ ret = fb_set_var(modeset->fb_info, &fb_var);
+ if (ret) {
+ DRM_ERROR("fbconv: fb_set_var() failed: %d\n", ret);
+ return;
+ }
+
+ fb_blank(modeset->fb_info, FB_BLANK_UNBLANK);
+
+ drm_fbconv_blit_fullscreen(modeset->blit.screen_base,
+ modeset->blit.vmap,
+ plane_state->fb);
+}
EXPORT_SYMBOL(drm_fbconv_simple_display_pipe_enable);
/**
@@ -1021,7 +1126,11 @@ EXPORT_SYMBOL(drm_fbconv_simple_display_pipe_enable);
*/
void
drm_fbconv_simple_display_pipe_disable(struct drm_simple_display_pipe *pipe)
-{ }
+{
+ struct drm_fbconv_modeset *modeset = drm_fbconv_modeset_of_pipe(pipe);
+
+ fb_blank(modeset->fb_info, FB_BLANK_POWERDOWN);
+}
EXPORT_SYMBOL(drm_fbconv_simple_display_pipe_disable);
/**
diff --git a/include/drm/drm_fbconv_helper.h b/include/drm/drm_fbconv_helper.h
index 3e62b5e80af6..c7d211f40462 100644
--- a/include/drm/drm_fbconv_helper.h
+++ b/include/drm/drm_fbconv_helper.h
@@ -94,6 +94,8 @@ drm_fbconv_simple_display_pipe_cleanup_fb(struct drm_simple_display_pipe *pipe,
int drm_fbconv_blit_rect(void *dst, void *vaddr, struct drm_framebuffer *fb,
struct drm_rect *rect);
+int drm_fbconv_blit_fullscreen(void *dst, void *vaddr,
+ struct drm_framebuffer *fb);
/*
* Modeset helpers
--
2.23.0
next prev parent reply other threads:[~2019-10-14 14:04 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-14 14:04 [PATCH v2 00/15] DRM fbconv helpers for converting fbdev drivers Thomas Zimmermann
2019-10-14 14:04 ` [PATCH v2 01/15] fbdev: Export fb_check_foreignness() Thomas Zimmermann
2019-10-14 14:04 ` [PATCH v2 02/15] fbdev: Export FBPIXMAPSIZE Thomas Zimmermann
2019-10-14 14:04 ` [PATCH v2 03/15] drm/simple-kms-helper: Add mode_fixup() to simple display pipe Thomas Zimmermann
2019-10-14 14:04 ` [PATCH v2 04/15] drm: Add fbconv helper module Thomas Zimmermann
2019-10-14 14:04 ` [PATCH v2 05/15] drm/fbconv: Add DRM <-> fbdev pixel-format conversion Thomas Zimmermann
2019-10-14 20:30 ` Sam Ravnborg
2019-10-15 5:48 ` Thomas Zimmermann
2019-10-14 14:04 ` [PATCH v2 06/15] drm/fbconv: Add mode conversion DRM <-> fbdev Thomas Zimmermann
2019-10-14 14:04 ` [PATCH v2 07/15] drm/fbconv: Add modesetting infrastructure Thomas Zimmermann
2019-10-14 14:04 ` [PATCH v2 08/15] drm/fbconv: Add plane-state check and update Thomas Zimmermann
2019-10-15 8:30 ` kbuild test robot
2019-10-15 17:28 ` kbuild test robot
2019-10-14 14:04 ` Thomas Zimmermann [this message]
2022-05-28 20:17 ` [PATCH v2 09/15] drm/fbconv: Mode-setting pipeline enable / disable Geert Uytterhoeven
2022-05-30 7:47 ` Thomas Zimmermann
2022-05-30 8:34 ` Geert Uytterhoeven
2022-07-01 20:01 ` Geert Uytterhoeven
2019-10-14 14:04 ` [PATCH v2 10/15] drm/fbconv: Reimplement several fbdev interfaces Thomas Zimmermann
2019-10-14 14:04 ` [PATCH v2 11/15] drm/fbconv: Add helpers for init and cleanup of fb_info structures Thomas Zimmermann
2019-10-14 14:04 ` [PATCH v2 12/15] drm/fbconv: Add helper documentation Thomas Zimmermann
2019-10-15 8:40 ` kbuild test robot
2019-10-14 14:04 ` [PATCH v2 13/15] staging: Add mgakms driver Thomas Zimmermann
2019-10-14 14:04 ` [PATCH v2 15/15] staging/mgakms: Update matroxfb driver code for DRM Thomas Zimmermann
2019-10-17 16:19 ` kbuild test robot
2019-10-14 20:36 ` [PATCH v2 00/15] DRM fbconv helpers for converting fbdev drivers Sam Ravnborg
2019-10-15 6:11 ` Thomas Zimmermann
[not found] ` <20191014140416.28517-15-tzimmermann@suse.de>
2019-10-15 11:48 ` [PATCH v2 14/15] staging/mgakms: Import matroxfb driver source code Ville Syrjälä
2019-10-15 12:46 ` Thomas Zimmermann
2019-10-15 14:33 ` [PATCH v2 00/15] DRM fbconv helpers for converting fbdev drivers Daniel Vetter
2019-10-15 17:28 ` Thomas Zimmermann
2019-10-15 17:48 ` Daniel Vetter
2019-10-15 18:05 ` Greg KH
2019-10-15 18:13 ` Ville Syrjälä
2019-10-15 18:28 ` Ville Syrjälä
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191014140416.28517-10-tzimmermann@suse.de \
--to=tzimmermann@suse.de \
--cc=airlied@linux.ie \
--cc=ajax@redhat.com \
--cc=b.zolnierkie@samsung.com \
--cc=corbet@lwn.net \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-fbdev@vger.kernel.org \
--cc=maarten.lankhorst@linux.intel.com \
--cc=malat@debian.org \
--cc=michel@daenzer.net \
--cc=mripard@kernel.org \
--cc=sean@poorly.run \
--cc=ville.syrjala@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).