drivers/gpu/drm/openchrome/ttm_gem.c | 5 ---- drivers/gpu/drm/openchrome/via_drv.h | 10 ++++++++ drivers/gpu/drm/openchrome/via_fb.c | 5 ---- drivers/gpu/drm/openchrome/via_fp.c | 40 ----------------------------------- 4 files changed, 10 insertions(+), 50 deletions(-)
New commits: commit f91e70a1dfac99e4e3c1dab3a35ba73acf544012 Author: Kevin Brace <kevinbr...@gmx.com> Date: Sun Aug 20 03:54:08 2017 -0700 Removed dithering property from FP code Signed-off-by: Kevin Brace <kevinbr...@gmx.com> diff --git a/drivers/gpu/drm/openchrome/via_fp.c b/drivers/gpu/drm/openchrome/via_fp.c index 7bfc56e73820..1b009fbb607f 100644 --- a/drivers/gpu/drm/openchrome/via_fp.c +++ b/drivers/gpu/drm/openchrome/via_fp.c @@ -797,13 +797,6 @@ via_lcd_detect(struct drm_connector *connector, bool force) return ret; } -static const struct drm_prop_enum_list dithering_enum_list[] = -{ - { DRM_MODE_DITHERING_OFF, "Off" }, - { DRM_MODE_DITHERING_ON, "On" }, - { DRM_MODE_DITHERING_AUTO, "Automatic" }, -}; - static int via_lcd_set_property(struct drm_connector *connector, struct drm_property *property, uint64_t value) @@ -835,27 +828,6 @@ via_lcd_set_property(struct drm_connector *connector, return -EINVAL; } } - - list_for_each_entry(prop, &con->props, head) { - if (property == prop) { - u8 reg_value; - - switch (value) { - case DRM_MODE_DITHERING_AUTO: - case DRM_MODE_DITHERING_ON: - reg_value = BIT(0); - break; - - case DRM_MODE_DITHERING_OFF: - reg_value = 0x00; - break; - - default: - return -EINVAL; - } - svga_wcrt_mask(VGABASE, 0x88, reg_value, BIT(0)); - } - } } return 0; } @@ -1087,8 +1059,6 @@ via_lvds_init(struct drm_device *dev) { struct via_device *dev_priv = dev->dev_private; bool dual_channel = false, is_msb = false; - uint64_t dither = DRM_MODE_DITHERING_OFF; - struct drm_property *dithering; struct via_connector *con; struct via_encoder *enc; struct edid *edid; @@ -1152,8 +1122,6 @@ via_lvds_init(struct drm_device *dev) DRM_DEBUG("panel index %x detected\n", reg_value); - if (reg_value < 0x0A) - dither = DRM_MODE_DITHERING_ON; } } else { /* 00 LVDS1 + LVDS2 10 = Dual channel. Other are reserved */ @@ -1170,14 +1138,6 @@ via_lvds_init(struct drm_device *dev) dev->mode_config.scaling_mode_property, DRM_MODE_SCALE_CENTER); - dithering = drm_property_create_enum(dev, 0, "dithering", - dithering_enum_list, - ARRAY_SIZE(dithering_enum_list)); - list_add(&dithering->head, &con->props); - - drm_object_attach_property(&con->base.base, dithering, dither); - via_lcd_set_property(&con->base, dithering, dither); - /* Now setup the encoder */ drm_encoder_init(dev, &enc->base, &via_lvds_enc_funcs, DRM_MODE_ENCODER_LVDS); commit 1635df3ff3920523eafc41a397496504cb54c7ed Author: Kevin Brace <kevinbr...@gmx.com> Date: Sun Aug 20 00:27:05 2017 -0700 Consolidate struct declarations into via_drv.h There is no reason to do it inside *.c files. Signed-off-by: Kevin Brace <kevinbr...@gmx.com> diff --git a/drivers/gpu/drm/openchrome/ttm_gem.c b/drivers/gpu/drm/openchrome/ttm_gem.c index 52dd2c942646..a5eb74e656e2 100644 --- a/drivers/gpu/drm/openchrome/ttm_gem.c +++ b/drivers/gpu/drm/openchrome/ttm_gem.c @@ -23,11 +23,6 @@ #include "drmP.h" #include "via_drv.h" -struct ttm_gem_object { - struct drm_gem_object gem; - struct ttm_heap *heap; -}; - /* * initialize the gem buffer object */ diff --git a/drivers/gpu/drm/openchrome/via_drv.h b/drivers/gpu/drm/openchrome/via_drv.h index 792c29ee5b14..c1bb2769c56b 100644 --- a/drivers/gpu/drm/openchrome/via_drv.h +++ b/drivers/gpu/drm/openchrome/via_drv.h @@ -111,6 +111,16 @@ struct ttm_heap { struct ttm_buffer_object pbo; }; +struct ttm_gem_object { + struct drm_gem_object gem; + struct ttm_heap *heap; +}; + +struct ttm_fb_helper { + struct drm_fb_helper base; + struct ttm_bo_kmap_obj kmap; +}; + enum via_engine { VIA_ENG_H1 = 0, VIA_ENG_H2, diff --git a/drivers/gpu/drm/openchrome/via_fb.c b/drivers/gpu/drm/openchrome/via_fb.c index d0a80db69ea6..96cf1f51525e 100644 --- a/drivers/gpu/drm/openchrome/via_fb.c +++ b/drivers/gpu/drm/openchrome/via_fb.c @@ -25,11 +25,6 @@ #include "drm_fb_helper.h" #include "drm_crtc_helper.h" -struct ttm_fb_helper { - struct drm_fb_helper base; - struct ttm_bo_kmap_obj kmap; -}; - static int cle266_mem_type(struct via_device *dev_priv, struct pci_dev *bridge) { _______________________________________________ Openchrome-devel mailing list Openchrome-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/openchrome-devel