diff options
| author | Jesse Barnes <jbarnes@nietzche.virtuousgeek.org> | 2008-04-10 11:23:55 -0700 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@nietzche.virtuousgeek.org> | 2008-04-10 11:23:55 -0700 |
| commit | 0a6e301e6de3421f116d1b5d8205ca4f442091e2 (patch) | |
| tree | 860f00829639bd933fc9ff676fb894f846903ffb /linux-core/drm_crtc.c | |
| parent | 386ea38b8e3af9bc9166d4ab63c4beb7e0e2267b (diff) | |
Keep display info in struct display_info
Some fields had snuck into the drm_output structure. Put them back and
fill in more stuff from the EDID block.
Diffstat (limited to 'linux-core/drm_crtc.c')
| -rw-r--r-- | linux-core/drm_crtc.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/linux-core/drm_crtc.c b/linux-core/drm_crtc.c index f54ceb76..f4377821 100644 --- a/linux-core/drm_crtc.c +++ b/linux-core/drm_crtc.c @@ -643,7 +643,6 @@ struct drm_output *drm_output_create(struct drm_device *dev, output->id = drm_idr_get(dev, output); output->output_type = output_type; output->output_type_id = 1; /* TODO */ - output->subpixel_order = SubPixelUnknown; INIT_LIST_HEAD(&output->user_modes); INIT_LIST_HEAD(&output->probed_modes); INIT_LIST_HEAD(&output->modes); @@ -1555,9 +1554,9 @@ int drm_mode_getoutput(struct drm_device *dev, out_resp->output_type = output->output_type; out_resp->output_type_id = output->output_type_id; - out_resp->mm_width = output->mm_width; - out_resp->mm_height = output->mm_height; - out_resp->subpixel = output->subpixel_order; + out_resp->mm_width = output->display_info.width_mm; + out_resp->mm_height = output->display_info.height_mm; + out_resp->subpixel = output->display_info.subpixel_order; out_resp->connection = output->status; if (output->crtc) out_resp->crtc = output->crtc->id; |