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>
This commit is contained in:
Chris Wilson 2014-08-12 09:00:04 +01:00
parent 6554cf0a69
commit b3138bee8d
1 changed files with 3 additions and 3 deletions

View File

@ -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;
}