[PATCH] drm/fb: revert the i915 Actually configure untiled displays from master

[PATCH] drm/fb: revert the i915 Actually configure untiled displays from master

[Dave Airlie]

From: Dave Airlie <airlied@redhat.com>

This code moved in here in master, so revert it the same way.

Signed-off-by: Dave Airlie <airlied@redhat.com>
---
 drivers/gpu/drm/drm_fb_helper.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
index 4de4b9d59d49..226c0910ba91 100644
--- a/drivers/gpu/drm/drm_fb_helper.c
+++ b/drivers/gpu/drm/drm_fb_helper.c
@@ -2580,7 +2580,7 @@ static bool drm_fb_helper_firmware_config(struct drm_fb_helper *fb_helper,
 {
 	struct drm_device *dev = fb_helper->dev;
 	unsigned int count = min(fb_helper->connector_count, BITS_PER_LONG);
-	unsigned long conn_configured, conn_seq;
+	unsigned long conn_configured, conn_seq, mask;
 	int i, j;
 	bool *save_enabled;
 	bool fallback = true, ret = true;
@@ -2598,9 +2598,10 @@ static bool drm_fb_helper_firmware_config(struct drm_fb_helper *fb_helper,
 		drm_modeset_backoff(&ctx);
 
 	memcpy(save_enabled, enabled, count);
-	conn_seq = GENMASK(count - 1, 0);
+	mask = GENMASK(count - 1, 0);
 	conn_configured = 0;
 retry:
+	conn_seq = conn_configured;
 	for (i = 0; i < count; i++) {
 		struct drm_fb_helper_connector *fb_conn;
 		struct drm_connector *connector;
@@ -2613,8 +2614,7 @@ static bool drm_fb_helper_firmware_config(struct drm_fb_helper *fb_helper,
 		if (conn_configured & BIT(i))
 			continue;
 
-		/* First pass, only consider tiled connectors */
-		if (conn_seq == GENMASK(count - 1, 0) && !connector->has_tile)
+		if (conn_seq == 0 && !connector->has_tile)
 			continue;
 
 		if (connector->status == connector_status_connected)
@@ -2715,10 +2715,8 @@ static bool drm_fb_helper_firmware_config(struct drm_fb_helper *fb_helper,
 		conn_configured |= BIT(i);
 	}
 
-	if (conn_configured != conn_seq) { /* repeat until no more are found */
-		conn_seq = conn_configured;
+	if ((conn_configured & mask) != mask && conn_configured != conn_seq)
 		goto retry;
-	}
 
 	/*
 	 * If the BIOS didn't enable everything it could, fall back to have the
-- 
2.20.1

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH] drm/fb: revert the i915 Actually configure untiled displays from master

[Daniel Vetter]

On Wed, Apr 24, 2019 at 8:35 AM Dave Airlie <airlied@gmail.com> wrote:
>
> From: Dave Airlie <airlied@redhat.com>
>
> This code moved in here in master, so revert it the same way.
>
> Signed-off-by: Dave Airlie <airlied@redhat.com>

Would be good to reference the revert from -fixes here I think, e.g.

This is the same revert as 9fa246256e09 ("Revert "drm/i915/fbdev:
Actually configure untiled displays"") in drm-fixes.

Also adding Noralf for double-checking.
-Daniel

> ---
>  drivers/gpu/drm/drm_fb_helper.c | 12 +++++-------
>  1 file changed, 5 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
> index 4de4b9d59d49..226c0910ba91 100644
> --- a/drivers/gpu/drm/drm_fb_helper.c
> +++ b/drivers/gpu/drm/drm_fb_helper.c
> @@ -2580,7 +2580,7 @@ static bool drm_fb_helper_firmware_config(struct drm_fb_helper *fb_helper,
>  {
>         struct drm_device *dev = fb_helper->dev;
>         unsigned int count = min(fb_helper->connector_count, BITS_PER_LONG);
> -       unsigned long conn_configured, conn_seq;
> +       unsigned long conn_configured, conn_seq, mask;
>         int i, j;
>         bool *save_enabled;
>         bool fallback = true, ret = true;
> @@ -2598,9 +2598,10 @@ static bool drm_fb_helper_firmware_config(struct drm_fb_helper *fb_helper,
>                 drm_modeset_backoff(&ctx);
>
>         memcpy(save_enabled, enabled, count);
> -       conn_seq = GENMASK(count - 1, 0);
> +       mask = GENMASK(count - 1, 0);
>         conn_configured = 0;
>  retry:
> +       conn_seq = conn_configured;
>         for (i = 0; i < count; i++) {
>                 struct drm_fb_helper_connector *fb_conn;
>                 struct drm_connector *connector;
> @@ -2613,8 +2614,7 @@ static bool drm_fb_helper_firmware_config(struct drm_fb_helper *fb_helper,
>                 if (conn_configured & BIT(i))
>                         continue;
>
> -               /* First pass, only consider tiled connectors */
> -               if (conn_seq == GENMASK(count - 1, 0) && !connector->has_tile)
> +               if (conn_seq == 0 && !connector->has_tile)
>                         continue;
>
>                 if (connector->status == connector_status_connected)
> @@ -2715,10 +2715,8 @@ static bool drm_fb_helper_firmware_config(struct drm_fb_helper *fb_helper,
>                 conn_configured |= BIT(i);
>         }
>
> -       if (conn_configured != conn_seq) { /* repeat until no more are found */
> -               conn_seq = conn_configured;
> +       if ((conn_configured & mask) != mask && conn_configured != conn_seq)
>                 goto retry;
> -       }
>
>         /*
>          * If the BIOS didn't enable everything it could, fall back to have the
> --
> 2.20.1
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel



-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel