Remove structure fields & code
Cleanup some random cruft left over from the initial port.main
parent
ebd1544973
commit
bee546ad69
|
@ -440,7 +440,6 @@ bool drm_crtc_set_mode(struct drm_crtc *crtc, struct drm_display_mode *mode,
|
|||
struct drm_device *dev = crtc->dev;
|
||||
struct drm_display_mode *adjusted_mode, saved_mode;
|
||||
int saved_x, saved_y;
|
||||
bool didLock = false;
|
||||
struct drm_output *output;
|
||||
bool ret = true;
|
||||
|
||||
|
@ -451,8 +450,6 @@ bool drm_crtc_set_mode(struct drm_crtc *crtc, struct drm_display_mode *mode,
|
|||
if (!crtc->enabled)
|
||||
return true;
|
||||
|
||||
didLock = crtc->funcs->lock(crtc);
|
||||
|
||||
saved_mode = crtc->mode;
|
||||
saved_x = crtc->x;
|
||||
saved_y = crtc->y;
|
||||
|
@ -544,9 +541,6 @@ done:
|
|||
crtc->x = saved_x;
|
||||
crtc->y = saved_y;
|
||||
}
|
||||
|
||||
if (didLock)
|
||||
crtc->funcs->unlock (crtc);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
|
|
@ -308,13 +308,10 @@ struct drm_crtc_funcs {
|
|||
*/
|
||||
void (*dpms)(struct drm_crtc *crtc, int mode);
|
||||
|
||||
/* JJJ: Are these needed? */
|
||||
/* Save CRTC state */
|
||||
void (*save)(struct drm_crtc *crtc); /* suspend? */
|
||||
/* Restore CRTC state */
|
||||
void (*restore)(struct drm_crtc *crtc); /* resume? */
|
||||
bool (*lock)(struct drm_crtc *crtc);
|
||||
void (*unlock)(struct drm_crtc *crtc);
|
||||
|
||||
void (*prepare)(struct drm_crtc *crtc);
|
||||
void (*commit)(struct drm_crtc *crtc);
|
||||
|
@ -367,10 +364,6 @@ struct drm_crtc {
|
|||
|
||||
bool enabled;
|
||||
|
||||
/* JJJ: are these needed? */
|
||||
bool cursor_in_range;
|
||||
bool cursor_shown;
|
||||
|
||||
struct drm_display_mode mode;
|
||||
|
||||
int x, y;
|
||||
|
@ -418,7 +411,6 @@ struct drm_output_funcs {
|
|||
struct drm_display_mode *adjusted_mode);
|
||||
enum drm_output_status (*detect)(struct drm_output *output);
|
||||
int (*get_modes)(struct drm_output *output);
|
||||
/* JJJ: type checking for properties via property value type */
|
||||
bool (*set_property)(struct drm_output *output, struct drm_property *property,
|
||||
uint64_t val);
|
||||
void (*cleanup)(struct drm_output *output);
|
||||
|
@ -519,7 +511,6 @@ struct drm_mode_config {
|
|||
int num_output;
|
||||
struct list_head output_list;
|
||||
|
||||
/* int compat_output? */
|
||||
int num_crtc;
|
||||
struct list_head crtc_list;
|
||||
|
||||
|
@ -527,8 +518,6 @@ struct drm_mode_config {
|
|||
|
||||
int min_width, min_height;
|
||||
int max_width, max_height;
|
||||
/* DamagePtr rotationDamage? */
|
||||
/* DGA stuff? */
|
||||
struct drm_mode_config_funcs *funcs;
|
||||
unsigned long fb_base;
|
||||
|
||||
|
|
|
@ -571,25 +571,6 @@ static void intel_crtc_dpms(struct drm_crtc *crtc, int mode)
|
|||
intel_crtc->dpms_mode = mode;
|
||||
}
|
||||
|
||||
static bool intel_crtc_lock(struct drm_crtc *crtc)
|
||||
{
|
||||
/* Sync the engine before mode switch */
|
||||
// i830WaitSync(crtc->scrn);
|
||||
|
||||
#if 0 // TODO def XF86DRI
|
||||
return I830DRILock(crtc->scrn);
|
||||
#else
|
||||
return FALSE;
|
||||
#endif
|
||||
}
|
||||
|
||||
static void intel_crtc_unlock (struct drm_crtc *crtc)
|
||||
{
|
||||
#if 0 // TODO def XF86DRI
|
||||
I830DRIUnlock (crtc->scrn);
|
||||
#endif
|
||||
}
|
||||
|
||||
static void intel_crtc_prepare (struct drm_crtc *crtc)
|
||||
{
|
||||
crtc->funcs->dpms(crtc, DPMSModeOff);
|
||||
|
@ -1334,8 +1315,6 @@ struct drm_display_mode *intel_crtc_mode_get(struct drm_device *dev,
|
|||
|
||||
static const struct drm_crtc_funcs intel_crtc_funcs = {
|
||||
.dpms = intel_crtc_dpms,
|
||||
.lock = intel_crtc_lock,
|
||||
.unlock = intel_crtc_unlock,
|
||||
.mode_fixup = intel_crtc_mode_fixup,
|
||||
.mode_set = intel_crtc_mode_set,
|
||||
.mode_set_base = intel_pipe_set_base,
|
||||
|
|
|
@ -126,14 +126,6 @@ static bool intel_sdvo_read_byte(struct drm_output *output, u8 addr,
|
|||
return false;
|
||||
}
|
||||
|
||||
|
||||
static bool intel_sdvo_read_byte_quiet(struct drm_output *output, int addr,
|
||||
u8 *ch)
|
||||
{
|
||||
return true;
|
||||
|
||||
}
|
||||
|
||||
static bool intel_sdvo_write_byte(struct drm_output *output, int addr,
|
||||
u8 ch)
|
||||
{
|
||||
|
@ -863,23 +855,6 @@ static bool intel_sdvo_get_capabilities(struct drm_output *output, struct intel_
|
|||
return true;
|
||||
}
|
||||
|
||||
|
||||
static void intel_sdvo_dump_cmd(struct drm_output *output, int opcode)
|
||||
{
|
||||
|
||||
|
||||
}
|
||||
|
||||
static void intel_sdvo_dump_device(struct drm_output *output)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
void intel_sdvo_dump(void)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
struct drm_output* intel_sdvo_find(struct drm_device *dev, int sdvoB)
|
||||
{
|
||||
struct drm_output *output = 0;
|
||||
|
|
Loading…
Reference in New Issue