[xserver,2/2] modesetting: Only add main fb if necessary

Submitted by Hans de Goede on June 1, 2016, 7:04 p.m.

Details

Message ID 1464807881-9258-2-git-send-email-hdegoede@redhat.com
State Accepted
Commit 4313122dea0df9affc280ee698e929489061ccc6
Headers show
Series "Series without cover letter" ( rev: 1 ) in X.org (DEPRECATED - USE GITLAB)

Not browsing as part of any series.

Commit Message

Hans de Goede June 1, 2016, 7:04 p.m. 
If we're doing reverse-prime; or doing rotation the main fb is not used,
and there is no reason to add it in this case.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 hw/xfree86/drivers/modesetting/drmmode_display.c | 34 ++++++++++++------------
 1 file changed, 17 insertions(+), 17 deletions(-)

Patch hide | download patch | download mbox 

diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c b/hw/xfree86/drivers/modesetting/drmmode_display.c
index 2fe46e9..9eb21e2 100644
--- a/hw/xfree86/drivers/modesetting/drmmode_display.c
+++ b/hw/xfree86/drivers/modesetting/drmmode_display.c
@@ -408,24 +408,8 @@  drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
     int output_count = 0;
     Bool ret = TRUE;
     int i;
-    uint32_t fb_id;
+    uint32_t fb_id = 0;
     drmModeModeInfo kmode;
-    int height;
-
-    height = pScrn->virtualY;
-
-    if (drmmode->fb_id == 0) {
-        ret = drmModeAddFB(drmmode->fd,
-                           pScrn->virtualX, height,
-                           pScrn->depth, pScrn->bitsPerPixel,
-                           drmmode_bo_get_pitch(&drmmode->front_bo),
-                           drmmode_bo_get_handle(&drmmode->front_bo),
-                           &drmmode->fb_id);
-        if (ret < 0) {
-            ErrorF("failed to add fb %d\n", ret);
-            return FALSE;
-        }
-    }
 
     saved_mode = crtc->mode;
     saved_x = crtc->x;
@@ -484,6 +468,22 @@  drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
             fb_id = drmmode_crtc->rotate_fb_id;
             x = y = 0;
         }
