summaryrefslogtreecommitdiffstats
path: root/sys/dev/drm2/i915/intel_modes.c
diff options
context:
space:
mode:
authordumbbell <dumbbell@FreeBSD.org>2015-04-28 19:35:05 +0000
committerdumbbell <dumbbell@FreeBSD.org>2015-04-28 19:35:05 +0000
commitea79a6539f43803c0c31ce2924f403be84b383cb (patch)
tree5f6306edb9b0d44300b67836b2a0b9b018a4aa15 /sys/dev/drm2/i915/intel_modes.c
parent616b358cb6cac89dff87e789620e451b9828c6f3 (diff)
downloadFreeBSD-src-ea79a6539f43803c0c31ce2924f403be84b383cb.zip
FreeBSD-src-ea79a6539f43803c0c31ce2924f403be84b383cb.tar.gz
drm: Update the device-independent code to match Linux 3.8.13
This update brings few features: o Support for the setmaster/dropmaster ioctls. For instance, they are used to run multiple X servers simultaneously. o Support for minor devices. The only user-visible change is a new entry in /dev/dri but it is useless at the moment. This is a first step to support render nodes [1]. The main benefit is to greatly reduce the diff with Linux (at the expense of an unreadable commit diff). Hopefully, next upgrades will be easier. No updates were made to the drivers, beside adapting them to API changes. [1] https://en.wikipedia.org/wiki/Direct_Rendering_Manager#Render_nodes r280814 is merged at the same time to avoid a short window where RANDR might be broken: drm: Import Linux commit 9bc3cd5673d84d29272fa7181a4dfca83cbb48c1 Author: Ville Syrjälä <ville.syrjala@linux.intel.com> Date: Fri May 31 12:17:08 2013 +0000 drm: Sort connector modes based on vrefresh Keeping the modes sorted by vrefresh before the pixel clock makes the mode list somehow more pleasing to the eye. Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Dave Airlie <airlied@redhat.com> PR: 198936 (r280814) Tested by: Many people MFC of: r280183, r280187 (original commit by glebius), r280814 Relnotes: yes
Diffstat (limited to 'sys/dev/drm2/i915/intel_modes.c')
-rw-r--r--sys/dev/drm2/i915/intel_modes.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/sys/dev/drm2/i915/intel_modes.c b/sys/dev/drm2/i915/intel_modes.c
index 6b83bae..d061d08 100644
--- a/sys/dev/drm2/i915/intel_modes.c
+++ b/sys/dev/drm2/i915/intel_modes.c
@@ -80,7 +80,6 @@ intel_ddc_get_modes(struct drm_connector *connector, device_t adapter)
drm_mode_connector_update_edid_property(connector, edid);
ret = drm_add_edid_modes(connector, edid);
drm_edid_to_eld(connector, edid);
- connector->display_info.raw_edid = NULL;
free(edid, DRM_MEM_KMS);
}
@@ -106,13 +105,13 @@ intel_attach_force_audio_property(struct drm_connector *connector)
prop = drm_property_create_enum(dev, 0,
"audio",
force_audio_names,
- DRM_ARRAY_SIZE(force_audio_names));
+ ARRAY_SIZE(force_audio_names));
if (prop == NULL)
return;
dev_priv->force_audio_property = prop;
}
- drm_connector_attach_property(connector, prop, 0);
+ drm_object_attach_property(&connector->base, prop, 0);
}
static const struct drm_prop_enum_list broadcast_rgb_names[] = {
@@ -132,12 +131,12 @@ intel_attach_broadcast_rgb_property(struct drm_connector *connector)
prop = drm_property_create_enum(dev, DRM_MODE_PROP_ENUM,
"Broadcast RGB",
broadcast_rgb_names,
- DRM_ARRAY_SIZE(broadcast_rgb_names));
+ ARRAY_SIZE(broadcast_rgb_names));
if (prop == NULL)
return;
dev_priv->broadcast_rgb_property = prop;
}
- drm_connector_attach_property(connector, prop, 0);
+ drm_object_attach_property(&connector->base, prop, 0);
}
OpenPOWER on IntegriCloud