fdo-mirrors/mesa-drm
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/drm.git synced 2026-06-03 12:58:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

nv50/kms: remove redefinitions of scaling modes..

Browse source
This commit is contained in:
Ben Skeggs 2009-02-03 18:46:37 +10:00
parent 140a2da135
commit 98e859f2f7
4 changed files with 31 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
linux-core/nv50_connector.c
View file

@ -464,31 +464,23 @@ static int nv50_kms_connector_set_property(struct drm_connector *drm_connector,
if (property == dev->mode_config.scaling_mode_property) {
struct nv50_crtc *crtc = NULL;
struct nv50_display *display = nv50_get_display(dev);
int internal_value = 0;
switch (value) {
case DRM_MODE_SCALE_NON_GPU:
internal_value = SCALE_NON_GPU;
break;
case DRM_MODE_SCALE_FULLSCREEN:
internal_value = SCALE_FULLSCREEN;
break;
case DRM_MODE_SCALE_NO_SCALE:
internal_value = SCALE_NOSCALE;
break;
case DRM_MODE_SCALE_ASPECT:
internal_value = SCALE_ASPECT;
break;
default:
break;
return -EINVAL;
}
/* LVDS always needs gpu scaling */
if (connector->base.connector_type == DRM_MODE_CONNECTOR_LVDS &&
internal_value == SCALE_NON_GPU)
value == DRM_MODE_SCALE_NON_GPU)
return -EINVAL;
connector->requested_scaling_mode = internal_value;
connector->requested_scaling_mode = value;
if (drm_connector->encoder && drm_connector->encoder->crtc)
crtc = to_nv50_crtc(drm_connector->encoder->crtc);
@ -498,9 +490,13 @@ static int nv50_kms_connector_set_property(struct drm_connector *drm_connector,
crtc->requested_scaling_mode = connector->requested_scaling_mode;
/* going from and to a gpu scaled regime requires a modesetting, so wait until next modeset */
if (crtc->scaling_mode == SCALE_NON_GPU || internal_value == SCALE_NON_GPU) {
DRM_INFO("Moving from or to a non-gpu scaled mode, this will be processed upon next modeset.");
/* going from and to a gpu scaled regime requires a
* modesetting, so wait until next modeset
*/
if (crtc->scaling_mode == DRM_MODE_SCALE_NON_GPU ||
value == DRM_MODE_SCALE_NON_GPU) {
DRM_INFO("Moving from or to a non-gpu scaled mode, "
"this will be processed upon next modeset.");
delay_change = true;
}
@ -560,7 +556,6 @@ static const struct drm_connector_funcs nv50_connector_funcs = {
static int nv50_kms_get_scaling_mode(struct drm_connector *drm_connector)
{
struct nv50_connector *connector = NULL;
int drm_mode = 0;
if (!drm_connector) {
DRM_ERROR("drm_connector is NULL\n");
@ -568,25 +563,7 @@ static int nv50_kms_get_scaling_mode(struct drm_connector *drm_connector)
}
connector = to_nv50_connector(drm_connector);
switch (connector->requested_scaling_mode) {
case SCALE_NON_GPU:
drm_mode = DRM_MODE_SCALE_NON_GPU;
break;
case SCALE_FULLSCREEN:
drm_mode = DRM_MODE_SCALE_FULLSCREEN;
break;
case SCALE_NOSCALE:
drm_mode = DRM_MODE_SCALE_NO_SCALE;
break;
case SCALE_ASPECT:
drm_mode = DRM_MODE_SCALE_ASPECT;
break;
default:
break;
}
return drm_mode;
return connector->requested_scaling_mode;
}
int nv50_connector_create(struct drm_device *dev, int bus, int i2c_index, int type)
@ -636,10 +613,10 @@ int nv50_connector_create(struct drm_device *dev, int bus, int i2c_index, int ty
case DRM_MODE_CONNECTOR_DVII:
case DRM_MODE_CONNECTOR_DVID:
case DRM_MODE_CONNECTOR_LVDS:
connector->requested_scaling_mode = SCALE_FULLSCREEN;
connector->requested_scaling_mode = DRM_MODE_SCALE_FULLSCREEN;
break;
default:
connector->requested_scaling_mode = SCALE_NON_GPU;
connector->requested_scaling_mode = DRM_MODE_SCALE_NON_GPU;
break;
}

32
linux-core/nv50_crtc.c
View file

@ -264,19 +264,19 @@ static int nv50_crtc_set_scale(struct nv50_crtc *crtc)
NV50_DEBUG("\n");
switch (crtc->requested_scaling_mode) {
case SCALE_ASPECT:
nv50_crtc_calc_scale(crtc, &outX, &outY);
break;
case SCALE_FULLSCREEN:
outX = crtc->native_mode->hdisplay;
outY = crtc->native_mode->vdisplay;
break;
case SCALE_NOSCALE:
case SCALE_NON_GPU:
default:
outX = crtc->mode->hdisplay;
outY = crtc->mode->vdisplay;
break;
case DRM_MODE_SCALE_ASPECT:
nv50_crtc_calc_scale(crtc, &outX, &outY);
break;
case DRM_MODE_SCALE_FULLSCREEN:
outX = crtc->native_mode->hdisplay;
outY = crtc->native_mode->vdisplay;
break;
case DRM_MODE_SCALE_NO_SCALE:
case DRM_MODE_SCALE_NON_GPU:
default:
outX = crtc->mode->hdisplay;
outY = crtc->mode->vdisplay;
break;
}
/* Got a better name for SCALER_ACTIVE? */
@ -865,7 +865,7 @@ int nv50_kms_crtc_set_config(struct drm_mode_set *set)
break;
}
if (crtc->requested_scaling_mode == SCALE_NON_GPU)
if (crtc->requested_scaling_mode == DRM_MODE_SCALE_NON_GPU)
crtc->use_native_mode = false;
else
crtc->use_native_mode = true;
@ -991,8 +991,8 @@ int nv50_crtc_create(struct drm_device *dev, int index)
list_add_tail(&crtc->item, &display->crtcs);
crtc->index = index;
crtc->requested_scaling_mode = SCALE_INVALID;
crtc->scaling_mode = SCALE_INVALID;
crtc->requested_scaling_mode = DRM_MODE_SCALE_NO_SCALE;
crtc->scaling_mode = DRM_MODE_SCALE_NO_SCALE;
/* set function pointers */
crtc->validate_mode = nv50_crtc_validate_mode;

3
linux-core/nv50_display.c
View file

@ -197,13 +197,14 @@ static int nv50_display_update(struct nv50_display *display)
int nv50_display_create(struct drm_device *dev)
{
struct drm_nouveau_private *dev_priv = dev->dev_private;
struct nv50_display *display = kzalloc(sizeof(struct nv50_display), GFP_KERNEL);
struct nv50_display *display;
int i, output_index;
uint32_t bus_mask = 0;
uint32_t bus_digital = 0, bus_analog = 0;
NV50_DEBUG("\n");
display = kzalloc(sizeof(*display), GFP_KERNEL);
if (!display)
return -ENOMEM;

8
linux-core/nv50_display.h
View file

@ -59,14 +59,6 @@ struct nv50_display {
struct list_head connectors;
};
enum scaling_modes {
SCALE_NON_GPU,
SCALE_FULLSCREEN,
SCALE_ASPECT,
SCALE_NOSCALE,
SCALE_INVALID
};
void nv50_display_command(struct drm_nouveau_private *dev_priv, uint32_t mthd, uint32_t val);
struct nv50_display *nv50_get_display(struct drm_device *dev);
int nv50_display_create(struct drm_device *dev);