+
+        if (fb_id == 0) {
+            ret = drmModeAddFB(drmmode->fd,
+                               pScrn->virtualX, pScrn->virtualY,
+                               pScrn->depth, pScrn->bitsPerPixel,
+                               drmmode_bo_get_pitch(&drmmode->front_bo),
+                               drmmode_bo_get_handle(&drmmode->front_bo),
+                               &drmmode->fb_id);
+            if (ret < 0) {
+                ErrorF("failed to add fb %d\n", ret);
+                ret = FALSE;
+                goto done;
+            }
+            fb_id = drmmode->fb_id;
+        }
+
         if (drmModeSetCrtc(drmmode->fd, drmmode_crtc->mode_crtc->crtc_id,
                            fb_id, x, y, output_ids, output_count, &kmode)) {
             xf86DrvMsg(crtc->scrn->scrnIndex, X_ERROR,

Comments

Dave Airlie June 14, 2016, 5:11 a.m. 
These two are

Reviewed-by: Dave Airlie <airlied@redhat.com>

Can you take a look at Lyude's patch just posted? not sure if it'll
conflict with these.

Dave.

On 2 June 2016 at 05:04, Hans de Goede <hdegoede@redhat.com> wrote:
> If we're doing reverse-prime; or doing rotation the main fb is not used,
> and there is no reason to add it in this case.
>
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
> ---
>  hw/xfree86/drivers/modesetting/drmmode_display.c | 34 ++++++++++++------------
>  1 file changed, 17 insertions(+), 17 deletions(-)
>
> diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c b/hw/xfree86/drivers/modesetting/drmmode_display.c
> index 2fe46e9..9eb21e2 100644
> --- a/hw/xfree86/drivers/modesetting/drmmode_display.c
> +++ b/hw/xfree86/drivers/modesetting/drmmode_display.c
> @@ -408,24 +408,8 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
>      int output_count = 0;
>      Bool ret = TRUE;
>      int i;
> -    uint32_t fb_id;
> +    uint32_t fb_id = 0;
>      drmModeModeInfo kmode;
> -    int height;
> -
> -    height = pScrn->virtualY;
> -
> -    if (drmmode->fb_id == 0) {
> -        ret = drmModeAddFB(drmmode->fd,
> -                           pScrn->virtualX, height,
> -                           pScrn->depth, pScrn->bitsPerPixel,
> -                           drmmode_bo_get_pitch(&drmmode->front_bo),
> -                           drmmode_bo_get_handle(&drmmode->front_bo),
> -                           &drmmode->fb_id);
> -        if (ret < 0) {
> -            ErrorF("failed to add fb %d\n", ret);
> -            return FALSE;
> -        }
> -    }
>
>      saved_mode = crtc->mode;
>      saved_x = crtc->x;
> @@ -484,6 +468,22 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
>              fb_id = drmmode_crtc->rotate_fb_id;
>              x = y = 0;
>          }
> +
> +        if (fb_id == 0) {
> +            ret = drmModeAddFB(drmmode->fd,
> +                               pScrn->virtualX, pScrn->virtualY,
> +                               pScrn->depth, pScrn->bitsPerPixel,
> +                               drmmode_bo_get_pitch(&drmmode->front_bo),
> +                               drmmode_bo_get_handle(&drmmode->front_bo),
> +                               &drmmode->fb_id);
> +            if (ret < 0) {
> +                ErrorF("failed to add fb %d\n", ret);
> +                ret = FALSE;
> +                goto done;
> +            }
> +            fb_id = drmmode->fb_id;
> +        }
> +
>          if (drmModeSetCrtc(drmmode->fd, drmmode_crtc->mode_crtc->crtc_id,
>                             fb_id, x, y, output_ids, output_count, &kmode)) {
>              xf86DrvMsg(crtc->scrn->scrnIndex, X_ERROR,
> --
> 2.7.4
>
> _______________________________________________
> xorg-devel@lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: https://lists.x.org/mailman/listinfo/xorg-devel
Hans de Goede June 14, 2016, 11:12 a.m. 
Hi,

On 14-06-16 07:11, Dave Airlie wrote:
> These two are
>
> Reviewed-by: Dave Airlie <airlied@redhat.com>

Thanks for all the reviews!

> Can you take a look at Lyude's patch just posted? not sure if it'll
> conflict with these.

Done, that patch should not be a problem.

Note I noticed a compiler warning caused by the first patch in this
set this moring ("modesetting: Remove unnecessary fb addition from
drmmode_xf86crtc_resize"). I'll send a v2 of that.

To whomever ends up merging these: please merge v2 of the 1st
patch of this set.

Regards,

Hans


>
> Dave.
>
> On 2 June 2016 at 05:04, Hans de Goede <hdegoede@redhat.com> wrote:
>> If we're doing reverse-prime; or doing rotation the main fb is not used,
>> and there is no reason to add it in this case.
>>
>> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
>> ---
>>  hw/xfree86/drivers/modesetting/drmmode_display.c | 34 ++++++++++++------------
>>  1 file changed, 17 insertions(+), 17 deletions(-)
>>
>> diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c b/hw/xfree86/drivers/modesetting/drmmode_display.c
>> index 2fe46e9..9eb21e2 100644
>> --- a/hw/xfree86/drivers/modesetting/drmmode_display.c
>> +++ b/hw/xfree86/drivers/modesetting/drmmode_display.c
>> @@ -408,24 +408,8 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
>>      int output_count = 0;
>>      Bool ret = TRUE;
>>      int i;
>> -    uint32_t fb_id;
>> +    uint32_t fb_id = 0;
>>      drmModeModeInfo kmode;
>> -    int height;
>> -
>> -    height = pScrn->virtualY;
>> -
>> -    if (drmmode->fb_id == 0) {
>> -        ret = drmModeAddFB(drmmode->fd,
>> -                           pScrn->virtualX, height,
>> -                           pScrn->depth, pScrn->bitsPerPixel,
>> -                           drmmode_bo_get_pitch(&drmmode->front_bo),
>> -                           drmmode_bo_get_handle(&drmmode->front_bo),
>> -                           &drmmode->fb_id);
>> -        if (ret < 0) {
>> -            ErrorF("failed to add fb %d\n", ret);
>> -            return FALSE;
>> -        }
>> -    }
>>
>>      saved_mode = crtc->mode;
>>      saved_x = crtc->x;
>> @@ -484,6 +468,22 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
>>              fb_id = drmmode_crtc->rotate_fb_id;
>>              x = y = 0;
>>          }
>> +
>> +        if (fb_id == 0) {
>> +            ret = drmModeAddFB(drmmode->fd,
>> +                               pScrn->virtualX, pScrn->virtualY,
>> +                               pScrn->depth, pScrn->bitsPerPixel,
>> +                               drmmode_bo_get_pitch(&drmmode->front_bo),
>> +                               drmmode_bo_get_handle(&drmmode->front_bo),
>> +                               &drmmode->fb_id);
>> +            if (ret < 0) {
>> +                ErrorF("failed to add fb %d\n", ret);
>> +                ret = FALSE;
>> +                goto done;
>> +            }
>> +            fb_id = drmmode->fb_id;
>> +        }
>> +
>>          if (drmModeSetCrtc(drmmode->fd, drmmode_crtc->mode_crtc->crtc_id,
>>                             fb_id, x, y, output_ids, output_count, &kmode)) {
>>              xf86DrvMsg(crtc->scrn->scrnIndex, X_ERROR,
>> --
>> 2.7.4
>>
>> _______________________________________________
>> xorg-devel@lists.x.org: X.Org development
>> Archives: http://lists.x.org/archives/xorg-devel
>> Info: https://lists.x.org/mailman/listinfo/xorg-devel