Wednesday, May 01, 2019

Re: Xorg blanks until I switch to a TTY and back on 6.5

On Wed, May 01, 2019 at 12:34:12PM -0300, Daniel Bolgheroni wrote:
> On Mon, Apr 29, 2019 at 07:05:25AM +0000, Jonathan Gray wrote:
> > Does this help?
>
> It was already commited but fixed the problem here.
>
> However, I still can't see the correct modes set for LVDS-1 and for the
> external monitor on HDMI-1. An ultrawide 2560x1080 monitor can see at most
> 1920x1080, but worked fine with the previous drm.

There is a change queued for the next 4.19 release which concerns the
modesetting xorg driver, I'm not sure if it is relevant:

https://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git/plain/queue-4.19/revert-drm-i915-fbdev-actually-configure-untiled-displays.patch

Index: sys/dev/pci/drm/i915/intel_fbdev.c
===================================================================
RCS file: /cvs/src/sys/dev/pci/drm/i915/intel_fbdev.c,v
retrieving revision 1.5
diff -u -p -r1.5 intel_fbdev.c
--- sys/dev/pci/drm/i915/intel_fbdev.c 14 Apr 2019 10:14:52 -0000 1.5
+++ sys/dev/pci/drm/i915/intel_fbdev.c 30 Apr 2019 07:38:31 -0000
@@ -380,8 +380,8 @@ static bool intel_fb_initial_config(stru
bool *enabled, int width, int height)
{
struct drm_i915_private *dev_priv = to_i915(fb_helper->dev);
+ unsigned long conn_configured, conn_seq, mask;
unsigned int count = min(fb_helper->connector_count, BITS_PER_LONG);
- unsigned long conn_configured, conn_seq;
int i, j;
bool *save_enabled;
bool fallback = true, ret = true;
@@ -399,9 +399,10 @@ static bool intel_fb_initial_config(stru
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;
@@ -414,8 +415,7 @@ retry:
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)
@@ -519,10 +519,8 @@ retry:
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

No comments:

Post a Comment