lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

drm/i915/sdvo: Add missing TV filters

Browse Source 
Reference:

  Bug 28634 - missing TV parameter "Flicker Filter"
  https://bugs.freedesktop.org/show_bug.cgi?id=28634

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
Chris Wilson
2010-08-04 13:50:28 +01:00
committed by Eric Anholt
parent fcc8d6721c
commit c55217064e
2 changed files with 324 additions and 400 deletions
Download Patch File Download Diff File Expand all files Collapse all files

558
drivers/gpu/drm/i915/intel_sdvo.c
View File

@@ -143,31 +143,31 @@ struct intel_sdvo_connector {
/* This contains all current supported TV format */ /* This contains all current supported TV format */
u8 tv_format_supported[TV_FORMAT_NUM]; u8 tv_format_supported[TV_FORMAT_NUM];
int format_supported_num; int format_supported_num;
struct drm_property *tv_format_property; struct drm_property *tv_format;
struct drm_property *tv_format_name_property[TV_FORMAT_NUM];
/**
* Returned SDTV resolutions allowed for the current format, if the
* device reported it.
*/
struct intel_sdvo_sdtv_resolution_reply sdtv_resolutions;
/* add the property for the SDVO-TV */ /* add the property for the SDVO-TV */
struct drm_property *left_property; struct drm_property *left;
struct drm_property *right_property; struct drm_property *right;
struct drm_property *top_property; struct drm_property *top;
struct drm_property *bottom_property; struct drm_property *bottom;
struct drm_property *hpos_property; struct drm_property *hpos;
struct drm_property *vpos_property; struct drm_property *vpos;
struct drm_property *contrast;
struct drm_property *saturation;
struct drm_property *hue;
struct drm_property *sharpness;
struct drm_property *flicker_filter;
struct drm_property *flicker_filter_adaptive;
struct drm_property *flicker_filter_2d;
struct drm_property *tv_chroma_filter;
struct drm_property *tv_luma_filter;
/* add the property for the SDVO-TV/LVDS */ /* add the property for the SDVO-TV/LVDS */
struct drm_property *brightness_property; struct drm_property *brightness;
struct drm_property *contrast_property;
struct drm_property *saturation_property;
struct drm_property *hue_property;
/* Add variable to record current setting for the above property */ /* Add variable to record current setting for the above property */
u32 left_margin, right_margin, top_margin, bottom_margin; u32 left_margin, right_margin, top_margin, bottom_margin;
/* this is to get the range of margin.*/ /* this is to get the range of margin.*/
u32 max_hscan, max_vscan; u32 max_hscan, max_vscan;
u32 max_hpos, cur_hpos; u32 max_hpos, cur_hpos;
@@ -176,6 +176,12 @@ struct intel_sdvo_connector {
u32 cur_contrast, max_contrast; u32 cur_contrast, max_contrast;
u32 cur_saturation, max_saturation; u32 cur_saturation, max_saturation;
u32 cur_hue, max_hue; u32 cur_hue, max_hue;
u32 cur_sharpness, max_sharpness;
u32 cur_flicker_filter, max_flicker_filter;
u32 cur_flicker_filter_adaptive, max_flicker_filter_adaptive;
u32 cur_flicker_filter_2d, max_flicker_filter_2d;
u32 cur_tv_chroma_filter, max_tv_chroma_filter;
u32 cur_tv_luma_filter, max_tv_luma_filter;
}; };
static struct intel_sdvo *enc_to_intel_sdvo(struct drm_encoder *encoder) static struct intel_sdvo *enc_to_intel_sdvo(struct drm_encoder *encoder)
@@ -329,13 +335,14 @@ static const struct _sdvo_cmd_name {
SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_SDTV_RESOLUTION_SUPPORT), SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_SDTV_RESOLUTION_SUPPORT),
SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_SCALED_HDTV_RESOLUTION_SUPPORT), SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_SCALED_HDTV_RESOLUTION_SUPPORT),
SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_SUPPORTED_ENHANCEMENTS), SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_SUPPORTED_ENHANCEMENTS),
/* Add the op code for SDVO enhancements */ /* Add the op code for SDVO enhancements */
SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_MAX_POSITION_H), SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_MAX_HPOS),
SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_POSITION_H), SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_HPOS),
SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_POSITION_H), SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_HPOS),
SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_MAX_POSITION_V), SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_MAX_VPOS),
SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_POSITION_V), SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_VPOS),
SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_POSITION_V), SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_VPOS),
SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_MAX_SATURATION), SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_MAX_SATURATION),
SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_SATURATION), SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_SATURATION),
SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_SATURATION), SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_SATURATION),
@@ -354,6 +361,27 @@ static const struct _sdvo_cmd_name {
SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_MAX_OVERSCAN_V), SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_MAX_OVERSCAN_V),
SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_OVERSCAN_V), SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_OVERSCAN_V),
SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_OVERSCAN_V), SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_OVERSCAN_V),
SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_MAX_FLICKER_FILTER),
SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_FLICKER_FILTER),
SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_FLICKER_FILTER),
SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_MAX_FLICKER_FILTER_ADAPTIVE),
SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_FLICKER_FILTER_ADAPTIVE),
SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_FLICKER_FILTER_ADAPTIVE),
SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_MAX_FLICKER_FILTER_2D),
SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_FLICKER_FILTER_2D),
SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_FLICKER_FILTER_2D),
SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_MAX_SHARPNESS),
SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_SHARPNESS),
SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_SHARPNESS),
SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_DOT_CRAWL),
SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_DOT_CRAWL),
SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_MAX_TV_CHROMA_FILTER),
SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_TV_CHROMA_FILTER),
SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_TV_CHROMA_FILTER),
SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_MAX_TV_LUMA_FILTER),
SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_TV_LUMA_FILTER),
SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_TV_LUMA_FILTER),
/* HDMI op code */ /* HDMI op code */
SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_SUPP_ENCODE), SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_SUPP_ENCODE),
SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_ENCODE), SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_ENCODE),
@@ -1693,43 +1721,47 @@ intel_sdvo_destroy_enhance_property(struct drm_connector *connector)
struct intel_sdvo_connector *intel_sdvo_connector = to_intel_sdvo_connector(connector); struct intel_sdvo_connector *intel_sdvo_connector = to_intel_sdvo_connector(connector);
struct drm_device *dev = connector->dev; struct drm_device *dev = connector->dev;
if (IS_TV(intel_sdvo_connector)) { if (intel_sdvo_connector->left)
if (intel_sdvo_connector->left_property) drm_property_destroy(dev, intel_sdvo_connector->left);
drm_property_destroy(dev, intel_sdvo_connector->left_property); if (intel_sdvo_connector->right)
if (intel_sdvo_connector->right_property) drm_property_destroy(dev, intel_sdvo_connector->right);
drm_property_destroy(dev, intel_sdvo_connector->right_property); if (intel_sdvo_connector->top)
if (intel_sdvo_connector->top_property) drm_property_destroy(dev, intel_sdvo_connector->top);
drm_property_destroy(dev, intel_sdvo_connector->top_property); if (intel_sdvo_connector->bottom)
if (intel_sdvo_connector->bottom_property) drm_property_destroy(dev, intel_sdvo_connector->bottom);
drm_property_destroy(dev, intel_sdvo_connector->bottom_property); if (intel_sdvo_connector->hpos)
if (intel_sdvo_connector->hpos_property) drm_property_destroy(dev, intel_sdvo_connector->hpos);
drm_property_destroy(dev, intel_sdvo_connector->hpos_property); if (intel_sdvo_connector->vpos)
if (intel_sdvo_connector->vpos_property) drm_property_destroy(dev, intel_sdvo_connector->vpos);
drm_property_destroy(dev, intel_sdvo_connector->vpos_property); if (intel_sdvo_connector->saturation)
if (intel_sdvo_connector->saturation_property) drm_property_destroy(dev, intel_sdvo_connector->saturation);
drm_property_destroy(dev, if (intel_sdvo_connector->contrast)
intel_sdvo_connector->saturation_property); drm_property_destroy(dev, intel_sdvo_connector->contrast);
if (intel_sdvo_connector->contrast_property) if (intel_sdvo_connector->hue)
drm_property_destroy(dev, drm_property_destroy(dev, intel_sdvo_connector->hue);
intel_sdvo_connector->contrast_property); if (intel_sdvo_connector->sharpness)
if (intel_sdvo_connector->hue_property) drm_property_destroy(dev, intel_sdvo_connector->sharpness);
drm_property_destroy(dev, intel_sdvo_connector->hue_property); if (intel_sdvo_connector->flicker_filter)
} drm_property_destroy(dev, intel_sdvo_connector->flicker_filter);
if (IS_TV_OR_LVDS(intel_sdvo_connector)) { if (intel_sdvo_connector->flicker_filter_2d)
if (intel_sdvo_connector->brightness_property) drm_property_destroy(dev, intel_sdvo_connector->flicker_filter_2d);
drm_property_destroy(dev, if (intel_sdvo_connector->flicker_filter_adaptive)
intel_sdvo_connector->brightness_property); drm_property_destroy(dev, intel_sdvo_connector->flicker_filter_adaptive);
} if (intel_sdvo_connector->tv_luma_filter)
return; drm_property_destroy(dev, intel_sdvo_connector->tv_luma_filter);
if (intel_sdvo_connector->tv_chroma_filter)
drm_property_destroy(dev, intel_sdvo_connector->tv_chroma_filter);
if (intel_sdvo_connector->brightness)
drm_property_destroy(dev, intel_sdvo_connector->brightness);
} }
static void intel_sdvo_destroy(struct drm_connector *connector) static void intel_sdvo_destroy(struct drm_connector *connector)
{ {
struct intel_sdvo_connector *intel_sdvo_connector = to_intel_sdvo_connector(connector); struct intel_sdvo_connector *intel_sdvo_connector = to_intel_sdvo_connector(connector);
if (intel_sdvo_connector->tv_format_property) if (intel_sdvo_connector->tv_format)
drm_property_destroy(connector->dev, drm_property_destroy(connector->dev,
intel_sdvo_connector->tv_format_property); intel_sdvo_connector->tv_format);
intel_sdvo_destroy_enhance_property(connector); intel_sdvo_destroy_enhance_property(connector);
drm_sysfs_connector_remove(connector); drm_sysfs_connector_remove(connector);
@@ -1745,8 +1777,6 @@ intel_sdvo_set_property(struct drm_connector *connector,
struct drm_encoder *encoder = intel_attached_encoder(connector); struct drm_encoder *encoder = intel_attached_encoder(connector);
struct intel_sdvo *intel_sdvo = enc_to_intel_sdvo(encoder); struct intel_sdvo *intel_sdvo = enc_to_intel_sdvo(encoder);
struct intel_sdvo_connector *intel_sdvo_connector = to_intel_sdvo_connector(connector); struct intel_sdvo_connector *intel_sdvo_connector = to_intel_sdvo_connector(connector);
struct drm_crtc *crtc = encoder->crtc;
bool changed = false;
uint16_t temp_value; uint16_t temp_value;
uint8_t cmd; uint8_t cmd;
int ret; int ret;
@@ -1755,7 +1785,16 @@ intel_sdvo_set_property(struct drm_connector *connector,
if (ret) if (ret)
return ret; return ret;
if (property == intel_sdvo_connector->tv_format_property) { #define CHECK_PROPERTY(name, NAME) \
if (intel_sdvo_connector->name == property) { \
if (intel_sdvo_connector->cur_##name == temp_value) return 0; \
if (intel_sdvo_connector->max_##name < temp_value) return -EINVAL; \
cmd = SDVO_CMD_SET_##NAME; \
intel_sdvo_connector->cur_##name = temp_value; \
goto set_value; \
}
if (property == intel_sdvo_connector->tv_format) {
if (val >= TV_FORMAT_NUM) if (val >= TV_FORMAT_NUM)
return -EINVAL; return -EINVAL;
@@ -1764,13 +1803,12 @@ intel_sdvo_set_property(struct drm_connector *connector,
return 0; return 0;
intel_sdvo->tv_format_index = intel_sdvo_connector->tv_format_supported[val]; intel_sdvo->tv_format_index = intel_sdvo_connector->tv_format_supported[val];
changed = true; goto done;
} else if (IS_TV_OR_LVDS(intel_sdvo_connector)) { } else if (IS_TV_OR_LVDS(intel_sdvo_connector)) {
cmd = 0;
temp_value = val; temp_value = val;
if (intel_sdvo_connector->left_property == property) { if (intel_sdvo_connector->left == property) {
drm_connector_property_set_value(connector, drm_connector_property_set_value(connector,
intel_sdvo_connector->right_property, val); intel_sdvo_connector->right, val);
if (intel_sdvo_connector->left_margin == temp_value) if (intel_sdvo_connector->left_margin == temp_value)
return 0; return 0;
@@ -1779,9 +1817,10 @@ intel_sdvo_set_property(struct drm_connector *connector,
temp_value = intel_sdvo_connector->max_hscan - temp_value = intel_sdvo_connector->max_hscan -
intel_sdvo_connector->left_margin; intel_sdvo_connector->left_margin;
cmd = SDVO_CMD_SET_OVERSCAN_H; cmd = SDVO_CMD_SET_OVERSCAN_H;
} else if (intel_sdvo_connector->right_property == property) { goto set_value;
} else if (intel_sdvo_connector->right == property) {
drm_connector_property_set_value(connector, drm_connector_property_set_value(connector,
intel_sdvo_connector->left_property, val); intel_sdvo_connector->left, val);
if (intel_sdvo_connector->right_margin == temp_value) if (intel_sdvo_connector->right_margin == temp_value)
return 0; return 0;
@@ -1790,9 +1829,10 @@ intel_sdvo_set_property(struct drm_connector *connector,
temp_value = intel_sdvo_connector->max_hscan - temp_value = intel_sdvo_connector->max_hscan -
intel_sdvo_connector->left_margin; intel_sdvo_connector->left_margin;
cmd = SDVO_CMD_SET_OVERSCAN_H; cmd = SDVO_CMD_SET_OVERSCAN_H;
} else if (intel_sdvo_connector->top_property == property) { goto set_value;
} else if (intel_sdvo_connector->top == property) {
drm_connector_property_set_value(connector, drm_connector_property_set_value(connector,
intel_sdvo_connector->bottom_property, val); intel_sdvo_connector->bottom, val);
if (intel_sdvo_connector->top_margin == temp_value) if (intel_sdvo_connector->top_margin == temp_value)
return 0; return 0;
@@ -1801,9 +1841,10 @@ intel_sdvo_set_property(struct drm_connector *connector,
temp_value = intel_sdvo_connector->max_vscan - temp_value = intel_sdvo_connector->max_vscan -
intel_sdvo_connector->top_margin; intel_sdvo_connector->top_margin;
cmd = SDVO_CMD_SET_OVERSCAN_V; cmd = SDVO_CMD_SET_OVERSCAN_V;
} else if (intel_sdvo_connector->bottom_property == property) { goto set_value;
} else if (intel_sdvo_connector->bottom == property) {
drm_connector_property_set_value(connector, drm_connector_property_set_value(connector,
intel_sdvo_connector->top_property, val); intel_sdvo_connector->top, val);
if (intel_sdvo_connector->bottom_margin == temp_value) if (intel_sdvo_connector->bottom_margin == temp_value)
return 0; return 0;
@@ -1812,54 +1853,39 @@ intel_sdvo_set_property(struct drm_connector *connector,
temp_value = intel_sdvo_connector->max_vscan - temp_value = intel_sdvo_connector->max_vscan -
intel_sdvo_connector->top_margin; intel_sdvo_connector->top_margin;
cmd = SDVO_CMD_SET_OVERSCAN_V; cmd = SDVO_CMD_SET_OVERSCAN_V;
} else if (intel_sdvo_connector->hpos_property == property) { goto set_value;
if (intel_sdvo_connector->cur_hpos == temp_value)
return 0;
cmd = SDVO_CMD_SET_POSITION_H;
intel_sdvo_connector->cur_hpos = temp_value;
} else if (intel_sdvo_connector->vpos_property == property) {
if (intel_sdvo_connector->cur_vpos == temp_value)
return 0;
cmd = SDVO_CMD_SET_POSITION_V;
intel_sdvo_connector->cur_vpos = temp_value;
} else if (intel_sdvo_connector->saturation_property == property) {
if (intel_sdvo_connector->cur_saturation == temp_value)
return 0;
cmd = SDVO_CMD_SET_SATURATION;
intel_sdvo_connector->cur_saturation = temp_value;
} else if (intel_sdvo_connector->contrast_property == property) {
if (intel_sdvo_connector->cur_contrast == temp_value)
return 0;
cmd = SDVO_CMD_SET_CONTRAST;
intel_sdvo_connector->cur_contrast = temp_value;
} else if (intel_sdvo_connector->hue_property == property) {
if (intel_sdvo_connector->cur_hue == temp_value)
return 0;
cmd = SDVO_CMD_SET_HUE;
intel_sdvo_connector->cur_hue = temp_value;
} else if (intel_sdvo_connector->brightness_property == property) {
if (intel_sdvo_connector->cur_brightness == temp_value)
return 0;
cmd = SDVO_CMD_SET_BRIGHTNESS;
intel_sdvo_connector->cur_brightness = temp_value;
} }
if (cmd) { CHECK_PROPERTY(hpos, HPOS)
CHECK_PROPERTY(vpos, VPOS)
CHECK_PROPERTY(saturation, SATURATION)
CHECK_PROPERTY(contrast, CONTRAST)
CHECK_PROPERTY(hue, HUE)
CHECK_PROPERTY(brightness, BRIGHTNESS)
CHECK_PROPERTY(sharpness, SHARPNESS)
CHECK_PROPERTY(flicker_filter, FLICKER_FILTER)
CHECK_PROPERTY(flicker_filter_2d, FLICKER_FILTER_2D)
CHECK_PROPERTY(flicker_filter_adaptive, FLICKER_FILTER_ADAPTIVE)
CHECK_PROPERTY(tv_chroma_filter, TV_CHROMA_FILTER)
CHECK_PROPERTY(tv_luma_filter, TV_LUMA_FILTER)
}
return -EINVAL; /* unknown property */
set_value:
if (!intel_sdvo_set_value(intel_sdvo, cmd, &temp_value, 2)) if (!intel_sdvo_set_value(intel_sdvo, cmd, &temp_value, 2))
return -EINVAL; return -EIO;
done:
if (encoder->crtc) {
struct drm_crtc *crtc = encoder->crtc;
changed = true;
}
}
if (changed && crtc)
drm_crtc_helper_set_mode(crtc, &crtc->mode, crtc->x, drm_crtc_helper_set_mode(crtc, &crtc->mode, crtc->x,
crtc->y, crtc->fb); crtc->y, crtc->fb);
}
return 0; return 0;
#undef CHECK_PROPERTY
} }
static const struct drm_encoder_helper_funcs intel_sdvo_helper_funcs = { static const struct drm_encoder_helper_funcs intel_sdvo_helper_funcs = {
@@ -2268,47 +2294,55 @@ static bool intel_sdvo_tv_create_property(struct intel_sdvo *intel_sdvo,
intel_sdvo_connector->tv_format_supported[intel_sdvo_connector->format_supported_num++] = i; intel_sdvo_connector->tv_format_supported[intel_sdvo_connector->format_supported_num++] = i;
intel_sdvo_connector->tv_format_property = intel_sdvo_connector->tv_format =
drm_property_create(dev, DRM_MODE_PROP_ENUM, drm_property_create(dev, DRM_MODE_PROP_ENUM,
"mode", intel_sdvo_connector->format_supported_num); "mode", intel_sdvo_connector->format_supported_num);
if (!intel_sdvo_connector->tv_format_property) if (!intel_sdvo_connector->tv_format)
return false; return false;
for (i = 0; i < intel_sdvo_connector->format_supported_num; i++) for (i = 0; i < intel_sdvo_connector->format_supported_num; i++)
drm_property_add_enum( drm_property_add_enum(
intel_sdvo_connector->tv_format_property, i, intel_sdvo_connector->tv_format, i,
i, tv_format_names[intel_sdvo_connector->tv_format_supported[i]]); i, tv_format_names[intel_sdvo_connector->tv_format_supported[i]]);
intel_sdvo->tv_format_index = intel_sdvo_connector->tv_format_supported[0]; intel_sdvo->tv_format_index = intel_sdvo_connector->tv_format_supported[0];
drm_connector_attach_property(&intel_sdvo_connector->base.base, drm_connector_attach_property(&intel_sdvo_connector->base.base,
intel_sdvo_connector->tv_format_property, 0); intel_sdvo_connector->tv_format, 0);
return true; return true;
} }
static bool intel_sdvo_create_enhance_property(struct intel_sdvo *intel_sdvo, #define ENHANCEMENT(name, NAME) do { \
struct intel_sdvo_connector *intel_sdvo_connector) if (enhancements.name) { \
if (!intel_sdvo_get_value(intel_sdvo, SDVO_CMD_GET_MAX_##NAME, &data_value, 4) || \
!intel_sdvo_get_value(intel_sdvo, SDVO_CMD_GET_##NAME, &response, 2)) \
return false; \
intel_sdvo_connector->max_##name = data_value[0]; \
intel_sdvo_connector->cur_##name = response; \
intel_sdvo_connector->name = \
drm_property_create(dev, DRM_MODE_PROP_RANGE, #name, 2); \
if (!intel_sdvo_connector->name) return false; \
intel_sdvo_connector->name->values[0] = 0; \
intel_sdvo_connector->name->values[1] = data_value[0]; \
drm_connector_attach_property(connector, \
intel_sdvo_connector->name, \
intel_sdvo_connector->cur_##name); \
DRM_DEBUG_KMS(#name ": max %d, default %d, current %d\n", \
data_value[0], data_value[1], response); \
} \
} while(0)
static bool
intel_sdvo_create_enhance_property_tv(struct intel_sdvo *intel_sdvo,
struct intel_sdvo_connector *intel_sdvo_connector,
struct intel_sdvo_enhancements_reply enhancements)
{ {
struct drm_device *dev = intel_sdvo->base.enc.dev; struct drm_device *dev = intel_sdvo->base.enc.dev;
struct drm_connector *connector = &intel_sdvo_connector->base.base; struct drm_connector *connector = &intel_sdvo_connector->base.base;
struct intel_sdvo_enhancements_reply sdvo_data;
uint16_t response, data_value[2]; uint16_t response, data_value[2];
if (!intel_sdvo_get_value(intel_sdvo, /* when horizontal overscan is supported, Add the left/right property */
SDVO_CMD_GET_SUPPORTED_ENHANCEMENTS, if (enhancements.overscan_h) {
&sdvo_data, sizeof(sdvo_data)))
return false;
response = *((uint16_t *)&sdvo_data);
if (!response) {
DRM_DEBUG_KMS("No enhancement is supported\n");
return true;
}
if (IS_TV(intel_sdvo_connector)) {
/* when horizontal overscan is supported, Add the left/right
* property
*/
if (sdvo_data.overscan_h) {
if (!intel_sdvo_get_value(intel_sdvo, if (!intel_sdvo_get_value(intel_sdvo,
SDVO_CMD_GET_MAX_OVERSCAN_H, SDVO_CMD_GET_MAX_OVERSCAN_H,
&data_value, 4)) &data_value, 4))
@@ -2322,34 +2356,35 @@ static bool intel_sdvo_create_enhance_property(struct intel_sdvo *intel_sdvo,
intel_sdvo_connector->max_hscan = data_value[0]; intel_sdvo_connector->max_hscan = data_value[0];
intel_sdvo_connector->left_margin = data_value[0] - response; intel_sdvo_connector->left_margin = data_value[0] - response;
intel_sdvo_connector->right_margin = intel_sdvo_connector->left_margin; intel_sdvo_connector->right_margin = intel_sdvo_connector->left_margin;
intel_sdvo_connector->left_property = intel_sdvo_connector->left =
drm_property_create(dev, DRM_MODE_PROP_RANGE, drm_property_create(dev, DRM_MODE_PROP_RANGE,
"left_margin", 2); "left_margin", 2);
if (!intel_sdvo_connector->left_property) if (!intel_sdvo_connector->left)
return false; return false;
intel_sdvo_connector->left_property->values[0] = 0; intel_sdvo_connector->left->values[0] = 0;
intel_sdvo_connector->left_property->values[1] = data_value[0]; intel_sdvo_connector->left->values[1] = data_value[0];
drm_connector_attach_property(connector, drm_connector_attach_property(connector,
intel_sdvo_connector->left_property, intel_sdvo_connector->left,
intel_sdvo_connector->left_margin); intel_sdvo_connector->left_margin);
intel_sdvo_connector->right_property = intel_sdvo_connector->right =
drm_property_create(dev, DRM_MODE_PROP_RANGE, drm_property_create(dev, DRM_MODE_PROP_RANGE,
"right_margin", 2); "right_margin", 2);
if (!intel_sdvo_connector->right_property) if (!intel_sdvo_connector->right)
return false; return false;
intel_sdvo_connector->right_property->values[0] = 0; intel_sdvo_connector->right->values[0] = 0;
intel_sdvo_connector->right_property->values[1] = data_value[0]; intel_sdvo_connector->right->values[1] = data_value[0];
drm_connector_attach_property(connector, drm_connector_attach_property(connector,
intel_sdvo_connector->right_property, intel_sdvo_connector->right,
intel_sdvo_connector->right_margin); intel_sdvo_connector->right_margin);
DRM_DEBUG_KMS("h_overscan: max %d, " DRM_DEBUG_KMS("h_overscan: max %d, "
"default %d, current %d\n", "default %d, current %d\n",
data_value[0], data_value[1], response); data_value[0], data_value[1], response);
} }
if (sdvo_data.overscan_v) {
if (enhancements.overscan_v) {
if (!intel_sdvo_get_value(intel_sdvo, if (!intel_sdvo_get_value(intel_sdvo,
SDVO_CMD_GET_MAX_OVERSCAN_V, SDVO_CMD_GET_MAX_OVERSCAN_V,
&data_value, 4)) &data_value, 4))
@@ -2363,203 +2398,92 @@ static bool intel_sdvo_create_enhance_property(struct intel_sdvo *intel_sdvo,
intel_sdvo_connector->max_vscan = data_value[0]; intel_sdvo_connector->max_vscan = data_value[0];
intel_sdvo_connector->top_margin = data_value[0] - response; intel_sdvo_connector->top_margin = data_value[0] - response;
intel_sdvo_connector->bottom_margin = intel_sdvo_connector->top_margin; intel_sdvo_connector->bottom_margin = intel_sdvo_connector->top_margin;
intel_sdvo_connector->top_property = intel_sdvo_connector->top =
drm_property_create(dev, DRM_MODE_PROP_RANGE, drm_property_create(dev, DRM_MODE_PROP_RANGE,
"top_margin", 2); "top_margin", 2);
if (!intel_sdvo_connector->top_property) if (!intel_sdvo_connector->top)
return false; return false;
intel_sdvo_connector->top_property->values[0] = 0; intel_sdvo_connector->top->values[0] = 0;
intel_sdvo_connector->top_property->values[1] = data_value[0]; intel_sdvo_connector->top->values[1] = data_value[0];
drm_connector_attach_property(connector, drm_connector_attach_property(connector,
intel_sdvo_connector->top_property, intel_sdvo_connector->top,
intel_sdvo_connector->top_margin); intel_sdvo_connector->top_margin);
intel_sdvo_connector->bottom_property = intel_sdvo_connector->bottom =
drm_property_create(dev, DRM_MODE_PROP_RANGE, drm_property_create(dev, DRM_MODE_PROP_RANGE,
"bottom_margin", 2); "bottom_margin", 2);
if (!intel_sdvo_connector->bottom_property) if (!intel_sdvo_connector->bottom)
return false; return false;
intel_sdvo_connector->bottom_property->values[0] = 0; intel_sdvo_connector->bottom->values[0] = 0;
intel_sdvo_connector->bottom_property->values[1] = data_value[0]; intel_sdvo_connector->bottom->values[1] = data_value[0];
drm_connector_attach_property(connector, drm_connector_attach_property(connector,
intel_sdvo_connector->bottom_property, intel_sdvo_connector->bottom,
intel_sdvo_connector->bottom_margin); intel_sdvo_connector->bottom_margin);
DRM_DEBUG_KMS("v_overscan: max %d, " DRM_DEBUG_KMS("v_overscan: max %d, "
"default %d, current %d\n", "default %d, current %d\n",
data_value[0], data_value[1], response); data_value[0], data_value[1], response);
} }
if (sdvo_data.position_h) {
if (!intel_sdvo_get_value(intel_sdvo,
SDVO_CMD_GET_MAX_POSITION_H,
&data_value, 4))
return false;
if (!intel_sdvo_get_value(intel_sdvo, ENHANCEMENT(hpos, HPOS);
SDVO_CMD_GET_POSITION_H, ENHANCEMENT(vpos, VPOS);
&response, 2)) ENHANCEMENT(saturation, SATURATION);
return false; ENHANCEMENT(contrast, CONTRAST);
ENHANCEMENT(hue, HUE);
ENHANCEMENT(sharpness, SHARPNESS);
ENHANCEMENT(brightness, BRIGHTNESS);
ENHANCEMENT(flicker_filter, FLICKER_FILTER);
ENHANCEMENT(flicker_filter_adaptive, FLICKER_FILTER_ADAPTIVE);
ENHANCEMENT(flicker_filter_2d, FLICKER_FILTER_2D);
ENHANCEMENT(tv_chroma_filter, TV_CHROMA_FILTER);
ENHANCEMENT(tv_luma_filter, TV_LUMA_FILTER);
intel_sdvo_connector->max_hpos = data_value[0];
intel_sdvo_connector->cur_hpos = response;
intel_sdvo_connector->hpos_property =
drm_property_create(dev, DRM_MODE_PROP_RANGE,
"hpos", 2);
if (!intel_sdvo_connector->hpos_property)
return false;
intel_sdvo_connector->hpos_property->values[0] = 0;
intel_sdvo_connector->hpos_property->values[1] = data_value[0];
drm_connector_attach_property(connector,
intel_sdvo_connector->hpos_property,
intel_sdvo_connector->cur_hpos);
DRM_DEBUG_KMS("h_position: max %d, "
"default %d, current %d\n",
data_value[0], data_value[1], response);
}
if (sdvo_data.position_v) {
if (!intel_sdvo_get_value(intel_sdvo,
SDVO_CMD_GET_MAX_POSITION_V,
&data_value, 4))
return false;
if (!intel_sdvo_get_value(intel_sdvo,
SDVO_CMD_GET_POSITION_V,
&response, 2))
return false;
intel_sdvo_connector->max_vpos = data_value[0];
intel_sdvo_connector->cur_vpos = response;
intel_sdvo_connector->vpos_property =
drm_property_create(dev, DRM_MODE_PROP_RANGE,
"vpos", 2);
if (!intel_sdvo_connector->vpos_property)
return false;
intel_sdvo_connector->vpos_property->values[0] = 0;
intel_sdvo_connector->vpos_property->values[1] = data_value[0];
drm_connector_attach_property(connector,
intel_sdvo_connector->vpos_property,
intel_sdvo_connector->cur_vpos);
DRM_DEBUG_KMS("v_position: max %d, "
"default %d, current %d\n",
data_value[0], data_value[1], response);
}
if (sdvo_data.saturation) {
if (!intel_sdvo_get_value(intel_sdvo,
SDVO_CMD_GET_MAX_SATURATION,
&data_value, 4))
return false;
if (!intel_sdvo_get_value(intel_sdvo,
SDVO_CMD_GET_SATURATION,
&response, 2))
return false;
intel_sdvo_connector->max_saturation = data_value[0];
intel_sdvo_connector->cur_saturation = response;
intel_sdvo_connector->saturation_property =
drm_property_create(dev, DRM_MODE_PROP_RANGE,
"saturation", 2);
if (!intel_sdvo_connector->saturation_property)
return false;
intel_sdvo_connector->saturation_property->values[0] = 0;
intel_sdvo_connector->saturation_property->values[1] =
data_value[0];
drm_connector_attach_property(connector,
intel_sdvo_connector->saturation_property,
intel_sdvo_connector->cur_saturation);
DRM_DEBUG_KMS("saturation: max %d, "
"default %d, current %d\n",
data_value[0], data_value[1], response);
}
if (sdvo_data.contrast) {
if (!intel_sdvo_get_value(intel_sdvo,
SDVO_CMD_GET_MAX_CONTRAST, &data_value, 4))
return false;
if (!intel_sdvo_get_value(intel_sdvo,
SDVO_CMD_GET_CONTRAST, &response, 2))
return false;
intel_sdvo_connector->max_contrast = data_value[0];
intel_sdvo_connector->cur_contrast = response;
intel_sdvo_connector->contrast_property =
drm_property_create(dev, DRM_MODE_PROP_RANGE,
"contrast", 2);
if (!intel_sdvo_connector->contrast_property)
return false;
intel_sdvo_connector->contrast_property->values[0] = 0;
intel_sdvo_connector->contrast_property->values[1] = data_value[0];
drm_connector_attach_property(connector,
intel_sdvo_connector->contrast_property,
intel_sdvo_connector->cur_contrast);
DRM_DEBUG_KMS("contrast: max %d, "
"default %d, current %d\n",
data_value[0], data_value[1], response);
}
if (sdvo_data.hue) {
if (!intel_sdvo_get_value(intel_sdvo,
SDVO_CMD_GET_MAX_HUE, &data_value, 4))
return false;
if (!intel_sdvo_get_value(intel_sdvo,
SDVO_CMD_GET_HUE, &response, 2))
return false;
intel_sdvo_connector->max_hue = data_value[0];
intel_sdvo_connector->cur_hue = response;
intel_sdvo_connector->hue_property =
drm_property_create(dev, DRM_MODE_PROP_RANGE,
"hue", 2);
if (!intel_sdvo_connector->hue_property)
return false;
intel_sdvo_connector->hue_property->values[0] = 0;
intel_sdvo_connector->hue_property->values[1] =
data_value[0];
drm_connector_attach_property(connector,
intel_sdvo_connector->hue_property,
intel_sdvo_connector->cur_hue);
DRM_DEBUG_KMS("hue: max %d, default %d, current %d\n",
data_value[0], data_value[1], response);
}
}
if (IS_TV_OR_LVDS(intel_sdvo_connector)) {
if (sdvo_data.brightness) {
if (!intel_sdvo_get_value(intel_sdvo,
SDVO_CMD_GET_MAX_BRIGHTNESS, &data_value, 4))
return false;
if (!intel_sdvo_get_value(intel_sdvo,
SDVO_CMD_GET_BRIGHTNESS, &response, 2))
return false;
intel_sdvo_connector->max_brightness = data_value[0];
intel_sdvo_connector->cur_brightness = response;
intel_sdvo_connector->brightness_property =
drm_property_create(dev, DRM_MODE_PROP_RANGE,
"brightness", 2);
if (!intel_sdvo_connector->brightness_property)
return false;
intel_sdvo_connector->brightness_property->values[0] = 0;
intel_sdvo_connector->brightness_property->values[1] =
data_value[0];
drm_connector_attach_property(connector,
intel_sdvo_connector->brightness_property,
intel_sdvo_connector->cur_brightness);
DRM_DEBUG_KMS("brightness: max %d, "
"default %d, current %d\n",
data_value[0], data_value[1], response);
}
}
return true; return true;
} }
static bool
intel_sdvo_create_enhance_property_lvds(struct intel_sdvo *intel_sdvo,
struct intel_sdvo_connector *intel_sdvo_connector,
struct intel_sdvo_enhancements_reply enhancements)
{
struct drm_device *dev = intel_sdvo->base.enc.dev;
struct drm_connector *connector = &intel_sdvo_connector->base.base;
uint16_t response, data_value[2];
ENHANCEMENT(brightness, BRIGHTNESS);
return true;
}
#undef ENHANCEMENT
static bool intel_sdvo_create_enhance_property(struct intel_sdvo *intel_sdvo,
struct intel_sdvo_connector *intel_sdvo_connector)
{
union {
struct intel_sdvo_enhancements_reply reply;
uint16_t response;
} enhancements;
if (!intel_sdvo_get_value(intel_sdvo,
SDVO_CMD_GET_SUPPORTED_ENHANCEMENTS,
&enhancements, sizeof(enhancements)))
return false;
if (enhancements.response == 0) {
DRM_DEBUG_KMS("No enhancement is supported\n");
return true;
}
if (IS_TV(intel_sdvo_connector))
return intel_sdvo_create_enhance_property_tv(intel_sdvo, intel_sdvo_connector, enhancements.reply);
else if(IS_LVDS(intel_sdvo_connector))
return intel_sdvo_create_enhance_property_lvds(intel_sdvo, intel_sdvo_connector, enhancements.reply);
else
return true;
}
bool intel_sdvo_init(struct drm_device *dev, int sdvo_reg) bool intel_sdvo_init(struct drm_device *dev, int sdvo_reg)
{ {
struct drm_i915_private *dev_priv = dev->dev_private; struct drm_i915_private *dev_priv = dev->dev_private;

48
drivers/gpu/drm/i915/intel_sdvo_regs.h
View File

@@ -596,32 +596,32 @@ struct intel_sdvo_enhancements_reply {
unsigned int overscan_h:1; unsigned int overscan_h:1;
unsigned int overscan_v:1; unsigned int overscan_v:1;
unsigned int position_h:1; unsigned int hpos:1;
unsigned int position_v:1; unsigned int vpos:1;
unsigned int sharpness:1; unsigned int sharpness:1;
unsigned int dot_crawl:1; unsigned int dot_crawl:1;
unsigned int dither:1; unsigned int dither:1;
unsigned int max_tv_chroma_filter:1; unsigned int tv_chroma_filter:1;
unsigned int max_tv_luma_filter:1; unsigned int tv_luma_filter:1;
} __attribute__((packed)); } __attribute__((packed));
/* Picture enhancement limits below are dependent on the current TV format, /* Picture enhancement limits below are dependent on the current TV format,
* and thus need to be queried and set after it. * and thus need to be queried and set after it.
*/ */
#define SDVO_CMD_GET_MAX_FLICKER_FITER 0x4d #define SDVO_CMD_GET_MAX_FLICKER_FILTER 0x4d
#define SDVO_CMD_GET_MAX_ADAPTIVE_FLICKER_FITER 0x7b #define SDVO_CMD_GET_MAX_FLICKER_FILTER_ADAPTIVE 0x7b
#define SDVO_CMD_GET_MAX_2D_FLICKER_FITER 0x52 #define SDVO_CMD_GET_MAX_FLICKER_FILTER_2D 0x52
#define SDVO_CMD_GET_MAX_SATURATION 0x55 #define SDVO_CMD_GET_MAX_SATURATION 0x55
#define SDVO_CMD_GET_MAX_HUE 0x58 #define SDVO_CMD_GET_MAX_HUE 0x58
#define SDVO_CMD_GET_MAX_BRIGHTNESS 0x5b #define SDVO_CMD_GET_MAX_BRIGHTNESS 0x5b
#define SDVO_CMD_GET_MAX_CONTRAST 0x5e #define SDVO_CMD_GET_MAX_CONTRAST 0x5e
#define SDVO_CMD_GET_MAX_OVERSCAN_H 0x61 #define SDVO_CMD_GET_MAX_OVERSCAN_H 0x61
#define SDVO_CMD_GET_MAX_OVERSCAN_V 0x64 #define SDVO_CMD_GET_MAX_OVERSCAN_V 0x64
#define SDVO_CMD_GET_MAX_POSITION_H 0x67 #define SDVO_CMD_GET_MAX_HPOS 0x67
#define SDVO_CMD_GET_MAX_POSITION_V 0x6a #define SDVO_CMD_GET_MAX_VPOS 0x6a
#define SDVO_CMD_GET_MAX_SHARPNESS_V 0x6d #define SDVO_CMD_GET_MAX_SHARPNESS 0x6d
#define SDVO_CMD_GET_MAX_TV_CHROMA 0x74 #define SDVO_CMD_GET_MAX_TV_CHROMA_FILTER 0x74
#define SDVO_CMD_GET_MAX_TV_LUMA 0x77 #define SDVO_CMD_GET_MAX_TV_LUMA_FILTER 0x77
struct intel_sdvo_enhancement_limits_reply { struct intel_sdvo_enhancement_limits_reply {
u16 max_value; u16 max_value;
u16 default_value; u16 default_value;
@@ -638,10 +638,10 @@ struct intel_sdvo_enhancement_limits_reply {
#define SDVO_CMD_GET_FLICKER_FILTER 0x4e #define SDVO_CMD_GET_FLICKER_FILTER 0x4e
#define SDVO_CMD_SET_FLICKER_FILTER 0x4f #define SDVO_CMD_SET_FLICKER_FILTER 0x4f
#define SDVO_CMD_GET_ADAPTIVE_FLICKER_FITER 0x50 #define SDVO_CMD_GET_FLICKER_FILTER_ADAPTIVE 0x50
#define SDVO_CMD_SET_ADAPTIVE_FLICKER_FITER 0x51 #define SDVO_CMD_SET_FLICKER_FILTER_ADAPTIVE 0x51
#define SDVO_CMD_GET_2D_FLICKER_FITER 0x53 #define SDVO_CMD_GET_FLICKER_FILTER_2D 0x53
#define SDVO_CMD_SET_2D_FLICKER_FITER 0x54 #define SDVO_CMD_SET_FLICKER_FILTER_2D 0x54
#define SDVO_CMD_GET_SATURATION 0x56 #define SDVO_CMD_GET_SATURATION 0x56
#define SDVO_CMD_SET_SATURATION 0x57 #define SDVO_CMD_SET_SATURATION 0x57
#define SDVO_CMD_GET_HUE 0x59 #define SDVO_CMD_GET_HUE 0x59
@@ -654,16 +654,16 @@ struct intel_sdvo_enhancement_limits_reply {
#define SDVO_CMD_SET_OVERSCAN_H 0x63 #define SDVO_CMD_SET_OVERSCAN_H 0x63
#define SDVO_CMD_GET_OVERSCAN_V 0x65 #define SDVO_CMD_GET_OVERSCAN_V 0x65
#define SDVO_CMD_SET_OVERSCAN_V 0x66 #define SDVO_CMD_SET_OVERSCAN_V 0x66
#define SDVO_CMD_GET_POSITION_H 0x68 #define SDVO_CMD_GET_HPOS 0x68
#define SDVO_CMD_SET_POSITION_H 0x69 #define SDVO_CMD_SET_HPOS 0x69
#define SDVO_CMD_GET_POSITION_V 0x6b #define SDVO_CMD_GET_VPOS 0x6b
#define SDVO_CMD_SET_POSITION_V 0x6c #define SDVO_CMD_SET_VPOS 0x6c
#define SDVO_CMD_GET_SHARPNESS 0x6e #define SDVO_CMD_GET_SHARPNESS 0x6e
#define SDVO_CMD_SET_SHARPNESS 0x6f #define SDVO_CMD_SET_SHARPNESS 0x6f
#define SDVO_CMD_GET_TV_CHROMA 0x75 #define SDVO_CMD_GET_TV_CHROMA_FILTER 0x75
#define SDVO_CMD_SET_TV_CHROMA 0x76 #define SDVO_CMD_SET_TV_CHROMA_FILTER 0x76
#define SDVO_CMD_GET_TV_LUMA 0x78 #define SDVO_CMD_GET_TV_LUMA_FILTER 0x78
#define SDVO_CMD_SET_TV_LUMA 0x79 #define SDVO_CMD_SET_TV_LUMA_FILTER 0x79
struct intel_sdvo_enhancements_arg { struct intel_sdvo_enhancements_arg {
u16 value; u16 value;
}__attribute__((packed)); }__attribute__((packed));