* [PATCH] drm/gma500: Remove 2D accel code
@ 2020-11-15 17:54 Patrik Jakobsson
2020-11-15 18:32 ` Sam Ravnborg
2020-11-15 18:55 ` Thomas Zimmermann
0 siblings, 2 replies; 6+ messages in thread
From: Patrik Jakobsson @ 2020-11-15 17:54 UTC (permalink / raw)
To: dri-devel; +Cc: tzimmermann
2D acceleration is only available on PSB and MRST and very slow on both
platforms. CPU acceleration is faster so don't bother with 2D accel
anymore.
Signed-off-by: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
---
drivers/gpu/drm/gma500/accel_2d.c | 292 -----------------------
drivers/gpu/drm/gma500/cdv_device.c | 1 -
drivers/gpu/drm/gma500/framebuffer.c | 16 +-
drivers/gpu/drm/gma500/mdfld_device.c | 1 -
drivers/gpu/drm/gma500/oaktrail_device.c | 1 -
drivers/gpu/drm/gma500/psb_device.c | 1 -
drivers/gpu/drm/gma500/psb_drv.c | 1 -
drivers/gpu/drm/gma500/psb_drv.h | 7 -
8 files changed, 1 insertion(+), 319 deletions(-)
diff --git a/drivers/gpu/drm/gma500/accel_2d.c b/drivers/gpu/drm/gma500/accel_2d.c
index adc0507545bf..437bbb6af9e6 100644
--- a/drivers/gpu/drm/gma500/accel_2d.c
+++ b/drivers/gpu/drm/gma500/accel_2d.c
@@ -58,295 +58,3 @@ void psb_spank(struct drm_psb_private *dev_priv)
(void) PSB_RSGX32(PSB_CR_BIF_CTRL);
PSB_WSGX32(dev_priv->gtt.gatt_start, PSB_CR_BIF_TWOD_REQ_BASE);
}
-
-/**
- * psb2_2d_wait_available - wait for FIFO room
- * @dev_priv: our DRM device
- * @size: size (in dwords) of the command we want to issue
- *
- * Wait until there is room to load the FIFO with our data. If the
- * device is not responding then reset it
- */
-static int psb_2d_wait_available(struct drm_psb_private *dev_priv,
- unsigned size)
-{
- uint32_t avail = PSB_RSGX32(PSB_CR_2D_SOCIF);
- unsigned long t = jiffies + HZ;
-
- while (avail < size) {
- avail = PSB_RSGX32(PSB_CR_2D_SOCIF);
- if (time_after(jiffies, t)) {
- psb_spank(dev_priv);
- return -EIO;
- }
- }
- return 0;
-}
-
-/**
- * psb_2d_submit - submit a 2D command
- * @dev_priv: our DRM device
- * @cmdbuf: command to issue
- * @size: length (in dwords)
- *
- * Issue one or more 2D commands to the accelerator. This needs to be
- * serialized later when we add the GEM interfaces for acceleration
- */
-static int psbfb_2d_submit(struct drm_psb_private *dev_priv, uint32_t *cmdbuf,
- unsigned size)
-{
- int ret = 0;
- int i;
- unsigned submit_size;
- unsigned long flags;
-
- spin_lock_irqsave(&dev_priv->lock_2d, flags);
- while (size > 0) {
- submit_size = (size < 0x60) ? size : 0x60;
- size -= submit_size;
- ret = psb_2d_wait_available(dev_priv, submit_size);
- if (ret)
- break;
-
- submit_size <<= 2;
-
- for (i = 0; i < submit_size; i += 4)
- PSB_WSGX32(*cmdbuf++, PSB_SGX_2D_SLAVE_PORT + i);
-
- (void)PSB_RSGX32(PSB_SGX_2D_SLAVE_PORT + i - 4);
- }
- spin_unlock_irqrestore(&dev_priv->lock_2d, flags);
- return ret;
-}
-
-
-/**
- * psb_accel_2d_copy_direction - compute blit order
- * @xdir: X direction of move
- * @ydir: Y direction of move
- *
- * Compute the correct order setings to ensure that an overlapping blit
- * correctly copies all the pixels.
- */
-static u32 psb_accel_2d_copy_direction(int xdir, int ydir)
-{
- if (xdir < 0)
- return (ydir < 0) ? PSB_2D_COPYORDER_BR2TL :
- PSB_2D_COPYORDER_TR2BL;
- else
- return (ydir < 0) ? PSB_2D_COPYORDER_BL2TR :
- PSB_2D_COPYORDER_TL2BR;
-}
-
-/**
- * psb_accel_2d_copy - accelerated 2D copy
- * @dev_priv: our DRM device
- * @src_offset in bytes
- * @src_stride in bytes
- * @src_format psb 2D format defines
- * @dst_offset in bytes
- * @dst_stride in bytes
- * @dst_format psb 2D format defines
- * @src_x offset in pixels
- * @src_y offset in pixels
- * @dst_x offset in pixels
- * @dst_y offset in pixels
- * @size_x of the copied area
- * @size_y of the copied area
- *
- * Format and issue a 2D accelerated copy command.
- */
-static int psb_accel_2d_copy(struct drm_psb_private *dev_priv,
- uint32_t src_offset, uint32_t src_stride,
- uint32_t src_format, uint32_t dst_offset,
- uint32_t dst_stride, uint32_t dst_format,
- uint16_t src_x, uint16_t src_y,
- uint16_t dst_x, uint16_t dst_y,
- uint16_t size_x, uint16_t size_y)
-{
- uint32_t blit_cmd;
- uint32_t buffer[10];
- uint32_t *buf;
- uint32_t direction;
-
- buf = buffer;
-
- direction =
- psb_accel_2d_copy_direction(src_x - dst_x, src_y - dst_y);
-
- if (direction == PSB_2D_COPYORDER_BR2TL ||
- direction == PSB_2D_COPYORDER_TR2BL) {
- src_x += size_x - 1;
- dst_x += size_x - 1;
- }
- if (direction == PSB_2D_COPYORDER_BR2TL ||
- direction == PSB_2D_COPYORDER_BL2TR) {
- src_y += size_y - 1;
- dst_y += size_y - 1;
- }
-
- blit_cmd =
- PSB_2D_BLIT_BH |
- PSB_2D_ROT_NONE |
- PSB_2D_DSTCK_DISABLE |
- PSB_2D_SRCCK_DISABLE |
- PSB_2D_USE_PAT | PSB_2D_ROP3_SRCCOPY | direction;
-
- *buf++ = PSB_2D_FENCE_BH;
- *buf++ =
- PSB_2D_DST_SURF_BH | dst_format | (dst_stride <<
- PSB_2D_DST_STRIDE_SHIFT);
- *buf++ = dst_offset;
- *buf++ =
- PSB_2D_SRC_SURF_BH | src_format | (src_stride <<
- PSB_2D_SRC_STRIDE_SHIFT);
- *buf++ = src_offset;
- *buf++ =
- PSB_2D_SRC_OFF_BH | (src_x << PSB_2D_SRCOFF_XSTART_SHIFT) |
- (src_y << PSB_2D_SRCOFF_YSTART_SHIFT);
- *buf++ = blit_cmd;
- *buf++ =
- (dst_x << PSB_2D_DST_XSTART_SHIFT) | (dst_y <<
- PSB_2D_DST_YSTART_SHIFT);
- *buf++ =
- (size_x << PSB_2D_DST_XSIZE_SHIFT) | (size_y <<
- PSB_2D_DST_YSIZE_SHIFT);
- *buf++ = PSB_2D_FLUSH_BH;
-
- return psbfb_2d_submit(dev_priv, buffer, buf - buffer);
-}
-
-/**
- * psbfb_copyarea_accel - copyarea acceleration for /dev/fb
- * @info: our framebuffer
- * @a: copyarea parameters from the framebuffer core
- *
- * Perform a 2D copy via the accelerator
- */
-static void psbfb_copyarea_accel(struct fb_info *info,
- const struct fb_copyarea *a)
-{
- struct drm_fb_helper *fb_helper = info->par;
- struct drm_framebuffer *fb = fb_helper->fb;
- struct drm_device *dev;
- struct drm_psb_private *dev_priv;
- uint32_t offset;
- uint32_t stride;
- uint32_t src_format;
- uint32_t dst_format;
-
- if (!fb)
- return;
-
- dev = fb->dev;
- dev_priv = dev->dev_private;
- offset = to_gtt_range(fb->obj[0])->offset;
- stride = fb->pitches[0];
-
- switch (fb->format->depth) {
- case 8:
- src_format = PSB_2D_SRC_332RGB;
- dst_format = PSB_2D_DST_332RGB;
- break;
- case 15:
- src_format = PSB_2D_SRC_555RGB;
- dst_format = PSB_2D_DST_555RGB;
- break;
- case 16:
- src_format = PSB_2D_SRC_565RGB;
- dst_format = PSB_2D_DST_565RGB;
- break;
- case 24:
- case 32:
- /* this is wrong but since we don't do blending its okay */
- src_format = PSB_2D_SRC_8888ARGB;
- dst_format = PSB_2D_DST_8888ARGB;
- break;
- default:
- /* software fallback */
- drm_fb_helper_cfb_copyarea(info, a);
- return;
- }
-
- if (!gma_power_begin(dev, false)) {
- drm_fb_helper_cfb_copyarea(info, a);
- return;
- }
- psb_accel_2d_copy(dev_priv,
- offset, stride, src_format,
- offset, stride, dst_format,
- a->sx, a->sy, a->dx, a->dy, a->width, a->height);
- gma_power_end(dev);
-}
-
-/**
- * psbfb_copyarea - 2D copy interface
- * @info: our framebuffer
- * @region: region to copy
- *
- * Copy an area of the framebuffer console either by the accelerator
- * or directly using the cfb helpers according to the request
- */
-void psbfb_copyarea(struct fb_info *info,
- const struct fb_copyarea *region)
-{
- if (unlikely(info->state != FBINFO_STATE_RUNNING))
- return;
-
- /* Avoid the 8 pixel erratum */
- if (region->width == 8 || region->height == 8 ||
- (info->flags & FBINFO_HWACCEL_DISABLED))
- return drm_fb_helper_cfb_copyarea(info, region);
-
- psbfb_copyarea_accel(info, region);
-}
-
-/**
- * psbfb_sync - synchronize 2D
- * @info: our framebuffer
- *
- * Wait for the 2D engine to quiesce so that we can do CPU
- * access to the framebuffer again
- */
-int psbfb_sync(struct fb_info *info)
-{
- struct drm_fb_helper *fb_helper = info->par;
- struct drm_framebuffer *fb = fb_helper->fb;
- struct drm_device *dev = fb->dev;
- struct drm_psb_private *dev_priv = dev->dev_private;
- unsigned long _end = jiffies + HZ;
- int busy = 0;
- unsigned long flags;
-
- spin_lock_irqsave(&dev_priv->lock_2d, flags);
- /*
- * First idle the 2D engine.
- */
-
- if ((PSB_RSGX32(PSB_CR_2D_SOCIF) == _PSB_C2_SOCIF_EMPTY) &&
- ((PSB_RSGX32(PSB_CR_2D_BLIT_STATUS) & _PSB_C2B_STATUS_BUSY) == 0))
- goto out;
-
- do {
- busy = (PSB_RSGX32(PSB_CR_2D_SOCIF) != _PSB_C2_SOCIF_EMPTY);
- cpu_relax();
- } while (busy && !time_after_eq(jiffies, _end));
-
- if (busy)
- busy = (PSB_RSGX32(PSB_CR_2D_SOCIF) != _PSB_C2_SOCIF_EMPTY);
- if (busy)
- goto out;
-
- do {
- busy = ((PSB_RSGX32(PSB_CR_2D_BLIT_STATUS) &
- _PSB_C2B_STATUS_BUSY) != 0);
- cpu_relax();
- } while (busy && !time_after_eq(jiffies, _end));
- if (busy)
- busy = ((PSB_RSGX32(PSB_CR_2D_BLIT_STATUS) &
- _PSB_C2B_STATUS_BUSY) != 0);
-
-out:
- spin_unlock_irqrestore(&dev_priv->lock_2d, flags);
- return (busy) ? -EBUSY : 0;
-}
diff --git a/drivers/gpu/drm/gma500/cdv_device.c b/drivers/gpu/drm/gma500/cdv_device.c
index 4d216a0205f2..e75293e4a52f 100644
--- a/drivers/gpu/drm/gma500/cdv_device.c
+++ b/drivers/gpu/drm/gma500/cdv_device.c
@@ -584,7 +584,6 @@ static int cdv_chip_setup(struct drm_device *dev)
const struct psb_ops cdv_chip_ops = {
.name = "GMA3600/3650",
- .accel_2d = 0,
.pipes = 2,
.crtcs = 2,
.hdmi_mask = (1 << 0) | (1 << 1),
diff --git a/drivers/gpu/drm/gma500/framebuffer.c b/drivers/gpu/drm/gma500/framebuffer.c
index 2d64c58607f5..fc4fda1d258b 100644
--- a/drivers/gpu/drm/gma500/framebuffer.c
+++ b/drivers/gpu/drm/gma500/framebuffer.c
@@ -144,17 +144,6 @@ static int psbfb_mmap(struct fb_info *info, struct vm_area_struct *vma)
return 0;
}
-static const struct fb_ops psbfb_ops = {
- .owner = THIS_MODULE,
- DRM_FB_HELPER_DEFAULT_OPS,
- .fb_setcolreg = psbfb_setcolreg,
- .fb_fillrect = drm_fb_helper_cfb_fillrect,
- .fb_copyarea = psbfb_copyarea,
- .fb_imageblit = drm_fb_helper_cfb_imageblit,
- .fb_mmap = psbfb_mmap,
- .fb_sync = psbfb_sync,
-};
-
static const struct fb_ops psbfb_unaccel_ops = {
.owner = THIS_MODULE,
DRM_FB_HELPER_DEFAULT_OPS,
@@ -318,10 +307,7 @@ static int psbfb_create(struct drm_fb_helper *fb_helper,
fb_helper->fb = fb;
- if (dev_priv->ops->accel_2d) /* 2D engine */
- info->fbops = &psbfb_ops;
- else /* Software */
- info->fbops = &psbfb_unaccel_ops;
+ info->fbops = &psbfb_unaccel_ops;
info->fix.smem_start = dev->mode_config.fb_base;
info->fix.smem_len = size;
diff --git a/drivers/gpu/drm/gma500/mdfld_device.c b/drivers/gpu/drm/gma500/mdfld_device.c
index be9cf6b1e3b3..b83d59b21de5 100644
--- a/drivers/gpu/drm/gma500/mdfld_device.c
+++ b/drivers/gpu/drm/gma500/mdfld_device.c
@@ -536,7 +536,6 @@ static int mdfld_chip_setup(struct drm_device *dev)
const struct psb_ops mdfld_chip_ops = {
.name = "mdfld",
- .accel_2d = 0,
.pipes = 3,
.crtcs = 3,
.lvds_mask = (1 << 1),
diff --git a/drivers/gpu/drm/gma500/oaktrail_device.c b/drivers/gpu/drm/gma500/oaktrail_device.c
index ade7e2416a66..8754290b0e23 100644
--- a/drivers/gpu/drm/gma500/oaktrail_device.c
+++ b/drivers/gpu/drm/gma500/oaktrail_device.c
@@ -536,7 +536,6 @@ static void oaktrail_teardown(struct drm_device *dev)
const struct psb_ops oaktrail_chip_ops = {
.name = "Oaktrail",
- .accel_2d = 1,
.pipes = 2,
.crtcs = 2,
.hdmi_mask = (1 << 1),
diff --git a/drivers/gpu/drm/gma500/psb_device.c b/drivers/gpu/drm/gma500/psb_device.c
index ece994c4c21a..2d21f8ec595f 100644
--- a/drivers/gpu/drm/gma500/psb_device.c
+++ b/drivers/gpu/drm/gma500/psb_device.c
@@ -318,7 +318,6 @@ static void psb_chip_teardown(struct drm_device *dev)
const struct psb_ops psb_chip_ops = {
.name = "Poulsbo",
- .accel_2d = 1,
.pipes = 2,
.crtcs = 2,
.hdmi_mask = (1 << 0),
diff --git a/drivers/gpu/drm/gma500/psb_drv.c b/drivers/gpu/drm/gma500/psb_drv.c
index 6e7197d89463..cc2d59e8471d 100644
--- a/drivers/gpu/drm/gma500/psb_drv.c
+++ b/drivers/gpu/drm/gma500/psb_drv.c
@@ -124,7 +124,6 @@ static int psb_do_init(struct drm_device *dev)
(stolen_gtt << PAGE_SHIFT) * 1024;
spin_lock_init(&dev_priv->irqmask_lock);
- spin_lock_init(&dev_priv->lock_2d);
PSB_WSGX32(0x00000000, PSB_CR_BIF_BANK0);
PSB_WSGX32(0x00000000, PSB_CR_BIF_BANK1);
diff --git a/drivers/gpu/drm/gma500/psb_drv.h b/drivers/gpu/drm/gma500/psb_drv.h
index ce6aae4b1bb2..5b7f7a312d53 100644
--- a/drivers/gpu/drm/gma500/psb_drv.h
+++ b/drivers/gpu/drm/gma500/psb_drv.h
@@ -576,9 +576,6 @@ struct drm_psb_private {
struct drm_fb_helper *fb_helper;
- /* 2D acceleration */
- spinlock_t lock_2d;
-
/* Panel brightness */
int brightness;
int brightness_adjusted;
@@ -615,7 +612,6 @@ struct drm_psb_private {
/* Operations for each board type */
struct psb_ops {
const char *name;
- unsigned int accel_2d:1;
int pipes; /* Number of output pipes */
int crtcs; /* Number of CRTCs */
int sgx_offset; /* Base offset of SGX device */
@@ -696,9 +692,6 @@ extern int psbfb_probed(struct drm_device *dev);
extern int psbfb_remove(struct drm_device *dev,
struct drm_framebuffer *fb);
/* accel_2d.c */
-extern void psbfb_copyarea(struct fb_info *info,
- const struct fb_copyarea *region);
-extern int psbfb_sync(struct fb_info *info);
extern void psb_spank(struct drm_psb_private *dev_priv);
/* psb_reset.c */
--
2.28.0
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] drm/gma500: Remove 2D accel code
2020-11-15 17:54 [PATCH] drm/gma500: Remove 2D accel code Patrik Jakobsson
@ 2020-11-15 18:32 ` Sam Ravnborg
2020-11-15 18:51 ` Patrik Jakobsson
2020-11-15 18:55 ` Thomas Zimmermann
1 sibling, 1 reply; 6+ messages in thread
From: Sam Ravnborg @ 2020-11-15 18:32 UTC (permalink / raw)
To: Patrik Jakobsson; +Cc: tzimmermann, dri-devel
Hi Patrik.
On Sun, Nov 15, 2020 at 06:54:20PM +0100, Patrik Jakobsson wrote:
> 2D acceleration is only available on PSB and MRST and very slow on both
> platforms. CPU acceleration is faster so don't bother with 2D accel
> anymore.
>
> Signed-off-by: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
I like the patch and it follows up on the discussions to
remove accellerations that is not really a benefit.
But I tried to apply it on top of drm-misc-next and it failed in
framebuffer.c - did you remove psbfb_roll_ops in another patch?
Sam
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] drm/gma500: Remove 2D accel code
2020-11-15 18:32 ` Sam Ravnborg
@ 2020-11-15 18:51 ` Patrik Jakobsson
2020-11-15 19:08 ` Sam Ravnborg
0 siblings, 1 reply; 6+ messages in thread
From: Patrik Jakobsson @ 2020-11-15 18:51 UTC (permalink / raw)
To: Sam Ravnborg; +Cc: Thomas Zimmermann, dri-devel
On Sun, Nov 15, 2020 at 7:32 PM Sam Ravnborg <sam@ravnborg.org> wrote:
>
> Hi Patrik.
> On Sun, Nov 15, 2020 at 06:54:20PM +0100, Patrik Jakobsson wrote:
> > 2D acceleration is only available on PSB and MRST and very slow on both
> > platforms. CPU acceleration is faster so don't bother with 2D accel
> > anymore.
> >
> > Signed-off-by: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
>
> I like the patch and it follows up on the discussions to
> remove accellerations that is not really a benefit.
> But I tried to apply it on top of drm-misc-next and it failed in
> framebuffer.c - did you remove psbfb_roll_ops in another patch?
Hi Sam,
Right, sorry I should have mentioned that it sits on top of
https://patchwork.freedesktop.org/series/83153/
-Patrik
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] drm/gma500: Remove 2D accel code
2020-11-15 17:54 [PATCH] drm/gma500: Remove 2D accel code Patrik Jakobsson
2020-11-15 18:32 ` Sam Ravnborg
@ 2020-11-15 18:55 ` Thomas Zimmermann
1 sibling, 0 replies; 6+ messages in thread
From: Thomas Zimmermann @ 2020-11-15 18:55 UTC (permalink / raw)
To: Patrik Jakobsson, dri-devel
Hi
Am 15.11.20 um 18:54 schrieb Patrik Jakobsson:
> 2D acceleration is only available on PSB and MRST and very slow on both
> platforms. CPU acceleration is faster so don't bother with 2D accel
> anymore.
>
> Signed-off-by: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
> ---
> drivers/gpu/drm/gma500/accel_2d.c | 292 -----------------------
> drivers/gpu/drm/gma500/cdv_device.c | 1 -
> drivers/gpu/drm/gma500/framebuffer.c | 16 +-
> drivers/gpu/drm/gma500/mdfld_device.c | 1 -
> drivers/gpu/drm/gma500/oaktrail_device.c | 1 -
> drivers/gpu/drm/gma500/psb_device.c | 1 -
> drivers/gpu/drm/gma500/psb_drv.c | 1 -
> drivers/gpu/drm/gma500/psb_drv.h | 7 -
> 8 files changed, 1 insertion(+), 319 deletions(-)
Nice :)
Reviewed-by: Thomas Zimmermann <tzimmermann@suse.de>
>
> diff --git a/drivers/gpu/drm/gma500/accel_2d.c b/drivers/gpu/drm/gma500/accel_2d.c
> index adc0507545bf..437bbb6af9e6 100644
> --- a/drivers/gpu/drm/gma500/accel_2d.c
> +++ b/drivers/gpu/drm/gma500/accel_2d.c
> @@ -58,295 +58,3 @@ void psb_spank(struct drm_psb_private *dev_priv)
> (void) PSB_RSGX32(PSB_CR_BIF_CTRL);
> PSB_WSGX32(dev_priv->gtt.gatt_start, PSB_CR_BIF_TWOD_REQ_BASE);
> }
> -
> -/**
> - * psb2_2d_wait_available - wait for FIFO room
> - * @dev_priv: our DRM device
> - * @size: size (in dwords) of the command we want to issue
> - *
> - * Wait until there is room to load the FIFO with our data. If the
> - * device is not responding then reset it
> - */
> -static int psb_2d_wait_available(struct drm_psb_private *dev_priv,
> - unsigned size)
> -{
> - uint32_t avail = PSB_RSGX32(PSB_CR_2D_SOCIF);
> - unsigned long t = jiffies + HZ;
> -
> - while (avail < size) {
> - avail = PSB_RSGX32(PSB_CR_2D_SOCIF);
> - if (time_after(jiffies, t)) {
> - psb_spank(dev_priv);
> - return -EIO;
> - }
> - }
> - return 0;
> -}
> -
> -/**
> - * psb_2d_submit - submit a 2D command
> - * @dev_priv: our DRM device
> - * @cmdbuf: command to issue
> - * @size: length (in dwords)
> - *
> - * Issue one or more 2D commands to the accelerator. This needs to be
> - * serialized later when we add the GEM interfaces for acceleration
> - */
> -static int psbfb_2d_submit(struct drm_psb_private *dev_priv, uint32_t *cmdbuf,
> - unsigned size)
> -{
> - int ret = 0;
> - int i;
> - unsigned submit_size;
> - unsigned long flags;
> -
> - spin_lock_irqsave(&dev_priv->lock_2d, flags);
> - while (size > 0) {
> - submit_size = (size < 0x60) ? size : 0x60;
> - size -= submit_size;
> - ret = psb_2d_wait_available(dev_priv, submit_size);
> - if (ret)
> - break;
> -
> - submit_size <<= 2;
> -
> - for (i = 0; i < submit_size; i += 4)
> - PSB_WSGX32(*cmdbuf++, PSB_SGX_2D_SLAVE_PORT + i);
> -
> - (void)PSB_RSGX32(PSB_SGX_2D_SLAVE_PORT + i - 4);
> - }
> - spin_unlock_irqrestore(&dev_priv->lock_2d, flags);
> - return ret;
> -}
> -
> -
> -/**
> - * psb_accel_2d_copy_direction - compute blit order
> - * @xdir: X direction of move
> - * @ydir: Y direction of move
> - *
> - * Compute the correct order setings to ensure that an overlapping blit
> - * correctly copies all the pixels.
> - */
> -static u32 psb_accel_2d_copy_direction(int xdir, int ydir)
> -{
> - if (xdir < 0)
> - return (ydir < 0) ? PSB_2D_COPYORDER_BR2TL :
> - PSB_2D_COPYORDER_TR2BL;
> - else
> - return (ydir < 0) ? PSB_2D_COPYORDER_BL2TR :
> - PSB_2D_COPYORDER_TL2BR;
> -}
> -
> -/**
> - * psb_accel_2d_copy - accelerated 2D copy
> - * @dev_priv: our DRM device
> - * @src_offset in bytes
> - * @src_stride in bytes
> - * @src_format psb 2D format defines
> - * @dst_offset in bytes
> - * @dst_stride in bytes
> - * @dst_format psb 2D format defines
> - * @src_x offset in pixels
> - * @src_y offset in pixels
> - * @dst_x offset in pixels
> - * @dst_y offset in pixels
> - * @size_x of the copied area
> - * @size_y of the copied area
> - *
> - * Format and issue a 2D accelerated copy command.
> - */
> -static int psb_accel_2d_copy(struct drm_psb_private *dev_priv,
> - uint32_t src_offset, uint32_t src_stride,
> - uint32_t src_format, uint32_t dst_offset,
> - uint32_t dst_stride, uint32_t dst_format,
> - uint16_t src_x, uint16_t src_y,
> - uint16_t dst_x, uint16_t dst_y,
> - uint16_t size_x, uint16_t size_y)
> -{
> - uint32_t blit_cmd;
> - uint32_t buffer[10];
> - uint32_t *buf;
> - uint32_t direction;
> -
> - buf = buffer;
> -
> - direction =
> - psb_accel_2d_copy_direction(src_x - dst_x, src_y - dst_y);
> -
> - if (direction == PSB_2D_COPYORDER_BR2TL ||
> - direction == PSB_2D_COPYORDER_TR2BL) {
> - src_x += size_x - 1;
> - dst_x += size_x - 1;
> - }
> - if (direction == PSB_2D_COPYORDER_BR2TL ||
> - direction == PSB_2D_COPYORDER_BL2TR) {
> - src_y += size_y - 1;
> - dst_y += size_y - 1;
> - }
> -
> - blit_cmd =
> - PSB_2D_BLIT_BH |
> - PSB_2D_ROT_NONE |
> - PSB_2D_DSTCK_DISABLE |
> - PSB_2D_SRCCK_DISABLE |
> - PSB_2D_USE_PAT | PSB_2D_ROP3_SRCCOPY | direction;
> -
> - *buf++ = PSB_2D_FENCE_BH;
> - *buf++ =
> - PSB_2D_DST_SURF_BH | dst_format | (dst_stride <<
> - PSB_2D_DST_STRIDE_SHIFT);
> - *buf++ = dst_offset;
> - *buf++ =
> - PSB_2D_SRC_SURF_BH | src_format | (src_stride <<
> - PSB_2D_SRC_STRIDE_SHIFT);
> - *buf++ = src_offset;
> - *buf++ =
> - PSB_2D_SRC_OFF_BH | (src_x << PSB_2D_SRCOFF_XSTART_SHIFT) |
> - (src_y << PSB_2D_SRCOFF_YSTART_SHIFT);
> - *buf++ = blit_cmd;
> - *buf++ =
> - (dst_x << PSB_2D_DST_XSTART_SHIFT) | (dst_y <<
> - PSB_2D_DST_YSTART_SHIFT);
> - *buf++ =
> - (size_x << PSB_2D_DST_XSIZE_SHIFT) | (size_y <<
> - PSB_2D_DST_YSIZE_SHIFT);
> - *buf++ = PSB_2D_FLUSH_BH;
> -
> - return psbfb_2d_submit(dev_priv, buffer, buf - buffer);
> -}
> -
> -/**
> - * psbfb_copyarea_accel - copyarea acceleration for /dev/fb
> - * @info: our framebuffer
> - * @a: copyarea parameters from the framebuffer core
> - *
> - * Perform a 2D copy via the accelerator
> - */
> -static void psbfb_copyarea_accel(struct fb_info *info,
> - const struct fb_copyarea *a)
> -{
> - struct drm_fb_helper *fb_helper = info->par;
> - struct drm_framebuffer *fb = fb_helper->fb;
> - struct drm_device *dev;
> - struct drm_psb_private *dev_priv;
> - uint32_t offset;
> - uint32_t stride;
> - uint32_t src_format;
> - uint32_t dst_format;
> -
> - if (!fb)
> - return;
> -
> - dev = fb->dev;
> - dev_priv = dev->dev_private;
> - offset = to_gtt_range(fb->obj[0])->offset;
> - stride = fb->pitches[0];
> -
> - switch (fb->format->depth) {
> - case 8:
> - src_format = PSB_2D_SRC_332RGB;
> - dst_format = PSB_2D_DST_332RGB;
> - break;
> - case 15:
> - src_format = PSB_2D_SRC_555RGB;
> - dst_format = PSB_2D_DST_555RGB;
> - break;
> - case 16:
> - src_format = PSB_2D_SRC_565RGB;
> - dst_format = PSB_2D_DST_565RGB;
> - break;
> - case 24:
> - case 32:
> - /* this is wrong but since we don't do blending its okay */
> - src_format = PSB_2D_SRC_8888ARGB;
> - dst_format = PSB_2D_DST_8888ARGB;
> - break;
> - default:
> - /* software fallback */
> - drm_fb_helper_cfb_copyarea(info, a);
> - return;
> - }
> -
> - if (!gma_power_begin(dev, false)) {
> - drm_fb_helper_cfb_copyarea(info, a);
> - return;
> - }
> - psb_accel_2d_copy(dev_priv,
> - offset, stride, src_format,
> - offset, stride, dst_format,
> - a->sx, a->sy, a->dx, a->dy, a->width, a->height);
> - gma_power_end(dev);
> -}
> -
> -/**
> - * psbfb_copyarea - 2D copy interface
> - * @info: our framebuffer
> - * @region: region to copy
> - *
> - * Copy an area of the framebuffer console either by the accelerator
> - * or directly using the cfb helpers according to the request
> - */
> -void psbfb_copyarea(struct fb_info *info,
> - const struct fb_copyarea *region)
> -{
> - if (unlikely(info->state != FBINFO_STATE_RUNNING))
> - return;
> -
> - /* Avoid the 8 pixel erratum */
> - if (region->width == 8 || region->height == 8 ||
> - (info->flags & FBINFO_HWACCEL_DISABLED))
> - return drm_fb_helper_cfb_copyarea(info, region);
> -
> - psbfb_copyarea_accel(info, region);
> -}
> -
> -/**
> - * psbfb_sync - synchronize 2D
> - * @info: our framebuffer
> - *
> - * Wait for the 2D engine to quiesce so that we can do CPU
> - * access to the framebuffer again
> - */
> -int psbfb_sync(struct fb_info *info)
> -{
> - struct drm_fb_helper *fb_helper = info->par;
> - struct drm_framebuffer *fb = fb_helper->fb;
> - struct drm_device *dev = fb->dev;
> - struct drm_psb_private *dev_priv = dev->dev_private;
> - unsigned long _end = jiffies + HZ;
> - int busy = 0;
> - unsigned long flags;
> -
> - spin_lock_irqsave(&dev_priv->lock_2d, flags);
> - /*
> - * First idle the 2D engine.
> - */
> -
> - if ((PSB_RSGX32(PSB_CR_2D_SOCIF) == _PSB_C2_SOCIF_EMPTY) &&
> - ((PSB_RSGX32(PSB_CR_2D_BLIT_STATUS) & _PSB_C2B_STATUS_BUSY) == 0))
> - goto out;
> -
> - do {
> - busy = (PSB_RSGX32(PSB_CR_2D_SOCIF) != _PSB_C2_SOCIF_EMPTY);
> - cpu_relax();
> - } while (busy && !time_after_eq(jiffies, _end));
> -
> - if (busy)
> - busy = (PSB_RSGX32(PSB_CR_2D_SOCIF) != _PSB_C2_SOCIF_EMPTY);
> - if (busy)
> - goto out;
> -
> - do {
> - busy = ((PSB_RSGX32(PSB_CR_2D_BLIT_STATUS) &
> - _PSB_C2B_STATUS_BUSY) != 0);
> - cpu_relax();
> - } while (busy && !time_after_eq(jiffies, _end));
> - if (busy)
> - busy = ((PSB_RSGX32(PSB_CR_2D_BLIT_STATUS) &
> - _PSB_C2B_STATUS_BUSY) != 0);
> -
> -out:
> - spin_unlock_irqrestore(&dev_priv->lock_2d, flags);
> - return (busy) ? -EBUSY : 0;
> -}
> diff --git a/drivers/gpu/drm/gma500/cdv_device.c b/drivers/gpu/drm/gma500/cdv_device.c
> index 4d216a0205f2..e75293e4a52f 100644
> --- a/drivers/gpu/drm/gma500/cdv_device.c
> +++ b/drivers/gpu/drm/gma500/cdv_device.c
> @@ -584,7 +584,6 @@ static int cdv_chip_setup(struct drm_device *dev)
>
> const struct psb_ops cdv_chip_ops = {
> .name = "GMA3600/3650",
> - .accel_2d = 0,
> .pipes = 2,
> .crtcs = 2,
> .hdmi_mask = (1 << 0) | (1 << 1),
> diff --git a/drivers/gpu/drm/gma500/framebuffer.c b/drivers/gpu/drm/gma500/framebuffer.c
> index 2d64c58607f5..fc4fda1d258b 100644
> --- a/drivers/gpu/drm/gma500/framebuffer.c
> +++ b/drivers/gpu/drm/gma500/framebuffer.c
> @@ -144,17 +144,6 @@ static int psbfb_mmap(struct fb_info *info, struct vm_area_struct *vma)
> return 0;
> }
>
> -static const struct fb_ops psbfb_ops = {
> - .owner = THIS_MODULE,
> - DRM_FB_HELPER_DEFAULT_OPS,
> - .fb_setcolreg = psbfb_setcolreg,
> - .fb_fillrect = drm_fb_helper_cfb_fillrect,
> - .fb_copyarea = psbfb_copyarea,
> - .fb_imageblit = drm_fb_helper_cfb_imageblit,
> - .fb_mmap = psbfb_mmap,
> - .fb_sync = psbfb_sync,
> -};
> -
> static const struct fb_ops psbfb_unaccel_ops = {
> .owner = THIS_MODULE,
> DRM_FB_HELPER_DEFAULT_OPS,
> @@ -318,10 +307,7 @@ static int psbfb_create(struct drm_fb_helper *fb_helper,
>
> fb_helper->fb = fb;
>
> - if (dev_priv->ops->accel_2d) /* 2D engine */
> - info->fbops = &psbfb_ops;
> - else /* Software */
> - info->fbops = &psbfb_unaccel_ops;
> + info->fbops = &psbfb_unaccel_ops;
>
> info->fix.smem_start = dev->mode_config.fb_base;
> info->fix.smem_len = size;
> diff --git a/drivers/gpu/drm/gma500/mdfld_device.c b/drivers/gpu/drm/gma500/mdfld_device.c
> index be9cf6b1e3b3..b83d59b21de5 100644
> --- a/drivers/gpu/drm/gma500/mdfld_device.c
> +++ b/drivers/gpu/drm/gma500/mdfld_device.c
> @@ -536,7 +536,6 @@ static int mdfld_chip_setup(struct drm_device *dev)
>
> const struct psb_ops mdfld_chip_ops = {
> .name = "mdfld",
> - .accel_2d = 0,
> .pipes = 3,
> .crtcs = 3,
> .lvds_mask = (1 << 1),
> diff --git a/drivers/gpu/drm/gma500/oaktrail_device.c b/drivers/gpu/drm/gma500/oaktrail_device.c
> index ade7e2416a66..8754290b0e23 100644
> --- a/drivers/gpu/drm/gma500/oaktrail_device.c
> +++ b/drivers/gpu/drm/gma500/oaktrail_device.c
> @@ -536,7 +536,6 @@ static void oaktrail_teardown(struct drm_device *dev)
>
> const struct psb_ops oaktrail_chip_ops = {
> .name = "Oaktrail",
> - .accel_2d = 1,
> .pipes = 2,
> .crtcs = 2,
> .hdmi_mask = (1 << 1),
> diff --git a/drivers/gpu/drm/gma500/psb_device.c b/drivers/gpu/drm/gma500/psb_device.c
> index ece994c4c21a..2d21f8ec595f 100644
> --- a/drivers/gpu/drm/gma500/psb_device.c
> +++ b/drivers/gpu/drm/gma500/psb_device.c
> @@ -318,7 +318,6 @@ static void psb_chip_teardown(struct drm_device *dev)
>
> const struct psb_ops psb_chip_ops = {
> .name = "Poulsbo",
> - .accel_2d = 1,
> .pipes = 2,
> .crtcs = 2,
> .hdmi_mask = (1 << 0),
> diff --git a/drivers/gpu/drm/gma500/psb_drv.c b/drivers/gpu/drm/gma500/psb_drv.c
> index 6e7197d89463..cc2d59e8471d 100644
> --- a/drivers/gpu/drm/gma500/psb_drv.c
> +++ b/drivers/gpu/drm/gma500/psb_drv.c
> @@ -124,7 +124,6 @@ static int psb_do_init(struct drm_device *dev)
> (stolen_gtt << PAGE_SHIFT) * 1024;
>
> spin_lock_init(&dev_priv->irqmask_lock);
> - spin_lock_init(&dev_priv->lock_2d);
>
> PSB_WSGX32(0x00000000, PSB_CR_BIF_BANK0);
> PSB_WSGX32(0x00000000, PSB_CR_BIF_BANK1);
> diff --git a/drivers/gpu/drm/gma500/psb_drv.h b/drivers/gpu/drm/gma500/psb_drv.h
> index ce6aae4b1bb2..5b7f7a312d53 100644
> --- a/drivers/gpu/drm/gma500/psb_drv.h
> +++ b/drivers/gpu/drm/gma500/psb_drv.h
> @@ -576,9 +576,6 @@ struct drm_psb_private {
>
> struct drm_fb_helper *fb_helper;
>
> - /* 2D acceleration */
> - spinlock_t lock_2d;
> -
> /* Panel brightness */
> int brightness;
> int brightness_adjusted;
> @@ -615,7 +612,6 @@ struct drm_psb_private {
> /* Operations for each board type */
> struct psb_ops {
> const char *name;
> - unsigned int accel_2d:1;
> int pipes; /* Number of output pipes */
> int crtcs; /* Number of CRTCs */
> int sgx_offset; /* Base offset of SGX device */
> @@ -696,9 +692,6 @@ extern int psbfb_probed(struct drm_device *dev);
> extern int psbfb_remove(struct drm_device *dev,
> struct drm_framebuffer *fb);
> /* accel_2d.c */
> -extern void psbfb_copyarea(struct fb_info *info,
> - const struct fb_copyarea *region);
> -extern int psbfb_sync(struct fb_info *info);
> extern void psb_spank(struct drm_psb_private *dev_priv);
>
> /* psb_reset.c */
>
--
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Felix Imendörffer
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] drm/gma500: Remove 2D accel code
2020-11-15 18:51 ` Patrik Jakobsson
@ 2020-11-15 19:08 ` Sam Ravnborg
2020-11-15 19:16 ` Patrik Jakobsson
0 siblings, 1 reply; 6+ messages in thread
From: Sam Ravnborg @ 2020-11-15 19:08 UTC (permalink / raw)
To: Patrik Jakobsson; +Cc: Thomas Zimmermann, dri-devel
Hi Patrik,
On Sun, Nov 15, 2020 at 07:51:27PM +0100, Patrik Jakobsson wrote:
> On Sun, Nov 15, 2020 at 7:32 PM Sam Ravnborg <sam@ravnborg.org> wrote:
> >
> > Hi Patrik.
> > On Sun, Nov 15, 2020 at 06:54:20PM +0100, Patrik Jakobsson wrote:
> > > 2D acceleration is only available on PSB and MRST and very slow on both
> > > platforms. CPU acceleration is faster so don't bother with 2D accel
> > > anymore.
> > >
> > > Signed-off-by: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
> >
> > I like the patch and it follows up on the discussions to
> > remove accellerations that is not really a benefit.
> > But I tried to apply it on top of drm-misc-next and it failed in
> > framebuffer.c - did you remove psbfb_roll_ops in another patch?
>
> Hi Sam,
> Right, sorry I should have mentioned that it sits on top of
> https://patchwork.freedesktop.org/series/83153/
I thought I had seen something like this before.
So all is good - patch is:
Reviewed-by: Sam Ravnborg <sam@ravnborg.org>
Sam
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] drm/gma500: Remove 2D accel code
2020-11-15 19:08 ` Sam Ravnborg
@ 2020-11-15 19:16 ` Patrik Jakobsson
0 siblings, 0 replies; 6+ messages in thread
From: Patrik Jakobsson @ 2020-11-15 19:16 UTC (permalink / raw)
To: Sam Ravnborg; +Cc: Thomas Zimmermann, dri-devel
On Sun, Nov 15, 2020 at 8:08 PM Sam Ravnborg <sam@ravnborg.org> wrote:
>
> Hi Patrik,
> On Sun, Nov 15, 2020 at 07:51:27PM +0100, Patrik Jakobsson wrote:
> > On Sun, Nov 15, 2020 at 7:32 PM Sam Ravnborg <sam@ravnborg.org> wrote:
> > >
> > > Hi Patrik.
> > > On Sun, Nov 15, 2020 at 06:54:20PM +0100, Patrik Jakobsson wrote:
> > > > 2D acceleration is only available on PSB and MRST and very slow on both
> > > > platforms. CPU acceleration is faster so don't bother with 2D accel
> > > > anymore.
> > > >
> > > > Signed-off-by: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
> > >
> > > I like the patch and it follows up on the discussions to
> > > remove accellerations that is not really a benefit.
> > > But I tried to apply it on top of drm-misc-next and it failed in
> > > framebuffer.c - did you remove psbfb_roll_ops in another patch?
> >
> > Hi Sam,
> > Right, sorry I should have mentioned that it sits on top of
> > https://patchwork.freedesktop.org/series/83153/
>
> I thought I had seen something like this before.
> So all is good - patch is:
> Reviewed-by: Sam Ravnborg <sam@ravnborg.org>
Great, thanks for the review. Patches are pushed to drm-misc-next
>
> Sam
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-11-15 19:16 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-15 17:54 [PATCH] drm/gma500: Remove 2D accel code Patrik Jakobsson
2020-11-15 18:32 ` Sam Ravnborg
2020-11-15 18:51 ` Patrik Jakobsson
2020-11-15 19:08 ` Sam Ravnborg
2020-11-15 19:16 ` Patrik Jakobsson
2020-11-15 18:55 ` Thomas Zimmermann
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.