evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

drm/nouveau: drm_connector_property -> drm_object_property

Browse source 
Signed-off-by: Rob Clark <rob@ti.com>
This commit is contained in:
Rob Clark 2012-10-11 20:42:04 -05:00 • committed by Rob Clark
parent 6de6d84630
commit 2db83827dc
2 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
drivers/gpu/drm/nouveau/nouveau_connector.c
View file

@ -220,7 +220,7 @@ nouveau_connector_set_encoder(struct drm_connector *connector,
} }
if (nv_connector->type == DCB_CONNECTOR_DVI_I) { if (nv_connector->type == DCB_CONNECTOR_DVI_I) {
drm_connector_property_set_value(connector, drm_object_property_set_value(&connector->base,
dev->mode_config.dvi_i_subconnector_property, dev->mode_config.dvi_i_subconnector_property,
nv_encoder->dcb->type == DCB_OUTPUT_TMDS ? nv_encoder->dcb->type == DCB_OUTPUT_TMDS ?
DRM_MODE_SUBCONNECTOR_DVID : DRM_MODE_SUBCONNECTOR_DVID :
@ -1040,7 +1040,7 @@ nouveau_connector_create(struct drm_device *dev, int index)
/* Init DVI-I specific properties */ /* Init DVI-I specific properties */
if (nv_connector->type == DCB_CONNECTOR_DVI_I) if (nv_connector->type == DCB_CONNECTOR_DVI_I)
drm_connector_attach_property(connector, dev->mode_config.dvi_i_subconnector_property, 0); drm_object_attach_property(&connector->base, dev->mode_config.dvi_i_subconnector_property, 0);
/* Add overscan compensation options to digital outputs */ /* Add overscan compensation options to digital outputs */
if (disp->underscan_property && if (disp->underscan_property &&
@ -1048,31 +1048,31 @@ nouveau_connector_create(struct drm_device *dev, int index)
type == DRM_MODE_CONNECTOR_DVII || type == DRM_MODE_CONNECTOR_DVII ||
type == DRM_MODE_CONNECTOR_HDMIA || type == DRM_MODE_CONNECTOR_HDMIA ||
type == DRM_MODE_CONNECTOR_DisplayPort)) { type == DRM_MODE_CONNECTOR_DisplayPort)) {
drm_connector_attach_property(connector, drm_object_attach_property(&connector->base,
disp->underscan_property, disp->underscan_property,
UNDERSCAN_OFF); UNDERSCAN_OFF);
drm_connector_attach_property(connector, drm_object_attach_property(&connector->base,
disp->underscan_hborder_property, disp->underscan_hborder_property,
0); 0);
drm_connector_attach_property(connector, drm_object_attach_property(&connector->base,
disp->underscan_vborder_property, disp->underscan_vborder_property,
0); 0);
} }
/* Add hue and saturation options */ /* Add hue and saturation options */
if (disp->vibrant_hue_property) if (disp->vibrant_hue_property)
drm_connector_attach_property(connector, drm_object_attach_property(&connector->base,
disp->vibrant_hue_property, disp->vibrant_hue_property,
90); 90);
if (disp->color_vibrance_property) if (disp->color_vibrance_property)
drm_connector_attach_property(connector, drm_object_attach_property(&connector->base,
disp->color_vibrance_property, disp->color_vibrance_property,
150); 150);
switch (nv_connector->type) { switch (nv_connector->type) {
case DCB_CONNECTOR_VGA: case DCB_CONNECTOR_VGA:
if (nv_device(drm->device)->card_type >= NV_50) { if (nv_device(drm->device)->card_type >= NV_50) {
drm_connector_attach_property(connector, drm_object_attach_property(&connector->base,
dev->mode_config.scaling_mode_property, dev->mode_config.scaling_mode_property,
nv_connector->scaling_mode); nv_connector->scaling_mode);
} }
@ -1085,18 +1085,18 @@ nouveau_connector_create(struct drm_device *dev, int index)
default: default:
nv_connector->scaling_mode = DRM_MODE_SCALE_FULLSCREEN; nv_connector->scaling_mode = DRM_MODE_SCALE_FULLSCREEN;
drm_connector_attach_property(connector, drm_object_attach_property(&connector->base,
dev->mode_config.scaling_mode_property, dev->mode_config.scaling_mode_property,
nv_connector->scaling_mode); nv_connector->scaling_mode);
if (disp->dithering_mode) { if (disp->dithering_mode) {
nv_connector->dithering_mode = DITHERING_MODE_AUTO; nv_connector->dithering_mode = DITHERING_MODE_AUTO;
drm_connector_attach_property(connector, drm_object_attach_property(&connector->base,
disp->dithering_mode, disp->dithering_mode,
nv_connector->dithering_mode); nv_connector->dithering_mode);
} }
if (disp->dithering_depth) { if (disp->dithering_depth) {
nv_connector->dithering_depth = DITHERING_DEPTH_AUTO; nv_connector->dithering_depth = DITHERING_DEPTH_AUTO;
drm_connector_attach_property(connector, drm_object_attach_property(&connector->base,
disp->dithering_depth, disp->dithering_depth,
nv_connector->dithering_depth); nv_connector->dithering_depth);
} }

16
drivers/gpu/drm/nouveau/nv17_tv.c
View file

@ -195,7 +195,7 @@ nv17_tv_detect(struct drm_encoder *encoder, struct drm_connector *connector)
break; break;
} }
drm_connector_property_set_value(connector, drm_object_property_set_value(&connector->base,
conf->tv_subconnector_property, conf->tv_subconnector_property,
tv_enc->subconnector); tv_enc->subconnector);
@ -672,25 +672,25 @@ static int nv17_tv_create_resources(struct drm_encoder *encoder,
drm_mode_create_tv_properties(dev, num_tv_norms, nv17_tv_norm_names); drm_mode_create_tv_properties(dev, num_tv_norms, nv17_tv_norm_names);
drm_connector_attach_property(connector, drm_object_attach_property(&connector->base,
conf->tv_select_subconnector_property, conf->tv_select_subconnector_property,
tv_enc->select_subconnector); tv_enc->select_subconnector);
drm_connector_attach_property(connector, drm_object_attach_property(&connector->base,
conf->tv_subconnector_property, conf->tv_subconnector_property,
tv_enc->subconnector); tv_enc->subconnector);
drm_connector_attach_property(connector, drm_object_attach_property(&connector->base,
conf->tv_mode_property, conf->tv_mode_property,
tv_enc->tv_norm); tv_enc->tv_norm);
drm_connector_attach_property(connector, drm_object_attach_property(&connector->base,
conf->tv_flicker_reduction_property, conf->tv_flicker_reduction_property,
tv_enc->flicker); tv_enc->flicker);
drm_connector_attach_property(connector, drm_object_attach_property(&connector->base,
conf->tv_saturation_property, conf->tv_saturation_property,
tv_enc->saturation); tv_enc->saturation);
drm_connector_attach_property(connector, drm_object_attach_property(&connector->base,
conf->tv_hue_property, conf->tv_hue_property,
tv_enc->hue); tv_enc->hue);
drm_connector_attach_property(connector, drm_object_attach_property(&connector->base,
conf->tv_overscan_property, conf->tv_overscan_property,
tv_enc->overscan); tv_enc->overscan);