diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2014-08-12 09:00:04 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2014-08-12 09:00:04 +0100 |
| commit | b3138bee8db7db6ebaa10ecdd09c47f899d24c8c (patch) | |
| tree | ff9e8c5c64895595ec09b5ecb6a39c83ffa54d1f /src | |
| parent | 6554cf0a69f04710b64f3488384fe5cb2748dc35 (diff) | |
sna: Separate panel checks from adding default modes
The flags are now separate, so treat them individually.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src')
| -rw-r--r-- | src/sna/sna_display.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c index 7c20db4a..4f69dacd 100644 --- a/src/sna/sna_display.c +++ b/src/sna/sna_display.c @@ -2864,7 +2864,7 @@ sna_output_get_modes(xf86OutputPtr output) * If it is incorrect, please fix me. */ sna_output->has_panel_limits = false; - if (sna_output->add_default_modes) { + if (sna_output->is_panel) { sna_output->panel_hdisplay = sna_output->panel_vdisplay = 0; for (i = 0; i < sna_output->num_modes; i++) { struct drm_mode_modeinfo *m; @@ -2878,10 +2878,10 @@ sna_output_get_modes(xf86OutputPtr output) sna_output->has_panel_limits = sna_output->panel_hdisplay && sna_output->panel_vdisplay; - - Modes = sna_output_panel_edid(output, Modes); } + if (sna_output->add_default_modes) + Modes = sna_output_panel_edid(output, Modes); return Modes; } |